优化发布指导台账的逻辑判断

2023-06-07 16:39:21 +08:00 · 2023-06-07 16:39:21 +08:00 · f789cb2fa4
commit f789cb2fa4
parent f73e6abdec
5 changed files with 28 additions and 62 deletions
--- a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_e5e045b1-51a6-4362-9dfa-0035e9a60a55/e5e045b1-51a6-4362-9dfa-0035e9a60a55.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_e5e045b1-51a6-4362-9dfa-0035e9a60a55/e5e045b1-51a6-4362-9dfa-0035e9a60a55.xml
@ -4,7 +4,7 @@
    <createUser>admin</createUser>
    <createTime>2023-06-05 13:49:37</createTime>
    <updateUser>admin</updateUser>
-    <updateTime>2023-06-06 16:15:00</updateTime>
+    <updateTime>2023-06-07 16:28:48</updateTime>
    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrzQlP5ZZL90BBD2kaW3dFHZOGFi3lri/6Te7ac6mSHD5hve1L4kpQ+GNx10CGy7lW</signature>
    <managed>false</managed>
    <title>发布指导</title>
@ -31,33 +31,7 @@
            <defaultValue></defaultValue>
            <columnWidth>800</columnWidth>
            <componentId>AWSUI.HTMLEditor</componentId>
