bug

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/admin/addstate.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/addstate.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>
@@ -17,11 +18,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="400">
-              <caret line="379" column="93" selection-start-line="379" selection-start-column="93" selection-end-line="379" selection-end-column="93" />
+            <state relative-caret-position="459">
+              <caret line="374" column="21" lean-forward="true" selection-start-line="371" selection-start-column="20" selection-end-line="374" selection-end-column="21" />
               <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" />
@@ -45,11 +46,20 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/static/js/state.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="512">
-              <caret line="363" column="21" selection-start-line="363" selection-start-column="21" selection-end-line="363" selection-end-column="21" />
+            <state relative-caret-position="394">
+              <caret line="371" column="19" selection-start-line="371" selection-start-column="19" selection-end-line="371" selection-end-column="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/admin/addstate.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="76">
+              <caret line="144" column="19" selection-start-line="144" selection-start-column="19" selection-end-line="144" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -66,8 +76,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="486">
-              <caret line="224" column="109" selection-start-line="224" selection-start-column="99" selection-end-line="224" selection-end-column="109" />
+            <state relative-caret-position="463">
+              <caret line="227" column="84" selection-start-line="227" selection-start-column="72" selection-end-line="227" selection-end-column="84" />
             </state>
           </provider>
         </entry>
@@ -121,8 +131,8 @@
       <find>checkItemArray</find>
       <find>deleteRecord</find>
       <find>deletecheckItemArray</find>
-      <find>deleteStateGroup</find>
       <find>inputItems</find>
+      <find>deleteStateGroup</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -165,9 +175,10 @@
         <option value="$PROJECT_DIR$/pages/editQRcode/addFile.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addDevice.html" />
         <option value="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" />
-        <option value="$PROJECT_DIR$/static/js/state.js" />
         <option value="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" />
         <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
+        <option value="$PROJECT_DIR$/pages/admin/addstate.html" />
+        <option value="$PROJECT_DIR$/static/js/state.js" />
       </list>
     </option>
   </component>
@@ -275,12 +286,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="90361000" />
+      <workItem from="1555841941143" duration="91584000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="98735000" />
+    <option name="totallyTimeSpent" value="99958000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -401,13 +412,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/addstate.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="244" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/ztree/jquery.ztree.core.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -610,31 +614,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/state.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="512">
-          <caret line="363" column="21" selection-start-line="363" selection-start-column="21" selection-end-line="363" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="248" column="57" selection-start-line="248" selection-start-column="52" selection-end-line="248" 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="486">
-          <caret line="224" column="109" selection-start-line="224" selection-start-column="99" selection-end-line="224" selection-end-column="109" />
+        <state relative-caret-position="463">
+          <caret line="227" column="84" selection-start-line="227" selection-start-column="72" selection-end-line="227" selection-end-column="84" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="379" column="93" selection-start-line="379" selection-start-column="93" selection-end-line="379" selection-end-column="93" />
+        <state relative-caret-position="459">
+          <caret line="374" column="21" lean-forward="true" selection-start-line="371" selection-start-column="20" selection-end-line="374" selection-end-column="21" />
           <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" />
@@ -657,5 +647,26 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="248" column="57" selection-start-line="248" selection-start-column="52" selection-end-line="248" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/addstate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="144" column="19" selection-start-line="144" selection-start-column="19" selection-end-line="144" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/state.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="394">
+          <caret line="371" column="19" selection-start-line="371" selection-start-column="19" selection-end-line="371" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

pages/admin/addrecordTemplate.html

@@ -222,10 +222,10 @@
                              <input type="text" placeholder="请输入字段名称" class="layui-input fieldName fieldName1">
                          </div>
                          <div class="a_T record_term_remarks" style="width: 20%">
-                             <input type="text" placeholder="请输入字段备注" class="layui-input fieldType fieldType1">
+                             <input type="text" placeholder="请输入字段备注" class="layui-input fieldType ">
                          </div>
                          <div class="a_T record_term_select" style="width: 15%">
-                             <select name="inputType" class="select-box" lay-filter="inputType">
+                             <select name="inputType" class="select-box select-boxsa" lay-filter="inputType">
                                  <option value="">--请选择--</option>
                              </select>
                          </div>

pages/admin/addstate.html

@@ -166,7 +166,7 @@
                     <div class="a_delete">
                         <i class="layui-icon layui-icon-delete"></i>
                     </div>
-                    <input type="text" value="" placeholder="请输入状态名称" name="username" required="" lay-verify="required" autocomplete="off" class="layui-input a_steta">
+                    <input type="text" value="" placeholder="请输入状态名称" name="username" required="" lay-verify="required" autocomplete="off" class="layui-input a_steta a_steta1">
                 </div>
             </div>
         </div>

static/js/recordTemplate.js

