ss

.idea/workspace.xml

@@ -2,6 +2,15 @@
 <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/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$/pages/admin/list.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/list.html" 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$/pages/ztree/ztree.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/ztree/ztree.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/QRcode.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/QRcode.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/admin.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/admin.js" 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>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -18,8 +27,8 @@
       <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="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" />
+            <state relative-caret-position="635">
+              <caret line="783" column="10" selection-start-line="759" selection-start-column="7" selection-end-line="783" selection-end-column="10" />
               <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" />
@@ -43,47 +52,68 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="500">
-              <caret line="288" column="58" lean-forward="true" selection-start-line="288" selection-start-column="58" selection-end-line="288" selection-end-column="58" />
+            <state relative-caret-position="621">
+              <caret line="170" column="43" selection-start-line="170" selection-start-column="24" selection-end-line="170" selection-end-column="43" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="579">
+              <caret line="77" column="63" selection-start-line="77" selection-start-column="63" selection-end-line="77" selection-end-column="63" />
+              <folding>
+                <element signature="n#style#0;n#input#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/admin/addstate.html">
+        <entry file="file://$PROJECT_DIR$/pages/admin/list.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 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$/pages/admin/updateRecordTemplate.html">
+        <entry file="file://$PROJECT_DIR$/static/js/admin.js">
           <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 relative-caret-position="602">
+              <caret line="523" column="47" selection-start-line="523" selection-start-column="47" selection-end-line="523" selection-end-column="47" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+        <entry file="file://$PROJECT_DIR$/pages/admin/addstate.html">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="236">
+              <caret line="202" column="40" selection-start-line="202" selection-start-column="40" selection-end-line="202" selection-end-column="40" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+        <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="199" column="51" selection-start-line="199" selection-start-column="36" selection-end-line="199" selection-end-column="51" />
+            <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>
+      </file>
+      <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>
           </provider>
         </entry>
@@ -100,7 +130,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>delete</find>
       <find>unfold</find>
       <find>index_data</find>
       <find>deviceItem</find>
@@ -130,6 +159,7 @@
       <find>deletecheckItemArray</find>
       <find>inputItems</find>
       <find>deleteStateGroup</find>
+      <find>console.log</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -154,12 +184,8 @@
         <option value="$PROJECT_DIR$/pages/admin/recordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/depMaintain.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/QRcodeList.html" />
-        <option value="$PROJECT_DIR$/pages/admin/list.html" />
-        <option value="$PROJECT_DIR$/static/js/admin.js" />
         <option value="$PROJECT_DIR$/static/css/zTreeStyle.css" />
-        <option value="$PROJECT_DIR$/pages/ztree/ztree.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/editQRcode.html" />
-        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
         <option value="$PROJECT_DIR$/pages/editQRcode/pureText.html" />
         <option value="$PROJECT_DIR$/static/js/jjjs.js" />
         <option value="$PROJECT_DIR$/pages/QRcode/imageAtlas.html" />
@@ -171,19 +197,21 @@
         <option value="$PROJECT_DIR$/pages/editQRcode/addLink.html" />
         <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$/pages/admin/addrecordTemplate.html" />
         <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
         <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$/static/js/QRcode.js" />
+        <option value="$PROJECT_DIR$/pages/admin/list.html" />
         <option value="$PROJECT_DIR$/static/js/state.js" />
+        <option value="$PROJECT_DIR$/static/js/admin.js" />
+        <option value="$PROJECT_DIR$/pages/ztree/ztree.html" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="x" value="48" />
-    <option name="y" value="23" />
-    <option name="width" value="1392" />
-    <option name="height" value="877" />
+    <option name="width" value="1440" />
+    <option name="height" value="900" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -218,6 +246,12 @@
             <path>
               <item name="admin" type="b2602c69:ProjectViewProjectNode" />
               <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="ztree" 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>