-            <componentSetting>{"htmlHeight":"500","htmlWidth":"","isAdvance":false,"isPasteplain":false,"waterMarkFlag":"","compressFlag":"","isSupportUpFile":true,"isSupportUpImg":true,"isWaterMark":true,"isCompress":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>d6b0594a-e79a-4e39-a8a1-0ff675f18ef6</id>
-            <name>GUIDEPICTURE</name>
-            <title>指导图片</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>false</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.LogoPhoto</componentId>
-            <componentSetting>{"url":"@processId()","pic_width":"500","pic_height":"700","pic_title":"指导图片"}</componentSetting>
+            <componentSetting>{"htmlHeight":"500","htmlWidth":"","isAdvance":true,"isPasteplain":true,"waterMarkFlag":"","compressFlag":"","isSupportUpFile":true,"isSupportUpImg":true,"isWaterMark":true,"isCompress":true}</componentSetting>
            <display>true</display>
            <deleted>false</deleted>
            <modify>true</modify>
@ -105,7 +79,7 @@
            <title>显示区域</title>
            <columnType>TEXT</columnType>
            <length>32</length>
-            <nullable>true</nullable>
+            <nullable>false</nullable>
            <defaultValue></defaultValue>
            <columnWidth>60</columnWidth>
            <componentId>AWSUI.Text</componentId>
@ -131,7 +105,7 @@
            <title>显示区域ID</title>
            <columnType>TEXT</columnType>
            <length>16</length>
-            <nullable>true</nullable>
+            <nullable>false</nullable>
            <defaultValue></defaultValue>
            <columnWidth>60</columnWidth>
            <componentId>AWSUI.Text</componentId>
--- a/com.actionsoft.apps.coe.pal.publisher/repository/form/_359577e5-1d7a-4739-9682-045374686ace/359577e5-1d7a-4739-9682-045374686ace.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/form/_359577e5-1d7a-4739-9682-045374686ace/359577e5-1d7a-4739-9682-045374686ace.xml
@ -4,7 +4,7 @@
    <createUser>admin</createUser>
    <createTime>2023-06-05 13:52:53</createTime>
    <updateUser>admin</updateUser>
-    <updateTime>2023-06-06 16:21:41</updateTime>
+    <updateTime>2023-06-07 16:27:29</updateTime>
    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrpa5kmvNAw1m8AIOqKVb0pzUri/vQQdXbOacMlgc1uAWopNkEEJ1iC6zCwCx0v7vs</signature>
    <managed>false</managed>
    <title>发布指导</title>
--- a/com.actionsoft.apps.coe.pal.publisher/repository/form/_6b805e17-9053-47dc-90f3-02e431e3ebac/6b805e17-9053-47dc-90f3-02e431e3ebac.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/form/_6b805e17-9053-47dc-90f3-02e431e3ebac/6b805e17-9053-47dc-90f3-02e431e3ebac.xml
@ -4,7 +4,7 @@
    <createUser>admin</createUser>
    <createTime>2018-12-24 17:22:51</createTime>
    <updateUser>admin</updateUser>
-    <updateTime>2023-06-07 10:07:47</updateTime>
+    <updateTime>2023-06-07 16:13:06</updateTime>
    <signature>DgQSSyFmOqrf7WQa6WFesZuTOnzFe+zevZg0BYW55MuhMOtUylRD92QW2MZY8fzuI6X1Hl953616fSFHajuAhU7eceJjbtiNqEmGtP5EhM98v9cwV3qc2bNI7WcO3nVU</signature>
    <managed>false</managed>
    <title>批量流程制度发布申请</title>
--- a/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-发布指导.htm
+++ b/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-发布指导.htm
@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <html>
 	<head>
+<meta name="renderer" content="webkit">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+
 <meta name="renderer" content="webkit">
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 		<title>发布指导</title>
@ -21,6 +24,7 @@ var isDingDingAdmin = false;
 		[#AWSUIImport]
 		<link rel='stylesheet' id='schemeCss' href='../apps/_bpm.platform/css/colorschemes/scheme_aws.css'  name='schemeCss'/>
 	
+
 <link type='text/css' rel='stylesheet' id='themeCss' href='../apps/_bpm.platform/css/theme/theme.css' name='themeCss'/>
 </head>
 	<body>
@ -51,10 +55,6 @@ var isDingDingAdmin = false;
 <td class="awsui-ux-title"><label for="GUIDEMSG" class="aws-form-ux-label">指导信息</label></td>
 <td class="aws-form-ux-content">[#GUIDEMSG]</td>
 </tr>
-<tr>
-<td class="awsui-ux-title"><label for="GUIDEPICTURE" class="aws-form-ux-label">指导图片</label></td>
-<td class="aws-form-ux-content">[#GUIDEPICTURE]</td>
-</tr>
 </tbody>
 </table>
 </td>
@ -68,22 +68,18 @@ var isDingDingAdmin = false;
 </form>
 <script id="formOnload">
 function formOnload(){
-  /**
-  debugger;
-  let searchParam=window.location.search;
-  let openStatus=searchParam.slice(-1);
-  if(openStatus==1){
-    $("#FormToolbar").hide();
-    uiEditable("GUIDEMSG", false);
-    //uiEditable("GUIDEPICTURE", false);
-    //uiEditable("STATUS", false);
-    uiVisible("GUIDEPICTURE", false);
-    uiVisible("STATUS", false);
-    $("#edui1_toolbarbox").css("display","none");
-    $('form').find('input,textarea,select,img').not('.btn btn-primary,.back').attr('disabled','disabled');
-  }
-  */
 }
 </script>
+<script id="formSave">// <![CDATA[
+const area=["approval","scope","notice","ascription","basicMsg","processType"];
+function formSave(){
+	const areaId=$("#AREAID").val();
+  if(area.indexOf(areaId)>=0){
+     console.log(areaId);
+     $.simpleAlert("显示区域id为:"+areaId+"的区域已配置","error");
+    return false;
+  }
+}
+// ]]></script>
 </body>
 </html>
--- a/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm
+++ b/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm
@ -2229,8 +2229,9 @@ function getGuidePage(dwId){
 				}
 			});
 }
+//根据发布指导台账里的配置控制不同区域发布指导图标的显隐
 function checkGuideStatus(){
-   let sid = $("#sid").val();
+   const sid = $("#sid").val();
   awsui.ajax.request({
            url: './jd',
            method: 'GET',
@ -2239,22 +2240,17 @@ function checkGuideStatus(){
                sid: sid
            },
            success: function(data){
-              debugger;
 				if(data.result=='ok'){
-                  let statusList=data.data.status;
-                  $.each(statusList, function(key, val) {
-                       if(val.STAUTS==0){
-                         //$("#" + val.AREAID).hide();
-                         console.log(val.AREAID);
-                       }
-                    });
+                  const statusList=data.data.status;
+                if(statusList!=null&&statusList!=undefined){
                  for(index in statusList){ 
-                      let val=statusList[index];
-                      let status=val.STATUS;
+                      const val=statusList[index];
+                      const status=val.STATUS;
                       if(status==0){
                         $("#" + val.AREAID).show();
                       }
                    }
+                }
                  }  
            }
        });