Apple пре 6 година
родитељ
комит
3754ce14bb
2 измењених фајлова са 17 додато и 11 уклоњено
  1. 6 9
      .idea/workspace.xml
  2. 11 2
      static/js/state.js

+ 6 - 9
.idea/workspace.xml

@@ -2,9 +2,6 @@
 <project version="4">
   <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>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -49,8 +46,8 @@
       <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="394">
-              <caret line="371" column="19" selection-start-line="371" selection-start-column="19" selection-end-line="371" selection-end-column="19" />
+            <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>
           </provider>
         </entry>
@@ -286,12 +283,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="91584000" />
+      <workItem from="1555841941143" duration="91864000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="99958000" />
+    <option name="totallyTimeSpent" value="100238000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -663,8 +660,8 @@
     </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 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>
       </provider>
     </entry>

+ 11 - 2
static/js/state.js

@@ -286,6 +286,10 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                 layer.msg('修改成功', {icon: 1});
                                 table.reload('idstetaTable');
                                 layer.close(index);
+                            }else if (res.code == '422') {
+                                layer.msg('状态内容不能为空', {icon: 1});
+                                table.reload('idstetaTable');
+                                layer.close(index);
                             }else{
                                 layer.msg('修改失败,请检查信息', {icon: 2});
                                 table.reload('idstetaTable');
@@ -346,6 +350,7 @@ 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() == "") {
                     layer.msg('请输入状态组名称', {icon: 8});
                     return false;
@@ -394,8 +399,12 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                             layer.msg('添加成功', {icon: 1});
                             table.reload('idstetaTable');
                             layer.close(index);
-                        }else{
-                            layer.msg('状态项不能为空', {icon: 2});
+                        }else if (res.code == '422') {
+                            layer.msg('状态内容不能为空', {icon: 1});
+                            table.reload('idstetaTable');
+                            layer.close(index);
+                        } else{
+                            layer.msg('添加失败,请检查信息或网络', {icon: 2});
                             table.reload('idstetaTable')
                         }
                     },