Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/relateTable/components/RelateTableCard.vue

@@ -207,6 +207,7 @@ export default {
       this.columns = [];
       // 得到当前模版信息 --- sql columns queryWhere
       this.templateInfo = res.data.resultMap;
+      console.log(1111, this.templateInfo.template);
       this.queryParams.orderByColumn =
         res.data.resultMap.querySql.orderByColumn;
       this.sortOrder = JSON.parse(res.data.resultMap.querySql.sortOrder);
@@ -279,9 +280,10 @@ export default {
       let tableLists;
       console.log(this.newsort);
       if (contion && list) {
-        console.log(contion);
         let key = contion.split(".");
+        console.log(contion, list, key[1]);
         this.queryParams.queryMap["#{" + contion] = "'" + list[key[1]] + "'";
+        // this.queryParams.queryMap["#{" + contion] = list[key[1]];
 
         this.queryParams.queryMap.sqlkey = this.templateInfo.template.sqlKey;
 

zkqy-ui/src/views/system/role/index.vue

@@ -608,22 +608,22 @@ export default {
       if (this.$refs.menu != undefined) {
         this.$refs.menu.setCheckedKeys([]);
       }
-      (this.menuExpand = false),
-        (this.menuNodeAll = false),
-        (this.deptExpand = true),
-        (this.deptNodeAll = false),
-        (this.form = {
-          roleId: undefined,
-          roleName: undefined,
-          roleKey: undefined,
-          roleSort: 0,
-          status: "0",
-          menuIds: [],
-          deptIds: [],
-          menuCheckStrictly: true,
-          deptCheckStrictly: true,
-          remark: undefined,
-        });
+      this.menuExpand = false;
+      this.menuNodeAll = false;
+      this.deptExpand = true;
+      this.deptNodeAll = false;
+      this.form = {
+        roleId: undefined,
+        roleName: undefined,
+        roleKey: undefined,
+        roleSort: 0,
+        status: "0",
+        menuIds: [],
+        deptIds: [],
+        menuCheckStrictly: true,
+        deptCheckStrictly: true,
+        remark: undefined,
+      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */