buge

.idea/workspace.xml

@@ -2,6 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/static/js/recordTemplate.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/recordTemplate.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/static/js/state.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/state.js" afterDir="false" />
     </list>
@@ -16,11 +18,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-432">
-              <caret line="715" column="44" lean-forward="true" selection-start-line="715" selection-start-column="44" selection-end-line="715" selection-end-column="44" />
+            <state relative-caret-position="670">
+              <caret line="505" column="46" selection-start-line="505" selection-start-column="46" selection-end-line="505" selection-end-column="46" />
               <folding>
                 <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
@@ -44,11 +46,20 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="644">
+              <caret line="418" column="73" selection-start-line="418" selection-start-column="73" selection-end-line="418" selection-end-column="73" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/state.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="617">
-              <caret line="273" column="45" lean-forward="true" selection-start-line="273" selection-start-column="45" selection-end-line="273" selection-end-column="45" />
+            <state relative-caret-position="460">
+              <caret line="276" column="44" lean-forward="true" selection-start-line="276" selection-start-column="44" selection-end-line="276" selection-end-column="44" />
             </state>
           </provider>
         </entry>
@@ -84,20 +95,6 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/login.html">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/admin/list.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="441">
-              <caret line="80" column="95" selection-start-line="80" selection-start-column="95" selection-end-line="80" selection-end-column="95" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="-68">
@@ -118,8 +115,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="410">
-              <caret line="549" column="24" selection-start-line="549" selection-start-column="24" selection-end-line="549" selection-end-column="24" />
+            <state relative-caret-position="335">
+              <caret line="394" column="93" selection-start-line="394" selection-start-column="84" selection-end-line="394" selection-end-column="93" />
             </state>
           </provider>
         </entry>
@@ -164,8 +161,8 @@
       <find>inputItems</find>
       <find>deleteStateGroup</find>
       <find>qr</find>
-      <find>console.log</find>
       <find>recordArray</find>
+      <find>console.log</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -203,7 +200,6 @@
         <option value="$PROJECT_DIR$/pages/editQRcode/addFile.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addDevice.html" />
         <option value="$PROJECT_DIR$/pages/admin/addstate.html" />
-        <option value="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/admin/list.html" />
         <option value="$PROJECT_DIR$/index.html" />
@@ -211,8 +207,9 @@
         <option value="$PROJECT_DIR$/pages/ztree/ztree.html" />
         <option value="$PROJECT_DIR$/static/js/QRcode.js" />
         <option value="$PROJECT_DIR$/static/js/admin.js" />
-        <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
         <option value="$PROJECT_DIR$/static/js/state.js" />
+        <option value="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" />
+        <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
       </list>
     </option>
   </component>
@@ -249,6 +246,17 @@
             <path>
               <item name="admin" type="b2602c69:ProjectViewProjectNode" />
               <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -302,12 +310,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="106553000" />
+      <workItem from="1555841941143" duration="111246000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="114927000" />
+    <option name="totallyTimeSpent" value="119620000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -599,20 +607,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="552" column="57" selection-start-line="552" selection-start-column="57" selection-end-line="552" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="549" column="24" selection-start-line="549" selection-start-column="24" selection-end-line="549" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/admin/list.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="441">
@@ -623,16 +617,6 @@
     <entry file="file://$PROJECT_DIR$/static/fonts/iconfont.svg">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/login.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="543">
-          <caret line="169" column="28" selection-start-line="169" selection-start-column="28" selection-end-line="169" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/css/zTreeStyle.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-582">
@@ -664,10 +648,41 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/state.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="460">
+          <caret line="276" column="44" lean-forward="true" selection-start-line="276" selection-start-column="44" selection-end-line="276" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/login.html">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="543">
+          <caret line="169" column="28" selection-start-line="169" selection-start-column="28" selection-end-line="169" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="335">
+          <caret line="394" column="93" selection-start-line="394" selection-start-column="84" selection-end-line="394" selection-end-column="93" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="644">
+          <caret line="418" column="73" selection-start-line="418" selection-start-column="73" selection-end-line="418" selection-end-column="73" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-432">
-          <caret line="715" column="44" lean-forward="true" selection-start-line="715" selection-start-column="44" selection-end-line="715" selection-end-column="44" />
+        <state relative-caret-position="670">
+          <caret line="505" column="46" selection-start-line="505" selection-start-column="46" selection-end-line="505" selection-end-column="46" />
           <folding>
             <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
