Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/model/Sptsel/Event.js

@@ -93,15 +93,9 @@ export default {
     },
     async handleSearch() {
             if(this.sourceModel.length===0){
-                this.model.chkinc = "t";
-                this.model.chkdzt = "t";
-                this.model.chkcor = "t";
-                this.model.chkaut = "t";
-                this.model.chkdel = "t";
-                this.model.chktco = "t";
-                this.model.chkcan = "t";
-                this.model.chkypt = "t";
-
+                this.sourceData.forEach(s => {
+                    this.model[s.value] = 't';
+                  })
             }
             this.executeDefault("sptstm").then(res => {
                 //TODO 处理数据逻辑

src/views/Business/Sptsel/Menu.vue

@@ -104,6 +104,7 @@
                   placeholder="请选择来源"
                   multiple
                   collapse-tags
+                  @change="sourceChangeEvent"
                 >
                   <el-option
                     v-for="item in sourceData"
@@ -367,7 +368,7 @@ export default {
   mixins: [CommonProcess],
   data() {
     return {
-      //sourceModel: [],
+      sourceModel: [],
       sourceData: [],
       initdialog: false,
       transactionStatus: {
@@ -420,95 +421,17 @@ export default {
         { label: "云平台", value: "chkypt" },
       ];
   },
-  computed: {
-    chkinc: {
-      get() {
-        return this.model.chkinc === "t";
-      },
-      set(val) {
-        this.model.chkinc = val ? "t" : "";
-      },
-    },
-    chkdzt: {
-      get() {
-        return this.model.chkdzt === "t";
-      },
-      set(val) {
-        this.model.chkdzt = val ? "t" : "";
-      },
-    },
-    chkpen: {
-      get() {
-        return this.model.chkpen === "t";
-      },
-      set(val) {
-        this.model.chkpen = val ? "t" : "";
-      },
-    },
-    chkcor: {
-      get() {
-        return this.model.chkcor === "t";
-      },
-      set(val) {
-        this.model.chkcor = val ? "t" : "";
-      },
-    },
-    chkaut: {
-      get() {
-        return this.model.chkaut === "t";
-      },
-      set(val) {
-        this.model.chkaut = val ? "t" : "";
-      },
-    },
-    chkdel: {
-      get() {
-        return this.model.chkdel === "t";
-      },
-      set(val) {
-        this.model.chkdel = val ? "t" : "";
-      },
-    },
-    chktco: {
-      get() {
-        return this.model.chktco === "t";
-      },
-      set(val) {
-        this.model.chktco = val ? "t" : "";
-      },
-    },
-    chkcan: {
-      get() {
-        return this.model.chkcan === "t";
-      },
-      set(val) {
-        this.model.chkcan = val ? "t" : "";
-      },
-    },
-    sourceModel: {
-      get() {
-        let arr = [];
-        this.sourceData.forEach((element) => {
-          if (this.model[element.value]) {
-            arr.push(element.value);
-          }
-        });
-        return arr;
-      },
-      set(val) {
-        let set = new Set(val);
-        this.sourceData.forEach((element) => {
-          if (set.has(element.value)) {
-            this.model[element.value] = true;
-          } else {
-            this.model[element.value] = false;
-          }
-        });
-      },
+  methods: {
+    sourceChangeEvent(val) {
+      this.sourceData.forEach(s => {
+        this.model[s.value] = '';
+      })
+      val.forEach((element) => {
+        this.model[element] = 't';
+      });
     },
+    ...Event
   },
-
-  methods: { ...Event },
   created: function () {},
 };
 </script>

src/views/Layout/SideMenu.vue

@@ -32,7 +32,6 @@ export default {
   data: function() {
     return {
       openFlgArr: [],
-      openFlgArrCopy: [],
       menuOpen: true,
       menuList: [
         // { inifrm: "0", ininam: "公共夹", pntmiu: "" },
@@ -110,6 +109,15 @@ export default {
       return this.$route.path;
     },
   },
+  watch: {
+    $route: function () {
+      this.$nextTick(() => {
+        const arr = []
+        this.getOpenMenusIndex(this.menus, arr)
+        this.openFlgArr = [...new Set([...this.openFlgArr, ...arr])]
+      })
+    }
+  },
   mounted() {
     const arr = [];
     this.generateMenuTree(arr);