@@ -276,10 +276,10 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                                                  <input type="text" placeholder="请输入字段名称" class="layui-input fieldName ${j == 0?'fieldName1' : ""}" value="${res.data.inputList[j].inputName}">
                                              </div>
                                              <div class="a_T record_term_remarks" style="width: ${res.data.inputList[j].inputType == "photo"?"17%":"20%"}">
-                                                 <input type="text" placeholder="请输入字段备注" class="layui-input fieldType ${j ==0?"fieldType1":""}" value="${res.data.inputList[j].remark}">
+                                                 <input type="text" placeholder="请输入字段备注" class="layui-input fieldType"value="${res.data.inputList[j].remark}">
                                              </div>
                                              <div class="a_T record_term_select" style="width: ${res.data.inputList[j].inputType == "photo"?"13%":"15%"}">
-                                                <select name="inputType" class="select-box select-box${num++}" lay-filter="inputType">
+                                                <select name="inputType" class="select-box select-box${num++} ${j ==0?"select-boxsa":""}" " lay-filter="inputType">
                                                     <option value="">--请选择--</option>    
                                                 </select>
                                              </div>
@@ -377,8 +377,9 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         layer.msg('请输入文本状态', {icon: 8});
                         return false;
                     }
-                    if (body.find('.fieldName1').val() == "" && body.find('.fieldType1').val() == "") {
-                        layer.msg('请填写记录项', {icon: 8});
+                    console.log(body.find('.select-boxsa').val() == "",'body.find(\'.select-boxsa\').val()')
+                    if (body.find('.fieldName1').val() == "" || body.find('.select-boxsa').val() == "") {
+                        layer.msg('请填写记录项字段或类型', {icon: 8});
                         return false;
                     }
                     var inputs = body.find('.a_inputs .a_input');
@@ -474,7 +475,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         }else {
                             inputItems =[]
                         }
-                        if (value != "" && fieldType !="") {
+                        if (value != "" && inputType !="") {
                             inputList.businessType = businessType == undefined ? "" : businessType;
                             inputList.inputItems = inputItems == "" ? [] : JSON.parse(inputItems);
                             inputList.inputName = value;
@@ -616,8 +617,8 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     return false;
                 }
                 // console.log(body.find('.fieldName1'))
-                if (body.find('.fieldName1').val() == "" && body.find('.fieldType1').val() == "") {
-                    layer.msg('请填写记录项', {icon: 8});
+                if (body.find('.fieldName1').val() == "" || body.find('.select-boxsa').val() == "") {
+                    layer.msg('请填写记录项字段或类型', {icon: 8});
                     return false;
                 }
                 var inputs = body.find('.a_inputs .a_input');
@@ -677,7 +678,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     }else {
                         inputItems = []
                     }
-                    if (value != "" && fieldType != "") {
+                    if (value != "" && inputType != "") {
                         inputList.businessType = businessType == undefined ? "" : businessType;
                         inputList.inputItems = inputItems == [] ? [] : JSON.parse(inputItems);
                         inputList.inputName = value;

static/js/state.js

@@ -209,7 +209,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                             <div class="a_delete">
                                                 <i class="layui-icon layui-icon-delete"></i>
                                             </div>
-                                      <input type="text" value="${res.data[i].statusContent}" placeholder="请输入状态名称" name="username" required="" lay-verify="required" autocomplete="off" class="layui-input a_steta">
+                                      <input type="text" value="${res.data[i].statusContent}" placeholder="请输入状态名称" name="username" required="" lay-verify="required" autocomplete="off" class="layui-input a_steta ${i == 0?"a_steta1":""}">
                                   </div>`;
                                 body.find(".a_itmes").append(str)
                             }
@@ -232,6 +232,14 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                 },
                 yes: function (index, layero) {
                     var body = layer.getChildFrame('body', index);
+                    if (body.find("#stetaName").val() == "") {
+                        layer.msg('请输入状态组名称', {icon: 8});
+                        return false;
+                    }
+                    if (body.find(".a_steta1").val() == "") {
+                        layer.msg('请输入状态组子项至少填一个', {icon: 8});
+                        return false;
+                    }
                     var item = body.find('.a_itmes .a_itme');
                     var a_colour = body.find('.a_colour');
                     var arr = [];
@@ -338,6 +346,14 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
             },
             yes: function (index, layero) {
                 var body = layer.getChildFrame('body', index);
+                if (body.find("#stetaName").val() == "") {
+                    layer.msg('请输入状态组名称', {icon: 8});
+                    return false;
+                }
+                if (body.find(".a_steta1").val() == "") {
+                    layer.msg('请输入状态组子项至少填一个', {icon: 8});
+                    return false;
+                }
                 var item = body.find('.a_itmes .a_itme');
                 var a_colour = body.find('.a_colour');
                 var json =[];
@@ -355,7 +371,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     }
                 });
                 for (var j = 0; j < arr.length; j++) {
-                    if (arr[i] != "") {
+                    if (arr[j] != "") {
                         obj = {};
                         obj.statusColor = color[j];
                         obj.statusContent = arr[j];