@@ -690,12 +705,5 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/state.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="617">
-          <caret line="273" column="45" lean-forward="true" selection-start-line="273" selection-start-column="45" selection-end-line="273" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>

pages/admin/updateRecordTemplate.html

@@ -403,19 +403,21 @@
                 }
                 id = $(this).parent().parent().attr("record-id");
                 deleteFlag = $(this).parent().parent().attr("deleteFlag");
-                inputList.businessType = businessType;
-                inputList.inputItems = $(this).parent().parent().find(".inputJson").html() == "null" || $(this).parent().parent().find(".inputJson").html() == ""? [] :JSON.parse($(this).parent().parent().find(".inputJson").html());
-                inputList.inputName = value;
-                inputList.inputType = inputType;
-                inputList.isEchart = isEchart;
-                inputList.isOptional = mandatory;
-                inputList.remark = fieldType;
-                inputList.special = 'false';
-                inputList.id = id;
-                inputList.zIndex = ns++ +1;
-                inputList.deleteFlag = deleteFlag;
-                deleteRecord.push(inputList);
-                $(".deleteRecord").val(JSON.stringify(deleteRecord));
+                if(id != ""){
+                    inputList.businessType = businessType;
+                    inputList.inputItems = $(this).parent().parent().find(".inputJson").html() == "null" || $(this).parent().parent().find(".inputJson").html() == ""? [] :JSON.parse($(this).parent().parent().find(".inputJson").html());
+                    inputList.inputName = value;
+                    inputList.inputType = inputType;
+                    inputList.isEchart = isEchart;
+                    inputList.isOptional = mandatory;
+                    inputList.remark = fieldType;
+                    inputList.special = 'false';
+                    inputList.id = id;
+                    inputList.zIndex = ns++ +1;
+                    inputList.deleteFlag = deleteFlag;
+                    deleteRecord.push(inputList);
+                    $(".deleteRecord").val(JSON.stringify(deleteRecord));
+                }
                 $(this).parent().parent().remove()
             }
         });

static/js/recordTemplate.js

@@ -460,13 +460,6 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     }else {
                         n= 0;
                     }
-                    var deleteRecords = body.find(".deleteRecord").val();
-                    if (deleteRecords != "") {
-                        var deleteRecordsJ = JSON.parse(deleteRecords);
-                        for (var w = 0; w < deleteRecordsJ.length; w++) {
-                            recordArray.push(deleteRecordsJ[w])
-                        }
-                    }
                     record_term.each(function () {
                         inputList = {};
                         value = $(this).find(".fieldName").val();
@@ -498,7 +491,17 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                             recordArray.push(inputList)
                         }
                     });
-                    console.log('recordArray',recordArray)
+                    if (recordArray == "") {
+                        layer.msg('至少填写一个记录状态', {icon: 8});
+                        return false;
+                    }
+                    var deleteRecords = body.find(".deleteRecord").val();
+                    if (deleteRecords != "") {
+                        var deleteRecordsJ = JSON.parse(deleteRecords);
+                        for (var w = 0; w < deleteRecordsJ.length; w++) {
+                            recordArray.push(deleteRecordsJ[w])
+                        }
+                    }
                     // 检查项
                     var inspect_terms = body.find(".inspect_terms");
                     var term_nameTextarea,inspect_select,inspectInfo,checkItemArray=[],id,deleteFlag;
