修改

src/components/publicPageForm/index.vue

@@ -276,6 +276,8 @@ export default {
           maps.push(nitem)
         })
         this.tableForm.passparameters = JSON.stringify(maps)
+      } else {
+        this.tableForm.passparameters = null
       }
     },
     clearTypeUpload (nload = []) {
@@ -295,8 +297,7 @@ export default {
       const npass = this.tableForm.passparameters
       if (nload?.length) this.addTypeUpload(nload)
       if (ndata?.length) this.addTypePassWord(ndata)
-      if (npass?.length) { this.formatPass(npass) }
-      // if (npass?.length) { this.formatPass(npass) } else this.tableForm.passparameters = null
+      if (npass) { this.formatPass(npass) }
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           flag = true

src/views/permissionPage/components/permissionList.vue

@@ -78,7 +78,18 @@ export default {
       queryItem: {},
       tableKey: '',
       rowData: {},
-      selectOptions: []
+      selectOptions: [],
+      queryId: 6,
+      userList: [
+        {
+          path: '/userpPermission',
+          tid: 7
+        },
+        {
+          path: '/userGroupPermission',
+          tid: 6
+        }
+      ]
     }
   },
   watch: {
@@ -86,12 +97,13 @@ export default {
       handler (row) {
         if (Object.keys(row).length) {
           const queryItem = {}
+          const pname = this.queryId == 7 ? '用户' : '用户组'
           queryItem[this.nodeKey] = row[this.nodeKey]
           this.ischeck = true
           this.checkDatas = []
           this.queryItem = queryItem
           this.$refs.tree.setCheckedKeys([])
-          this.queryTreeData(6, queryItem, '用户组')
+          this.queryTreeData(this.queryId, queryItem, pname)
         }
       },
       deep: true,
@@ -113,15 +125,21 @@ export default {
   computed: {
     ...mapGetters(['authArrs'])
   },
+  created () {
+    const { path } = this.$route
+    const pitem = this.userList.filter(item => item.path == path)
+    this.queryId = pitem[0].tid
+  },
   mounted () {
     this.setAuthData()
   },
   methods: {
     restDataRow () {
+      const pname = this.queryId == 7 ? '用户' : '用户组'
       this.ischeck = true
       this.checkDatas = []
       this.$refs.tree.setCheckedKeys([])
-      this.queryTreeData(6, this.queryItem, '用户组')
+      this.queryTreeData(this.queryId, this.queryItem, pname)
     },
     //高级查询-提交
     advancedTable (refName) {
@@ -301,8 +319,11 @@ export default {
           selectcolumnlist: item.selectcolumnlist || '',
           filterset: item.filterset || ''
         }
+        if (this.queryId == 7) {
+          paramsItem.userid = item.userid
+        }
         const params = {
-          serviceid: 6,
+          serviceid: this.queryId,
           datacontent: formatChange(Object.assign(paramsItem, this.queryItem), event, key),
           event
         }