@@ -283,12 +317,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="91864000" />
+      <workItem from="1555841941143" duration="100480000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="100238000" />
+    <option name="totallyTimeSpent" value="108854000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -402,13 +436,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/admin.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="494" column="41" selection-start-line="494" selection-start-column="41" selection-end-line="494" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/ztree/jquery.ztree.core.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -422,13 +449,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="11" column="64" selection-start-line="11" selection-start-column="64" selection-end-line="11" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="634">
@@ -450,13 +470,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/list.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
-          <caret line="80" column="122" selection-start-line="80" selection-start-column="122" selection-end-line="80" selection-end-column="122" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/editQRcode/editQRcode.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="318">
@@ -604,24 +617,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/addstate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="202" column="40" selection-start-line="202" selection-start-column="40" selection-end-line="202" selection-end-column="40" />
+        </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$/static/js/QRcode.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="199" column="51" selection-start-line="199" selection-start-column="36" selection-end-line="199" selection-end-column="51" />
+        <state relative-caret-position="236">
+          <caret line="196" column="26" selection-start-line="196" selection-start-column="26" selection-end-line="196" selection-end-column="26" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="635">
+          <caret line="783" column="10" selection-start-line="759" selection-start-column="7" selection-end-line="783" selection-end-column="10" />
           <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" />
@@ -644,24 +671,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+    <entry file="file://$PROJECT_DIR$/pages/admin/list.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 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>
-    <entry file="file://$PROJECT_DIR$/pages/admin/addstate.html">
+    <entry file="file://$PROJECT_DIR$/static/js/state.js">
       <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 relative-caret-position="621">
+          <caret line="170" column="43" selection-start-line="170" selection-start-column="24" selection-end-line="170" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/state.js">
+    <entry file="file://$PROJECT_DIR$/static/js/admin.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="500">
-          <caret line="288" column="58" lean-forward="true" selection-start-line="288" selection-start-column="58" selection-end-line="288" selection-end-column="58" />
+        <state relative-caret-position="602">
+          <caret line="523" column="47" selection-start-line="523" selection-start-column="47" selection-end-line="523" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="579">
+          <caret line="77" column="63" selection-start-line="77" selection-start-column="63" selection-end-line="77" selection-end-column="63" />
+          <folding>
+            <element signature="n#style#0;n#input#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

pages/admin/addrecordTemplate.html

@@ -295,10 +295,12 @@
                      $(".a_text").addClass("a_hide");
                      $(".layui-input-block1").removeClass("a_hide");
                      sessionStorage.setItem('addgroudBool','false');
+                     sessionStorage.setItem('groudBool','false');
                  }else {
                      $('.a_inputs').hide();
                      $(".a_text").removeClass("a_hide");
                      $(".layui-input-block1").addClass("a_hide");
+                     sessionStorage.setItem('groudBool','true');
                      sessionStorage.setItem('addgroudBool','true');
                  }
              });
