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

src/App.vue

@@ -28,6 +28,7 @@ export default {
         this.$store.dispatch("auth/changeAuthArrs", []);
         this.$store.dispatch("auth/changeAuthList", []);
         this.$store.dispatch("auth/changeAuthId", null);
+        this.$store.dispatch("auth/changeAuthStatus", []);
       },
       deep: true
     }

src/components/permissiontree/index copy.vue → src/components/permissiontree/index3.vue

@@ -25,20 +25,11 @@
           </li>
         </ul>
       </div>
-      <div class="paren_list">
-        <ul>
-          <li v-for="(item, index) in treeTitles" :key="index">
-            <div class="up_type" :class="active === index ? 'up_types' : 'up_type'" @click="upActive(item, index)">
-              {{ item.AuthName }}
-            </div>
-          </li>
-        </ul>
-      </div>
       <div class="paren_cont">
         <el-scrollbar style="height: 100%">
-          <el-tree :data="data" show-checkbox @check-change="currentChange" @node-click="handleNodeClick" :defaultProps="defaultProps" :expand-on-click-node="false" node-key="AuthId" default-expand-all ref="tree" highlight-current>
+          <el-tree :data="treeData" show-checkbox @check="currentChange" @node-click="handleNodeClick" :defaultProps="defaultProps" :expand-on-click-node="false" node-key="auth_id" :default-expanded-keys="defaultExpandedKeys" ref="tree" highlight-current>
             <span class="custom-tree-node" slot-scope="{ data }">
-              {{ data.AuthName }}
+              {{ data.auth_name }}
               <div class="logup">
                 <div class="one" v-if="
                     data.AuthList != null && data.AuthList.ValidBegin != null
@@ -65,7 +56,7 @@
 <script>
 // import treeData from "@/views/authorityManagement/minixs/treeData";
 import { translateDataToTreeAll } from "@/utils/validate";
