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 f9bcc241a2161742f9da08488f02b5cdd019ca63..dd38046834e46ac290dac691a412b5903e0775ee 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 42f87170b0d3a9abeeb44bbc0d175ec06e324ee7..fda8e9ce1ded4268c35e01b57883ed48b52323c0 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 1b7cb0daf380d68d2325a86890bc23676d5b02e2..5ec3d37fcf8a2614755e9f4f90a4de7a38c8991a 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 15ee861ce6e68c368f1cf523f8b712978f940ec3..a9a739727b7437e182879df5415105a03e046cf5 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}} +
+ +
+ {{serviceBean.teamAuthName}} +
+
高级信息 diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json index 8f288faa055562cfe28975f929cb5e93320f12ff..c7d49ac3e96138347336311287c1b0e01ffc8b0c 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