@@ -420,7 +422,6 @@
          });
          // 删除记录项
          $("body").on("click",".delete_record_term",function () {
-             console.log($(".record_term").length,'00');
              if($(".record_term").length === 1){
                  layer.msg('原始状态不能删除', {icon: 8});
              }else {
@@ -447,7 +448,6 @@
          });
          // 记录项类型 // 切换
          form.on("select(inputType)",function (data) {
-             // console.log($(this),"this")
              if (data.value === 'checkbox' || data.value === 'radio') {
                  $(this).parent().parent().parent().parent().find(".a_operation").find(".edit_record").removeClass("a_hide");
              }else {
@@ -548,7 +548,6 @@
                          obj.itemValue =value;
                          selectArrsy.push(obj);
                      });
-                     // console.log(selectArrsy,'ooo');
                      that.parent().parent().find(".inputJson").val(JSON.stringify(selectArrsy));
                      layer.close(index);
                  }

pages/admin/addstate.html

@@ -201,7 +201,6 @@
         });
         $("body").on("click",'.a_modle>span',function () {
             var index = $(this).index();
-            console.log(index);
             if (index === 3) {
                 $(this).parent().parent().find(".a_colour").find('span').css("background-color",'red');
                 $(this).parent().parent().find(".a_colour").find('span').attr("color_data",'red')

pages/admin/list.html

@@ -78,7 +78,7 @@
 					<div id="pageItem" style="text-align: right"></div>
 					<!--操作-->
 					<script type="text/html" id="barDemo">
-						<a lay-event="move" class="a_btn" href="javascript:;" title="移动状态和提醒设置" onclick="moveDep('选择部门信息',)">
+						<a lay-event="move" class="a_btn" href="javascript:;" title="移动状态和提醒设置">
 							<i class="fa fa-scissors"></i>
 						</a>
 						<a title="复制状态和提醒设" class="a_btn" lay-event="copy" href="javascript:;">

pages/admin/updateRecordTemplate.html

@@ -247,12 +247,13 @@
                 $(".a_text").addClass("a_hide");
                 $(".layui-input-block1").removeClass("a_hide");
                 sessionStorage.setItem('groudBool','false');
-
+                sessionStorage.setItem("addgroudBool",'false')
             }else {
                 $('.a_inputs').hide();
                 $(".a_text").removeClass("a_hide");
                 $(".layui-input-block1").addClass("a_hide");
-                sessionStorage.setItem('groudBool','true')
+                sessionStorage.setItem('groudBool','true');
+                sessionStorage.setItem("addgroudBool", 'true')
             }
         });
         $('body').on("click",'.a_stateName',function () {
@@ -400,7 +401,6 @@
                 if (inputType != "photo"){
                     businessType =""
                 }
-                console.log(';;$(this).parent().parent().find(".inputJson").html()',$(this).parent().parent().find(".inputJson").html())
                 id = $(this).parent().parent().attr("record-id");
                 deleteFlag = $(this).parent().parent().attr("deleteFlag");
                 inputList.businessType = businessType;
@@ -416,7 +416,6 @@
                 inputList.deleteFlag = deleteFlag;
                 deleteRecord.push(inputList);
                 $(".deleteRecord").val(JSON.stringify(deleteRecord));
-                console.log(deleteRecord,'deleteRecord');
                 $(this).parent().parent().remove()
             }
         });