@@ -555,6 +558,9 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                             }else if (res.code === '438') {
                                 layer.msg(res.msg, {icon: 2});
                                 table.reload('recordTemplateID')
+                            }else if (res.code === '422') {
+                                layer.msg(res.data[0].error, {icon: 2});
+                                table.reload('recordTemplateID')
                             }else {
                                 layer.msg("添加失败，请检查信息", {icon: 2});
                                 table.reload('recordTemplateID')
@@ -648,13 +654,21 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                 });
                 for (var i = 0; i < inputs.length; i++) {
                     recordStatusObj = {};
-                    recordStatusObj.isEchart = cheackboxBoolArray[i];
-                    recordStatusObj.statusContent = valArray[i];
-                    recordStatusObj.statusId = stateIDArray[i];
-                    recordStatusList.push(recordStatusObj)
+                    if (valArray[i] != "") {
+                        recordStatusObj.isEchart = cheackboxBoolArray[i];
+                        recordStatusObj.statusContent = valArray[i];
+                        recordStatusObj.statusId = stateIDArray[i];
+                        recordStatusList.push(recordStatusObj)
+                    }
                 };
                 if (sessionStorage.getItem("addgroudBool") == 'true') {
                     recordStatusList = [];
+
+                }else {
+                    if (recordStatusList == "") {
+                        layer.msg('至少填写一个记录状态', {icon: 8});
+                        return false;
+                    }
                 }
                 // 记录项
                 var inputList = {businessType:'',inputItems:[],inputName:'',inputType:'',isEchart:'',isOptional:'',remark:'',special:'',zIndex:''},
@@ -674,6 +688,12 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                 }else {
                     n= 0;
                 }
+                // if (recordArray == "") {
+                //     layer.msg('至少填写一个记录项', {icon: 8});
+                //     return false;
+                // }else {
+                //
+                // }
                 record_term.each(function () {
                     inputList = {};
                     value = $(this).find(".fieldName").val();
@@ -701,7 +721,10 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         recordArray.push(inputList)
                     }
                 });
-                console.log('recordArray添加',recordArray)
+                if (recordArray == "") {
+                    layer.msg('至少填写一个记录项', {icon: 8});
+                    return false;
+                }
                 // 检查项
                 var inspect_terms = body.find(".inspect_terms");
                 var term_nameTextarea,inspect_select,inspectInfo,checkItemArray=[];

static/js/state.js

@@ -263,9 +263,11 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                             ID.push(ids)
                         }
                     });
-                    console.log(arr,'atttr')
-                    for (var i = 0; i < arr.length; i++) {
-                        // if (reg.test(arr[i])) {
+                    if (arr == "") {
+                        layer.msg('请输入状态组子项至少填一个', {icon: 8});
+                        return false;
+                    }else {
+                        for (var i = 0; i < arr.length; i++) {
                             obj = {};
                             obj.deleteFlag = false;
                             obj.id = ID[i];
@@ -273,7 +275,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                             obj.statusContent = arr[i];
                             obj.zIndex = i+1;
                             delobj.push(obj)
-                        // }
+                        }
                     }
                     var updateStetaInfo = {
                         id:objID.id,
@@ -361,7 +363,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     return false;
                 }
                 if (!reg.test(body.find(".a_steta1").val())) {
-                    layer.msg('请输入状态组子项至少填一个', {icon: 8});
+
                     return false;
                 }
                 var item = body.find('.a_itmes .a_itme');
@@ -380,12 +382,17 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                         arr.push(value);
                     }
                 });
-                for (var j = 0; j < arr.length; j++) {
+                if (arr == "") {
+                    layer.msg('请输入状态组子项至少填一个', {icon: 8});
+                    return false;
+                }else {
+                    for (var j = 0; j < arr.length; j++) {
                         obj = {};
                         obj.statusColor = color[j];
                         obj.statusContent = arr[j];
                         obj.zIndex = j+1;
                         json.push(obj);
+                    }
                 }
                 var addStetaInfo = {
                     departmentId:belpID,