From 4e7a913f81158ef1ba92216510a74b9ec3aa78ad Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sun, 26 Feb 2023 22:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AF=B9=E8=B1=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E5=9B=A2=E9=98=9F=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/assetArticlesPurchase/assetArticlesPurchaseAdd.js    | 2 +-
 .../js/assetArticlesPurchase/assetArticlesPurchaseEdit.js   | 2 +-
 .../resources/template/js/classServer/classServerDetails.js | 1 +
 .../template/tpl/classServer/classServerDetails.html        | 6 ++++++
 web/src/main/resources/template/json/skyeyeClassEnum.json   | 4 +++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseAdd.js b/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseAdd.js
index f9bcc241a..dd3804683 100644
--- a/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseAdd.js
+++ b/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseAdd.js
@@ -153,7 +153,7 @@ layui.config({
 			formSubType: subType,
 			approvalId: approvalId
 		};
-		AjaxPostUtil.request({url: flowableBasePath + "writeArticlesPurchasee", params: params, type: 'json', method: 'POST', callback: function(json) {
+		AjaxPostUtil.request({url: flowableBasePath + "writeArticlesPurchase", params: params, type: 'json', method: 'POST', callback: function(json) {
 			parent.layer.close(index);
 			parent.refreshCode = '0';
 		}});
diff --git a/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseEdit.js b/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseEdit.js
index 42f87170b..fda8e9ce1 100644
--- a/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseEdit.js
+++ b/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseEdit.js
@@ -184,7 +184,7 @@ layui.config({
 			formSubType: subType,
 			approvalId: approvalId
 		};
-		AjaxPostUtil.request({url: flowableBasePath + "writeArticlesPurchasee", params: params, type: 'json', method: 'POST', callback: function(json) {
+		AjaxPostUtil.request({url: flowableBasePath + "writeArticlesPurchase", params: params, type: 'json', method: 'POST', callback: function(json) {
 			parent.layer.close(index);
 			parent.refreshCode = '0';
 		}});
diff --git a/base-server/src/main/resources/template/js/classServer/classServerDetails.js b/base-server/src/main/resources/template/js/classServer/classServerDetails.js
index 1b7cb0daf..5ec3d37fc 100644
--- a/base-server/src/main/resources/template/js/classServer/classServerDetails.js
+++ b/base-server/src/main/resources/template/js/classServer/classServerDetails.js
@@ -30,6 +30,7 @@ layui.config({
             ajaxSendLoadBefore: function (hdb, json) {
                 json.bean.serviceBean.tenantName = skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("tenantEnum", 'enumFiledName', json.bean.serviceBean.tenant, 'name');
                 json.bean.serviceBean.flowableName = json.bean.serviceBean.flowable ? '是' : '否';
+                json.bean.serviceBean.teamAuthName = json.bean.serviceBean.teamAuth ? '是' : '否';
             },
             ajaxSendAfter: function (json) {
                 matchingLanguage();
diff --git a/base-server/src/main/resources/template/tpl/classServer/classServerDetails.html b/base-server/src/main/resources/template/tpl/classServer/classServerDetails.html
index 15ee861ce..a9a739727 100644
--- a/base-server/src/main/resources/template/tpl/classServer/classServerDetails.html
+++ b/base-server/src/main/resources/template/tpl/classServer/classServerDetails.html
@@ -61,6 +61,12 @@
                 {{serviceBean.flowableName}}
             </div>
         </div>
+        <div class="layui-form-item layui-col-xs6">
+            <label class="layui-form-label">是否开启团队权限：</label>
+            <div class="layui-input-block ver-center">
+                {{serviceBean.teamAuthName}}
+            </div>
+        </div>
         <div class="layui-form-item layui-col-xs12">
             <span class="hr-title">高级信息</span>
             <button id="editBean" type="button" class="winui-toolbtn search-table-btn-right"><i class="fa fa-edit" aria-hidden="true"></i>编辑</button>
diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json
index 8f288faa0..c7d49ac3e 100644
--- a/web/src/main/resources/template/json/skyeyeClassEnum.json
+++ b/web/src/main/resources/template/json/skyeyeClassEnum.json
@@ -44,6 +44,8 @@
     "componentValueMergType": {"name": "组件关联的属性", "className": "skyeye-pro#com.skyeye.dsform.classenum.ComponentValueMergType"},
     "buttonColorType": {"name": "操作按钮颜色", "className": "skyeye-pro#com.skyeye.attr.classenum.ButtonColorType"},
     "eventType": {"name": "操作按钮事件类型", "className": "skyeye-pro#com.skyeye.operate.classenum.EventType"},
-    "operatePosition": {"name": "操作按钮展示位置", "className": "skyeye-pro#com.skyeye.operate.classenum.OperatePosition"}
+    "operatePosition": {"name": "操作按钮展示位置", "className": "skyeye-pro#com.skyeye.operate.classenum.OperatePosition"},
 
+    "crmContractStateEnum": {"name": "CRM客户合同状态", "className": "skyeye-crm#com.skyeye.contract.classenum.CrmContractStateEnum"},
+    "crmContractAuthEnum": {"name": "CRM客户合同权限", "className": "skyeye-crm#com.skyeye.contract.classenum.CrmContractAuthEnum"}
 }
\ No newline at end of file
-- 
GitLab