-import { GetAuthTree } from "@/api/apiAuthority";
+import { Query } from '@/api/dataIntegration';
 export default {
   props: {
     title: {
@@ -80,12 +71,13 @@ export default {
   data () {
     return {
       active: 0,
-      data: [],
+      treeData: [],
       treeTitles: [],
       defaultProps: {
         children: "children",
-        label: "AuthName",
+        label: "auth_name",
       },
+      defaultExpandedKeys: [-1],
       dataObj: {}, //上级权限指定树数据
       AuthArrList: [],//权限列表源数据
       AuthList: [],//权限规则列表
@@ -96,85 +88,71 @@ export default {
     checkedKeys: {
       handler (val) {
         this.checkedList = val;
-        this.$refs.tree.setCheckedKeys(val);
+        this.$refs.tree.setCheckedKeys(val)
       },
       deep: true,
     },
-    "$store.state.auth.authList": {
-      handler (val) {
-        this.AuthList = val;
-        this.resetData();
-      },
-      immediate: true,
-      deep: true
-    },
   },
-  created: function () {
-    this.getDataList();
+  created () {
+    this.getDataList()
   },
   methods: {
     //获取权限列表
     getDataList () {
-      GetAuthTree({ QueryName: "" }).then((result) => {
-        if (result.code === 0 && result.returnData.length) {
-          result.returnData.forEach((item) => {
-            item.flag = item.Status === 1 ? true : false;
-            item["AuthList"] = null;
-          });
-          this.AuthArrList = _.cloneDeep(result.returnData);
-          this.toTree();
+      Query({
+        id: DATACONTENT_ID.authTreeId,
+        dataContent: ['']
+      }).then((result) => {
+        if (result.code == 0) {
+          this.AuthArrList = _.cloneDeep(result.returnData.listValues)
+          this.toTree(result.returnData.listValues)
         } else {
-          this.$message.error(result.message);
+          this.$message.error(result.message)
         }
       });
     },
     //数据转树形
-    toTree () {
-      this.data = [];
-      this.dataObj = {};
-      this.treeTitles = [];
-      let arr = null
-      arr = translateDataToTreeAll(
-        this.AuthArrList,
-        "UpAuthId",
-        "AuthId"
+    toTree (arrDatas) {
+      this.treeData = [];
+      const arr = translateDataToTreeAll(
+        arrDatas,
+        "up_auth_id",
+        "auth_id"
       )
-      let items = null
-      items = {
-        AuthId: 0,
-        AuthName: "所有权限",
-        QueryTarget: 0,
-        Status: 0,
-        UpAuthId: 0,
-        Type: 0,
+      const items = {
+        auth_id: -1,
+        auth_name: "所有权限",
+        auth_status: 0,
+        up_auth_id: -2,
+        auth_type: 0,
         children: arr,
       };
-      this.dataObj = _.cloneDeep(items)
-      this.data = [items];
-      let obj = null
-      obj = _.cloneDeep(items);
-      let datas = null
-      datas = obj.children.filter((item) => item.Type === 1);
-      datas.forEach((item) => {
-        delete item.children;
-      });
-      delete obj.children;
-      datas.unshift(obj);
-      this.treeTitles = datas;
-    },
-    //数据切换
-    upActive (item, index) {
-      this.active = index;
-      this.decompose([this.dataObj], item.AuthId);
-      this.$refs.tree.setCheckedKeys(this.checkedList);
+      this.treeData = [items]
     },
     // 树节点选中
     currentChange () {
-      this.checkedList = [],
-        this.$refs.tree.getCheckedNodes().forEach(item => {
-          this.checkedList.push(item.AuthId);
-        })
-      this.$emit("getTreeData", this.$refs.tree.getCheckedNodes());
+      const datas = this.$refs.tree.getCheckedNodes()
+      this.setDataObj(datas)
+    },
+    // 选中后设置初始数据
+    setDataObj (arr) {
+      arr.forEach((item) => {
+        if (!item.AuthList) {
+          item.AuthList = {
+            AuthId: item.auth_id,
+            ValidBegin: "",
+            ValidEnd: "",
+            Action: "1",
+            QueryRow: "",
+            QueryCol: "",
+            NewCol: "",
+            EditRow: "",
+            EditCol: "",
+            DeleteRow: "",
+          };
+        }
+      });
+      this.$emit("getTreeData", arr);
     },
     //获取指定数据
     decompose (data, id) {
@@ -200,8 +178,16 @@ export default {
     },
     //获取点击目标
     handleNodeClick (data) {
-      // this.toTree();
-      this.$store.state.auth.authId = data;
+      if (data.children) {
+        delete data.children
+      }
+      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);
+      this.$store.dispatch("auth/changeAuthArrs", datas);
+      this.$store.dispatch("auth/changeAuthId", data.auth_id);
     }
   },
 };

src/components/rulesofcompetency/index copy.vue

@@ -1,251 +0,0 @@
-<template>
-  <el-form class="bf-rulesofcompetency">
-    <!-- 权限规则 -->
-    <div class="right">
-      <div class="paren_header">
-        <p>{{ title }}</p>
-        <div class="header_right">
-          <el-radio
-            v-model="form.Action"
-            :label="item.id"
-            v-for="(item, index) in option"
-            :key="index"
-            >{{ item.label }}</el-radio
-          >
-        </div>
-      </div>
-      <div>
-        <span>{{name}}</span>
-      </div>
-      <div class="juris_list" :style="{ marginBottom: marginB }">
-        <p>时效范围起</p>
-        <el-date-picker
-          v-model="form.ValidBegin"
-          type="datetime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择时间"
-          size="mini"
-          :picker-options="pickerOptionsStart"
-        >
-        </el-date-picker>
-      </div>
-      <div class="juris_list" :style="{ marginBottom: marginB }">
-        <p>至</p>
-        <el-date-picker
-          @change="setTime"
-          v-model="form.ValidEnd"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
-          placeholder="选择时间"
-          size="mini"
-          :picker-options="pickerOptionsEnd"
-        >
-        </el-date-picker>
-      </div>
-      <div class="juris_list" :style="{ marginBottom: marginB }">
-        <p>许可查询行</p>
-        <el-input
-          v-model="form.QueryRow"
-          placeholder="请输入内容"
-          size="mini"
-        ></el-input>
-      </div>
-      <div class="juris_list" :style="{ marginBottom: marginB }">
-        <p>许可查询列</p>
-        <el-input
-          v-model="form.QueryCol"
-          placeholder="请输入内容"
-          size="mini"
-        ></el-input>
-      </div>
-      <div class="juris_list" :style="{ marginBottom: marginB }">
-        <p>许可删除行</p>
-        <el-input
-          v-model="form.DeleteRow"
-          placeholder="请输入内容"
-          size="mini"
-        ></el-input>
-      </div>
-      <div class="juris_list" :style="{ marginBottom: marginB }">
-        <p>许可新增列</p>
-        <el-input
-          v-model="form.NewCol"
-          placeholder="请输入内容"
-          size="mini"
-        ></el-input>
-      </div>
-      <div class="juris_list" :style="{ marginBottom: marginB }">
-        <p>许可编辑行</p>
-        <el-input
-          v-model="form.EditRow"
-          placeholder="请输入内容"
-          size="mini"
-        ></el-input>
-      </div>
-      <div class="juris_list" :style="{ marginBottom: marginB }">
-        <p>许可编辑列</p>
-        <el-input
-          v-model="form.EditCol"
-          placeholder="请输入内容"
-          size="mini"
-        ></el-input>
-      </div>
-    </div>
-  </el-form>
-</template>
-<script>
-export default {
-  props: {
-    title: {
-      type: String,
-      default: " ",
-    },
-    marginB: {
-      type: String,
-      default: "24px",
-    },
-    authTo: {
-      type: Object,
-      default: () => {},
-    },
-    authList: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      name:"",
-      pickerOptionsStart: {
-        disabledDate: (time) => {
-          if (this.endWeeks) {
-            return time.getTime() >= new Date(this.endWeeks).getTime();
-          }
-        },
-      },
-      pickerOptionsEnd: {
-        disabledDate: (time) => {
-          if (this.firstWeeks) {
-            return (
-              time.getTime() <= new Date(this.firstWeeks).getTime() - 86400000
-            );
-          }
-        },
-      },
-      form: {
-        AuthId:null,
-        DeleteRow: null,
-        EditCol: null,
-        Action: null,
-        EditRow: null,
-        NewCol: null,
-        QueryCol: null,
-        QueryRow: null,
-        ValidBegin: null,
-        ValidEnd: null,
-      },
-      option: [
-        {
-          label: "显示权限",
-          id: 1,
-        },
-        {
-          label: "显示及编辑权限",
-          id: 2,
-        },
-      ],
-      oldVal: null,
-    };
-  },
-  watch: {
-    "$store.state.auth.authId": {
-      handler(val) {
-        if (val && val.AuthId && this.oldVal == null) {
-          this.oldVal = val;
-          this.getFormData(val.AuthId);
-          this.name = val.AuthName;
-        }
-        if (val && val.AuthId && this.oldVal != null) {
-          if (val.AuthId != this.oldVal.AuthId) {
-          this.name = val.AuthName;
-            this.setAuthListData(val);
-          }
-        }
-      },
-      deep: true,
-    },
-  },
-  methods: {
-    getFormData(id) {
-      this.form = {
-        AuthId:null,
-        DeleteRow: null,
-        EditCol: null,
-        Action: null,
-        EditRow: null,
-        NewCol: null,
-        QueryCol: null,
-        QueryRow: null,
-        ValidBegin: null,
-        ValidEnd: null,
-      }
-      let list = this.$store.state.auth.authList;
-      // console.log(list)
-      let idArr = [];
-      list.forEach((item) => {
-        // console.log(item)
-        if(item!=null){
-        idArr.push(item.AuthId);
-        }
-        else{
-          idArr.push(null);
-        }
-      });
-      let index = idArr.indexOf(id);
-      if(index>-1){
-        this.form = this.$store.state.auth.authList[index];
-      }
-      else{
-        this.form.AuthId = id;
-      }
-      console.log( this.form)
-    },
-    setAuthListData(data) {
-      let list = this.$store.state.auth.authList;
-      let idArr = [];
-      list.forEach((item) => {
-        if(item.AuthId){
-        idArr.push(item.AuthId);
-        }
-        else{
-          idArr.push(null);
-        }
-      });
-      let index = idArr.indexOf(this.oldVal.AuthId);
-      if(index>-1){
-        this.$store.state.auth.authList[index] = this.form;
-      }
-      else{
-        this.$store.state.auth.authList.push(this.form)
-      }
-      this.oldVal = data;
-      this.getFormData(data.AuthId);
-    },
-    setTime(val) {
-      if (this.endWeeks < this.firstWeeks) {
-        this.endWeeks = "";
-      }
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import "./rulesofcompetency.scss";
-.el-picker-panel {
-  > .el-picker-panel__footer {
-    > .el-button--text {
-      display: none;
-    }
-  }
-}
-</style>

src/components/rulesofcompetency/index.vue

@@ -86,9 +86,9 @@ export default {
         },
       },
       form: {
-        endWeeks: "",
-        firstWeeks: "",
-        radio: 1,
+        // endWeeks: "",
+        // firstWeeks: "",
+        // radio: 1,
         value1: "",
         value2: "",
         input1: "",
@@ -114,9 +114,9 @@ export default {
     authTo: {
       handler (obj) {
         const {
-          Action,
-          ValidBegin,
-          ValidEnd,
+          // Action,
+          // ValidBegin,
+          // ValidEnd,
           QueryRow,
           QueryCol,
           NewCol,
@@ -124,9 +124,9 @@ export default {
           EditRow,
           DeleteRow,
         } = obj;
-        this.form.radio = Number(Action);
-        this.form.firstWeeks = ValidBegin;
-        this.form.endWeeks = ValidEnd;
+        // this.form.radio = Number(Action);
+        // this.form.firstWeeks = ValidBegin;
+        // this.form.endWeeks = ValidEnd;
         this.form.input1 = QueryRow;
         this.form.input2 = QueryCol;
         this.form.input3 = DeleteRow;
@@ -138,6 +138,7 @@ export default {
     },
     form: {
       handler () {
+        console.log('ddd')
         this.getData();
       },
       deep: true,
@@ -157,6 +158,17 @@ export default {
       },
       deep: true,
     },
+    // "$store.state.auth.authStatus": {
+    //   handler (arr) {
+    //     if (arr && arr.length) {
+    //       const datas = this.$store.getters.authList;
+    //       const res = datas.filter(item => !arr.some(p => item.authId == p.auth_id))
+    //       this.$store.dispatch('auth/changeAuthList', res)
+    //       this.clearFormData()
+    //     }
+    //   },
+    //   deep: true,
+    // },
   },
   methods: {
     setTime () {
@@ -167,9 +179,9 @@ export default {
     },
     getData () {
       const obj = {
-        Action: this.form.radio,
-        ValidBegin: this.form.firstWeeks,
-        ValidEnd: this.form.endWeeks,
+        // Action: this.form.radio,
+        // ValidBegin: this.form.firstWeeks,
+        // ValidEnd: this.form.endWeeks,
         QueryRow: this.form.input1,
         QueryCol: this.form.input2,
         NewCol: this.form.input4,
@@ -201,9 +213,9 @@ export default {
       }
     },
     clearFormData () {
-      this.form.radio = "";
-      this.form.firstWeeks = "";
-      this.form.endWeeks = "";
+      // this.form.radio = "";
+      // this.form.firstWeeks = "";
+      // this.form.endWeeks = "";
       this.form.input1 = "";
       this.form.input2 = "";
       this.form.input3 = "";
@@ -219,9 +231,9 @@ export default {
         data = obj;
       }
       const {
-        Action = "",
-        ValidBegin = "",
-        ValidEnd = "",
+        // Action = "",
+        // ValidBegin = "",
+        // ValidEnd = "",
         QueryRow = "",
         QueryCol = "",
         NewCol = "",
@@ -229,9 +241,9 @@ export default {
         EditRow = "",
         DeleteRow = "",
       } = data;
-      this.form.radio = Number(Action);
-      this.form.firstWeeks = ValidBegin;
-      this.form.endWeeks = ValidEnd;
+      // this.form.radio = Number(Action);
+      // this.form.firstWeeks = ValidBegin;
+      // this.form.endWeeks = ValidEnd;
       this.form.input1 = QueryRow;
       this.form.input2 = QueryCol;
       this.form.input3 = DeleteRow;

src/components/rulesofcompetency/index2.vue

@@ -0,0 +1,143 @@
+<template>
+  <el-form class="bf-rulesofcompetency">
+    <!-- 权限规则 -->
+    <div class="right">
+      <div class="paren_header">
+        <p class="manageTitle">{{ title }}</p>
+      </div>
+      <div class="mt30">
+        <div class="juris_list" :style="{ marginBottom: marginB }">
+          <p>许可查询行</p>
+          <el-input @blur="getForm" v-model="form.QueryRow" placeholder="请输入内容" size="mini"></el-input>
+        </div>
+        <div class="juris_list" :style="{ marginBottom: marginB }">
+          <p>许可查询列</p>
+          <el-input @blur="getForm" v-model="form.QueryCol" placeholder="请输入内容" size="mini"></el-input>
+        </div>
+        <div class="juris_list" :style="{ marginBottom: marginB }">
+          <p>许可删除行</p>
+          <el-input @blur="getForm" v-model="form.DeleteRow" placeholder="请输入内容" size="mini"></el-input>
+        </div>
+        <div class="juris_list" :style="{ marginBottom: marginB }">
+          <p>许可新增列</p>
+          <el-input @blur="getForm" v-model="form.NewCol" placeholder="请输入内容" size="mini"></el-input>
+        </div>
+        <div class="juris_list" :style="{ marginBottom: marginB }">
+          <p>许可编辑行</p>
+          <el-input @blur="getForm" v-model="form.EditRow" placeholder="请输入内容" size="mini"></el-input>
+        </div>
+        <div class="juris_list" :style="{ marginBottom: marginB }">
+          <p>许可编辑列</p>
+          <el-input @blur="getForm" v-model="form.EditCol" placeholder="请输入内容" size="mini"></el-input>
+        </div>
+      </div>
+    </div>
+  </el-form>
+</template>
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: " ",
+    },
+    marginB: {
+      type: String,
+      default: "24px",
+    },
+    authTo: {
+      type: Object,
+      default: () => { },
+    },
+    authList: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data () {
+    return {
+      form: {
+        DeleteRow: null,
+        EditCol: null,
+        EditRow: null,
+        NewCol: null,
+        QueryCol: null,
+        QueryRow: null,
+      },
+      newForm: {}
+    };
+  },
+  watch: {
+    "$store.state.auth.authArrs": {
+      handler () {
+        const id = this.$store.getters.authId
+        const arr = this.$store.getters.authMsg
+        const obj = arr.filter((item) => item.auth_id === id)[0]
+        // console.log(obj)
+        if (obj) {
+          console.log(obj)
+          // this.setFormData(obj)
+        } else {
+          console.log('ddd')
+          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 () {
+      this.form.NewCol = "";
+      this.form.DeleteRow = "";
+      this.form.QueryCol = "";
+      this.form.QueryRow = "";
+      this.form.EditCol = "";
+      this.form.EditRow = "";
+    },
+    setFormData (obj) {
+      let data = {}
+      if (obj.AuthList) {
+        data = obj.AuthList;
+      } else {
+        data = obj
+      }
+      this.form = data
+    },
+    getForm () {
+      console.log('xxx')
+      const id = this.$store.getters.authId
+      if (id) {
+        const arr = this.$store.getters.authMsg
+        this.form.auth_id = id
+        arr.push(this.form)
+        const datas = _.unionBy(arr, "auth_id")
+        console.log(arr)
+        this.$store.dispatch("auth/changeAuthMsg", datas)
+      } else {
+        this.$message.error('请选中要授权的数据后再添加规则')
+      }
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./rulesofcompetency.scss";
+.mt30 {
+  margin-top: 30px;
+}
+</style>

src/store/modules/auths.js

@@ -10,6 +10,7 @@ const state = {
   authMsg: [],
   authArrs: [], //新增-权限规则数据
   authList: [], //编辑-初始化数据
+  authStatus: [], //删除规则-缓存
   authId: null, //新增-选中的权限树id
 }
 
@@ -26,6 +27,9 @@ const mutations = {
   SET_AUTHMSG: (state, authMsg) => {
     state.authMsg = authMsg
   },
+  SET_AUTHSTATUS: (state, authStatus) => {
+    state.authStatus = authStatus
+  },
 }
 
 const actions = {
@@ -40,6 +44,9 @@ const actions = {
   },
   changeAuthMsg ({ commit }, data) {
     commit('SET_AUTHMSG', data)
+  },
+  changeAuthStatus ({ commit }, data) {
+    commit('SET_AUTHSTATUS', data)
   }
 }
 

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -169,6 +169,9 @@ export default {
         this.checksBoxTs(data1, data2, 'add')
       } else {
         this.checksBoxTs(data2, data1, 'del')
+        setTimeout(() => {
+          location.reload()
+        }, 1500);
       }
     },
     //获取权限规则回调
@@ -228,7 +231,6 @@ export default {
           } else {
             this.checksBoxTs(data2, data1, 'del')
           }
-          // this.editRole();
         } else {
           console.log("error submit!!");
           return false;
@@ -237,6 +239,10 @@ 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++) {
           let obj = {
@@ -249,7 +255,7 @@ export default {
               authObj.query_row_condition = authObj.QueryRow
             }
             if (authObj.QueryCol) {
-              authObj.query_col_condition = authObj.QueryCol
+              authObj.query_col_conditon = authObj.QueryCol
             }
             if (authObj.NewCol) {
               authObj.new_col_condition = authObj.NewCol
@@ -265,47 +271,53 @@ export default {
             }
             obj.event = 1
             authObj.event = 1
+            msg1.push(obj)
+            msg2.push(authObj)
           } else {
             obj.event = 3
             authObj.event = 3
+            msg1.push(obj)
+            msg2.push(authObj)
           }
-          GeneralDataReception({
-            serviceId: SERVICE_ID.roleMsgTreeId,
-            dataContent: JSON.stringify(obj)
-          }).then(result => {
-            if (result.code == 0) {
-              if (obj.event == 1) {
-                this.$message.success('添加权限', res.message)
-              } else {
-                this.$message.success('取消权限', res.message)
-              }
+        }
+        GeneralDataReception({
+          serviceId: SERVICE_ID.roleMsgTreeId,
+          dataContent: JSON.stringify(msg1)
+          // dataContent: msg1
+        }).then(result => {
+          if (result.code == 0) {
+            if (type == 'add') {
+              this.$message.success('添加权限', res.message)
             } else {
-              if (obj.event == 1) {
-                this.$message.success('添加权限', res.message)
-              } else {
-                this.$message.success('取消权限', res.message)
-              }
+              this.$message.success('取消权限', res.message)
             }
-          })
-          GeneralDataReception({
-            serviceId: SERVICE_ID.roleMsgAuthId,
-            dataContent: JSON.stringify(authObj)
-          }).then(result => {
-            if (result.code == 0) {
-              if (obj.event == 1) {
-                this.$message.success('添加规则', res.message)
-              } else {
-                this.$message.success('取消规则', res.message)
-              }
+          } else {
+            if (type == 'add') {
+              this.$message.error('添加权限', res.message)
             } else {
-              if (obj.event == 1) {
-                this.$message.success('添加规则', res.message)
-              } else {
-                this.$message.success('取消规则', res.message)
-              }
+              this.$message.error('取消权限', res.message)
             }
-          })
-        }
+          }
+        })
+        GeneralDataReception({
+          serviceId: SERVICE_ID.roleMsgAuthId,
+          dataContent: JSON.stringify(msg2)
+          // dataContent: msg2
+        }).then(result => {
+          if (result.code == 0) {
+            if (type == 'add') {
+              this.$message.success('添加规则', res.message)
+            } else {
+              this.$message.success('取消规则', res.message)
+            }
+          } else {
+            if (type == 'add') {
+              this.$message.error('添加规则', res.message)
+            } else {
+              this.$message.error('取消规则', res.message)
+            }
+          }
+        })
       } else {
         this.$message.error('未选中数据')
       }