Merge branch 'dev' into cheng

src/views/dataPermission/index.vue

@@ -309,8 +309,18 @@ export default {
     ListToTree(){
       var a =[]
       if(this.list.length==1){
-        a = this.list[0]
-         a.nodeType='logic'
+        // a[0]={}
+        // a[0].nodeType='logic'
+        // a[0].logicOpr = 'and'
+        // a[0].left=this.list[0]
+        // a[0].right = {
+        //   field: "1",
+        //   nodeType: "exp",
+        //   opr: "=",
+        //   value: "1"
+        // }
+        a[0]=this.list[0]
+        //  a.nodeType='logic'
       }else{
         a[0]=this.list[0]
           a[0].nodeType='exp'
@@ -392,11 +402,18 @@ export default {
       this.title = '新增数据权限'
       this.visible = true
       this.ruleForm={}
+      this.list=[]
     },
     handleEdit(row) {
       this.title = '编辑数据权限'
       this.visible = true
-      this.TreeToList(JSON.parse(row.rule))
+      console.log(JSON.parse(row.rule))
+      if(JSON.parse(row.rule).hasOwnProperty('left')){
+        this.TreeToList(JSON.parse(row.rule))
+      }else{
+        this.list[0]=JSON.parse(row.rule)
+      }
+      
       this.ruleForm = { ...row }
     },
     close() {
@@ -437,8 +454,10 @@ export default {
     submit() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
+          this.ruleForm.functionId=this.fun.fun.id
           this.btnLoading = true
           this.ListToTree()
+          console.log(this.ruleForm)
           if (this.ruleForm.id) {
             this.$api.editData(this.ruleForm).then(response => {
               this.$message.success('编辑成功')
@@ -450,7 +469,12 @@ export default {
             })
           } else {
             this.ruleForm.tenant=this.userinfo.tenantId
+<<<<<<< HEAD
             // console.log(this.ruleForm)
+=======
+           
+           
+>>>>>>> dev
             this.$api.addData(this.ruleForm).then(response => {
               this.$message.success('新增成功')
               this.btnLoading = false

src/views/role/index.vue

@@ -89,7 +89,7 @@
                         <template slot-scope="scope">
                           <span v-if="checkList.filter(item=>item==scope.row.id)[0]">
                             <span v-if="(permissionData.filter(item=>item.functionId == scope.row.id))[0]">{{(permissionData.filter(item=>item.functionId == scope.row.id))[0].data.name}}</span>
-                            <el-link style="margin-left: 10px" :underline="false" v-if="(permissionData.filter(item=>item.functionId == scope.row.id))[0]" @click="editpremissVisibale(scope.row,(permissionData.filter(item=>item.functionId == scope.row.id))[0].data)">修改</el-link>
+                            <el-link style="margin-left: 10px" :underline="false" v-if="(permissionData.filter(item=>item.functionId == scope.row.id))[0].data.id" @click="editpremissVisibale(scope.row,(permissionData.filter(item=>item.functionId == scope.row.id))[0].data)">修改</el-link>
                             <el-link style="margin-left:10px" :underline="false" v-else-if="checkList.filter(item=>item==scope.row.id)[0]" @click="addpremissVisibale(scope.row)">添加</el-link>
                           </span>
                           
@@ -205,7 +205,7 @@ export default {
       if(this.permissionData.filter(item=>item.functionId == this.pdata.functionId)[0]){
         if(this.pdata.data){
           // console.log(11)
-          this.permissionData.filter(item=>item.functionId == this.pdata.functionId)[0].permissionData = this.pdata.data
+          this.permissionData.filter(item=>item.functionId == this.pdata.functionId)[0].data = this.pdata.data
         }else{
           //  console.log(this.permissionData)
           var index = this.permissionData.findIndex((item) => {
@@ -227,15 +227,22 @@ export default {
       this.permissVisible=false
     },
     getFunInfo(val) {
-      // console.log(this.checkList.includes(val))
+      console.log(val)
       if(!this.checkList.includes(val)){
           var index = this.permissionData.findIndex((item) => {
               return item.functionId == val;
           });
-        if (!index) {
+          console.log(index)
+        if (index!=-1) {
+          // console.log(1121)
           this.permissionData.splice(index,1)
         }
-        // console.log(this.permissionData)
+        console.log(this.permissionData)
+      }else{
+        this.permissionData.push({
+          functionId:val,
+          data:{}
+        })
       }
     },
     handleCheckedCitiesChange(value) {