Merge branch 'master' of http://118.126.103.67:3000/JS_Park/gongshi

src/views/dashboard/index.vue

@@ -711,6 +711,7 @@ export default {
             this.set_shengEnable(false);
             this.set_lock_gongzi(false);
             this.setGongshi([]);
+            this.switchState()
             // this.gongzi.$refs.reflock.doClose();
           });
           // this.set_lock_waipandan(false);
@@ -721,7 +722,6 @@ export default {
           this.$refs.refMegerdata.doClose();
         }
       });
-      this.switchState()
     },
 
     // 显示导入弹框

src/views/luru/gongshi.vue

@@ -569,6 +569,7 @@ export default {
       this.set_lock_gongshi(false);
       this.set_shengEnable(false);
       this.$refs.reflock.doClose();
+      this.switchState()
     },
 
     init() {

src/views/luru/gongzi.vue

@@ -405,6 +405,10 @@ export default {
       if (this.editable) {
         if (column.label != "本月工资" || row.id == 999999) {
           ret += suo;
+          console.log(column.label != "本月工资");
+          console.log(row.id == 999999);
+          console.log('我到了这里第');
+          console.log(row , column);
         }
       }
       if (row.id == 999999) {

src/views/luru/waipandan.vue

@@ -601,6 +601,7 @@ export default {
       );
       this.set_shengEnable(false);
       this.$refs.popverRef.doClose();
+      this.switchState()
     },
 
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {