Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/components/permissiontree/index2.vue

@@ -92,6 +92,14 @@ export default {
       },
       deep: true,
     },
+    "$store.state.auth.authList": {
+      handler (val) {
+        this.AuthList = val;
+        this.resetData();
+        this.defaultExpandedKeys = [this.$store.getters.authId]
+      },
+      deep: true,
+    },
   },
   created () {
     this.getDataList()
@@ -105,17 +113,17 @@ export default {
       }).then((result) => {
         if (result.code == 0) {
           this.AuthArrList = _.cloneDeep(result.returnData.listValues)
-          this.toTree(result.returnData.listValues)
+          this.toTree(this.AuthArrList)
         } else {
           this.$message.error(result.message)
         }
       });
     },
     //数据转树形
-    toTree (arrDatas) {
+    toTree () {
       this.treeData = [];
       const arr = translateDataToTreeAll(
-        arrDatas,
+        this.AuthArrList,
         "up_auth_id",
         "auth_id"
       )
@@ -139,10 +147,7 @@ export default {
       arr.forEach((item) => {
         if (!item.AuthList) {
           item.AuthList = {
-            AuthId: item.auth_id,
-            ValidBegin: "",
-            ValidEnd: "",
-            Action: "1",
+            auth_id: item.auth_id,
             QueryRow: "",
             QueryCol: "",
             NewCol: "",
@@ -169,8 +174,8 @@ export default {
       this.AuthArrList.forEach((item1) => {
         item1["AuthList"] = null;
         this.AuthList.forEach((item2) => {
-          if (item1.AuthId == item2.AuthId) {
-            item1.AuthList = item2;
+          if (item1.auth_id == item2.auth_id) {
+            item1.AuthList = item2.AuthList;
           }
         });
       });
@@ -184,8 +189,8 @@ export default {
       const arr = this.$store.getters.authArrs;
       arr.push(data);
       const datas = _.unionBy(arr, "auth_id");
-      const newDatas = _.cloneDeep(datas);
-      this.$store.dispatch("auth/changeAuthMsg", newDatas);
+      // const newDatas = _.cloneDeep(datas);
+      // this.$store.dispatch("auth/changeAuthMsg", newDatas);
       this.$store.dispatch("auth/changeAuthArrs", datas);
       this.$store.dispatch("auth/changeAuthId", data.auth_id);
     }

src/components/rulesofcompetency/index2.vue → src/components/rulesofcompetency/index0.vue

@@ -75,29 +75,13 @@ export default {
         const arr = this.$store.getters.authMsg
         const obj = arr.filter((item) => item.auth_id === id)[0]
         if (obj) {
-          console.log(obj)
+          this.setFormData(obj)
         } else {
-          console.log('清除输入框')
           this.clearFormData()
         }
       },
       deep: true
-    },
-    // form: {
-    //   handler (obj) {
-    //     const id = this.$store.getters.authId
-    //     if (id) {
-    //       const arr = this.$store.getters.authMsg
-    //       obj.auth_id = id
-    //       arr.push(obj)
-    //       const datas = _.unionBy(arr, "auth_id")
-    //       this.$store.dispatch("auth/changeAuthMsg", datas)
-    //     } else {
-    //       this.$message.error('请选中要授权的数据后再添加规则')
-    //     }
-    //   },
-    //   deep: true
-    // }
+    }
   },
   methods: {
     clearFormData () {
@@ -118,12 +102,18 @@ export default {
       this.form = data
     },
     getForm () {
-      const id = this.$store.getters.authId
-      const arr = this.$store.getters.authMsg
+      const id = this.$store.getters.authId;
+      const arr = this.$store.getters.authArrs;
       this.form.auth_id = id
-      this.formDatas.push(this.form)
-      console.log(arr)
-      console.log(this.formDatas[this.formDatas.length - 1])
+      arr.filter(item => {
+        if (item.auth_id == id) {
+          item.AuthList = _.cloneDeep(this.form)
+        }
+      })
+      const datas = _.unionBy(arr, "auth_id");
+      const newDatas = _.cloneDeep(datas);
+      this.$store.dispatch("auth/changeAuthMsg", newDatas);
+      this.$store.dispatch("auth/changeAuthList", newDatas);
     }
   },
 };

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -239,9 +239,6 @@ export default {
     },
     async checksBoxTs (datas, arr, type) {
       const res = [...datas, ...arr].filter(item => !(datas.some(p => item.auth_id == p.auth_id) && arr.some(c => item.auth_id == c.auth_id)))
-      // if (type == 'del') {
-      //   this.$store.dispatch('auth/changeAuthStatus', res)
-      // }
       const [msg1, msg2] = [[], []]
       if (res && res.length) {
         for (let i = 0; i < res.length; i++) {
@@ -278,12 +275,21 @@ export default {
             authObj.event = 3
             msg1.push(obj)
             msg2.push(authObj)
+            // const authList = this.$store.getters.authList;
+            // authList.forEach((item, index) => {
+            //   msg2.forEach(p => {
+            //     if (item.auth_id == p.auth_id) {
+            //       authList.splice(index, 1)
+            //     }
+            //   })
+            // })
+            // this.$store.dispatch("auth/changeAuthMsg", authList);
+            // this.$store.dispatch("auth/changeAuthList", authList);
           }
         }
         GeneralDataReception({
           serviceId: SERVICE_ID.roleMsgTreeId,
           dataContent: JSON.stringify(msg1)
-          // dataContent: msg1
         }).then(result => {
           if (result.code == 0) {
             if (type == 'add') {
@@ -302,7 +308,6 @@ export default {
         GeneralDataReception({
           serviceId: SERVICE_ID.roleMsgAuthId,
           dataContent: JSON.stringify(msg2)
-          // dataContent: msg2
         }).then(result => {
           if (result.code == 0) {
             if (type == 'add') {
@@ -319,7 +324,7 @@ export default {
           }
         })
       } else {
-        this.$message.error('未选中数据')
+        // this.$message.error('未选中数据')
       }
     },
     //确认保存