@@ -440,7 +439,6 @@
         });
         // 记录项类型 // 切换
         form.on("select(inputType)",function (data) {
-            // console.log($(this),"this")
             if (data.value === 'checkbox' || data.value === 'radio') {
                 $(this).parent().parent().parent().parent().find(".a_operation").find(".edit_record").removeClass("a_hide");
             }else {
@@ -524,13 +522,11 @@
             checkItemList.zIndex = nums++ +1;
             deletecheckItemArray.push(checkItemList);
             $(".deletecheckItemArray").val(JSON.stringify(deletecheckItemArray));
-            console.log(deletecheckItemArray,"deletecheckItemArray")
             $(this).parent().parent().remove()
         });
         // 多选和单选的编辑
         $("body").on("click",".edit_record",function () {
             var that = $(this);
-            // console.log(that.parent().parent().find(".inputJson").html(),'lllll')
             sessionStorage.setItem("inputItemList",that.parent().parent().find(".inputJson").html());
             layer.open({
                 type: 2,
@@ -555,7 +551,6 @@
                     var obj ={isDefault:'',itemValue:'',id:'',deleteFlag:''};
                     var selectArrsy = [];
                     var item = body.find(".steta_groud");
-                    console.log(body.find(".deletegroup").val(),'body.find(".deletegroup").val()')
                     var deletegroups = body.find(".deletegroup").val();
                     if (deletegroups != "") {
                         var deletegroup = JSON.parse(body.find(".deletegroup").val());

pages/ztree/ztree.html

@@ -28,6 +28,7 @@
 <body>
 <div class="weadmin-body">
     <ul id="treeDemo" class="ztree"></ul>
+    <input type="text" style="display: none;" class="departmentId">
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
 <script src="../../static/js/jquery1.7.2.js"></script>
@@ -50,27 +51,36 @@
                 radioType: "level"
             },
             data: {
-                simpleData: {
-                    enable: true
+                simpleData : {
+                    enable : true,
+                    idKey : "id", // id编号命名
+                    pIdKey : "pId", // 父id编号命名
+                    rootId : 0,
                 }
+            },
+            callback: {
+                onCheck: onCheck
             }
         };
-        var zNodes =[
-            { id:1, pId:0, name:"can check 1", open:true},
-            { id:11, pId:1, name:"can check 1-1", open:true},
-            { id:111, pId:11, name:"can check 1-1-1"},
-            { id:112, pId:11, name:"can check 1-1-2"},
-            { id:12, pId:1, name:"can check 1-2", open:true},
-            { id:121, pId:12, name:"can check 1-2-1"},
-            { id:122, pId:12, name:"can check 1-2-2"},
-            { id:2, pId:0, name:"can check 2", checked:true, open:true},
-            { id:21, pId:2, name:"can check 2-1"},
-            { id:22, pId:2, name:"can check 2-2", open:true},
-            { id:221, pId:22, name:"can check 2-2-1", checked:true},
-            { id:222, pId:22, name:"can check 2-2-2"},
-            { id:23, pId:2, name:"can check 2-3"}
-        ];
-        $.fn.zTree.init($("#treeDemo"), setting, zNodes);
+        doLoadSysMenus();
+        function doLoadSysMenus(){
+            var url="http://apptest.jieweizhineng.com/api/section/getlistdirect"
+            $.getJSON(url,function(result){
+                if(result.code==0){
+                    var treeObj = $.fn.zTree.init($("#treeDemo"),setting,result.data);
+                    treeObj.expandAll(true);
+                }else{
+                    layer.msg(result.message, {icon: 2});
+                }
+            });
+        }
+        var zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+        zTree_Menu.updateNode('fd15ce4ddabf48c684792f6ed21842d5');
+        // var type = $("#level").attr("checked")? "level":"all";
+        function onCheck(e, treeId, treeNode) {
+            console.log(treeNode);
+            $('.departmentId').val(treeNode.id)
+        }
     });
 </script>
 </body>

static/js/QRcode.js

@@ -26,7 +26,6 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
 
             },
             success:function (res) {
-                console.log(res,'res')
                 if(res.code === 0){
                     var data = [res.data];
                     eleTree.render({
@@ -196,7 +195,6 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
         } else if (obj.event === "edit"){
             var objID =obj.data;
             var delobj=[];
-            console.log(obj.data,'obj.data')
             sessionStorage.setItem("QRcodeDetaileID",obj.data.id);
             layer.open({
                 type: 2,
@@ -223,13 +221,11 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                             var b = new Base64();
                             body.find('.edit_head_title').html(res.data.page.title);
                             var newArray =[];
-                            console.log(res.data,'res.data')
                             for (var j = 0; j < res.data.pageItemList.length; j++) {
                                 if (res.data.pageItemList[j].pageRelation.zIndex == j+1){
                                     newArray.push(res.data.pageItemList[j])
                                 }
                             }
-                            console.log(newArray,'newArray')
                             for (var i = 0; i < newArray.length; i++) {
                                 // 文本
                                 if (newArray[i].textVo != null) {

static/js/admin.js

@@ -492,19 +492,7 @@ layui.define(['jquery', 'form', 'layer', 'element'], function(exports) {
 	 */
 
 	exports('admin', {});
-	window.moveDep = function (title, url, w, h) {
-		if(title == null || title == '') {
-			title = false;
-		};
-		if(url == null || url == '') {
-			url = "404.html";
-		};
-		if(w == null || w == '') {
-			w = ($(window).width() * 0.9);
-		};
-		if(h == null || h == '') {
-			h = ($(window).height() - 50);
-		};
+	window.moveDep = function (title, url, w, h,table) {
 		layer.open({
 			type: 2,
 			area: [w + 'px', h + 'px'],
@@ -512,16 +500,34 @@ layui.define(['jquery', 'form', 'layer', 'element'], function(exports) {
 			maxmin: true,
 			shadeClose: true,
 			shade: 0.4,
+			btn: ['确认', '取消'],
 			title: title,
-			content: url,
+			content: '../../pages/ztree/ztree.html',
 			success: function(layero, index) {
-				//向iframe页的id=house的元素传值  // 参考 https://yq.aliyun.com/ziliao/133150
-				var body = layer.getChildFrame('body', index);
-				body.contents().find("#dataId").val(id);
-				console.log(id);
 			},
-			error: function(layero, index) {
-				alert("aaa");
+			yes:function(index,layero){
+				var body = layer.getChildFrame('body', index);
+				var obj = {
+					// departmentId:body.find('.departmentId').val(),
+					_method:'put',
+					// statusId:sessionStorage.getItem("statusId"),
+				};
+				$.ajax({
+					method:'post',
+					url:url +sessionStorage.getItem("statusId")+"/"+body.find('.departmentId').val(),
+					data:obj,
+					dataType:'json',
+					success:function (res) {
+						if (res.code === '200') {
+							console.log(res,"resresresresres")
+							table.reload('idstetaTable');
+							layer.close(index);
+						}
+					},
+					error:function (err) {
+
+					}
+				})
 			}
 		});
 	}

static/js/recordTemplate.js

@@ -226,6 +226,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                             // 记录状态
                             if (res.data.recordStatusList !=null) {
                                 sessionStorage.setItem('groudBool','false');
+                                sessionStorage.setItem("addgroudBool",'false');
                                 for (var i = 0; i < res.data.recordStatusList.length; i++) {
                                     if (res.data.recordStatusList[i].isEchart == false) {
                                         var str =`
@@ -251,6 +252,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                                 }
                             }else {
                                 sessionStorage.setItem('groudBool','true');
+                                sessionStorage.setItem("addgroudBool",'true');
                             }
                             // 特殊记录项和记录项
                             var num =0;
@@ -369,16 +371,19 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                 },
                 yes: function (index, layero) {
                     var body = layer.getChildFrame('body', index);
-                    if (body.find(".TemplateName").val() == "") {
+                    var reg = /\S/;
+                    if (!reg.test(body.find(".TemplateName").val())) {
                         layer.msg('请输入模版名称', {icon: 8});
                         return false;
                     }
-                    if (sessionStorage.getItem("groudBool") == 'true' && body.find(".textContent").val() =="" && body.find(".textName").val() == "") {
+                    if (sessionStorage.getItem("groudBool") == 'true' && !reg.test(body.find(".textContent").val())&&!reg.test(body.find(".textName").val())) {
                         layer.msg('请输入文本状态', {icon: 8});
                         return false;
+                    }else if (sessionStorage.getItem("addgroudBool") == 'false' && !reg.test(body.find(".a_stateName1").val())) {
+                        layer.msg('请选择状态组', {icon: 8});
+                        return false;
                     }
-                    console.log(body.find('.select-boxsa').val() == "",'body.find(\'.select-boxsa\').val()')
-                    if (body.find('.fieldName1').val() == "" || body.find('.select-boxsa').val() == "") {
+                    if (!reg.test(body.find(".fieldName1").val())|| body.find('.select-boxsa').val() == "") {
                         layer.msg('请填写记录项字段或类型', {icon: 8});
                         return false;
                     }
@@ -601,23 +606,24 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
             content: addTemplateHtml,
             success: function (layero, index) {
                 var body = layer.getChildFrame('body', index);
-                sessionStorage.getItem("addgroudBool") == 'false'
+                sessionStorage.setItem("addgroudBool",'false');
+                sessionStorage.setItem('groudBool','false');
             },
             yes: function (index, layero) {
                 var body = layer.getChildFrame('body', index);
-                if (body.find(".TemplateName").val() == "") {
+                var reg = /\S/;
+                if (!reg.test(body.find(".TemplateName").val())) {
                     layer.msg('请输入模版名称', {icon: 8});
                     return false;
                 }
-                if (sessionStorage.getItem("addgroudBool") == 'true' && body.find(".textContent").val() =="" && body.find(".textName").val() == "") {
+                if (sessionStorage.getItem("groudBool") == 'true' && !reg.test(body.find(".textContent").val())&&!reg.test(body.find(".textName").val())) {
                     layer.msg('请输入文本状态', {icon: 8});
                     return false;
-                }else if (sessionStorage.getItem("addgroudBool") == 'false' && body.find('.a_stateName1').val() == "") {
+                }else if (sessionStorage.getItem("addgroudBool") == 'false' && !reg.test(body.find(".a_stateName1").val())) {
                     layer.msg('请选择状态组', {icon: 8});
                     return false;
                 }
-                // console.log(body.find('.fieldName1'))
-                if (body.find('.fieldName1').val() == "" || body.find('.select-boxsa').val() == "") {
+                if (!reg.test(body.find(".fieldName1").val())|| body.find('.select-boxsa').val() == "") {
                     layer.msg('请填写记录项字段或类型', {icon: 8});
                     return false;
                 }
@@ -680,7 +686,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     }
                     if (value != "" && inputType != "") {
                         inputList.businessType = businessType == undefined ? "" : businessType;
-                        inputList.inputItems = inputItems == [] ? [] : JSON.parse(inputItems);
+                        inputList.inputItems = inputItems == ""? [] : JSON.parse(inputItems);
                         inputList.inputName = value;
                         inputList.inputType = inputType;
                         inputList.isEchart = isEchart;

static/js/state.js

@@ -35,6 +35,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     });
                     eleTree.on("nodeClick(data)",function(d) {
                         belpID =  d.data.currentData.id;
+                        sessionStorage.setItem("ztreeDepid",d.data.currentData.id)
                         $('.stetaName').val("");
                         var info={
                             statusContent: '',
@@ -143,7 +144,8 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
     // 监听状态table
     table.on('tool(stateItme)', function(obj) {
         if( obj.event === "move"){
-
+            sessionStorage.setItem("statusId",obj.data.id);
+            moveDep('选择部门信息','http://apptest.jieweizhineng.com/api/swagger/api/status/v1/moveStatus/','400','500',table);
         } else if (obj.event === "copy"){
             var content ={
                 _method:'put'
@@ -232,11 +234,12 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                 },
                 yes: function (index, layero) {
                     var body = layer.getChildFrame('body', index);
-                    if (body.find("#stetaName").val() == "") {
+                    var reg = /\S/;
+                    if (!reg.test(body.find("#stetaName").val())) {
                         layer.msg('请输入状态组名称', {icon: 8});
                         return false;
                     }
-                    if (body.find(".a_steta1").val() == "") {
+                    if (!reg.test(body.find(".a_steta1").val())) {
                         layer.msg('请输入状态组子项至少填一个', {icon: 8});
                         return false;
                     }
@@ -287,7 +290,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                 table.reload('idstetaTable');
                                 layer.close(index);
                             }else if (res.code == '422') {
-                                layer.msg('状态内容不能为空', {icon: 1});
+                                layer.msg('状态内容不能为空', {icon: 2});
                                 table.reload('idstetaTable');
                                 layer.close(index);
                             }else{
@@ -350,12 +353,12 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
             },
             yes: function (index, layero) {
                 var body = layer.getChildFrame('body', index);
-                console.log(body.find("#stetaName").val(),'body.find("#stetaName").val()')
-                if (body.find("#stetaName").val() == "") {
+                var reg = /\S/;
+                if (!reg.test(body.find("#stetaName").val())) {
                     layer.msg('请输入状态组名称', {icon: 8});
                     return false;
                 }
-                if (body.find(".a_steta1").val() == "") {
+                if (!reg.test(body.find(".a_steta1").val())) {
                     layer.msg('请输入状态组子项至少填一个', {icon: 8});
                     return false;
                 }
@@ -400,7 +403,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                             table.reload('idstetaTable');
                             layer.close(index);
                         }else if (res.code == '422') {
-                            layer.msg('状态内容不能为空', {icon: 1});
+                            layer.msg('状态内容不能为空', {icon: 2});
                             table.reload('idstetaTable');
                             layer.close(index);
                         } else{