Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

侯茂昌 1 rok temu
rodzic
commit
2030a4a050

+ 10 - 9
ruoyi-ui/src/views/relateTable/components/RelateTableCard.vue

@@ -137,7 +137,6 @@ export default {
       // cru 弹窗
       open: false,
       // 回显表格数据,
-      defaultValue: '',
       currentRow: null,
       // 用户表格数据
       tableList: [],
@@ -328,7 +327,7 @@ export default {
         this.jsonData = JSON.parse(data.dfVueTemplate);
         this.open = true;
         this.title = "添加信息";
-        this.form.password = this.initPassword;
+        // this.form.password = this.initPassword;
         this.$nextTick(() => {
           this.$refs.addFromRef.reset();
           inputDisableComplete();
@@ -381,8 +380,6 @@ export default {
             } else {
               this.$modal.msgError("修改失败");
             }
-            this.gettableListHandler(this.tableKey)
-
           } else {
             let res = await addTableData(data);
             if (res.code == 200) {
@@ -390,10 +387,10 @@ export default {
             } else {
               this.$modal.msgError("添加失败");
             }
-            this.gettableListHandler(this.tableKey)
           }
+          this.tableList = []
+          this.gettableListHandler(this.tableKey)
           this.defaultValue = {};
-          this.getDataHandler();
           this.open = false;
         })
         .catch((res) => {
@@ -408,16 +405,19 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row)
       getInfoBySqlKey(this.templateInfo.template.sqlKey).then(({data}) => {
         if (!data || !data.dfVueTemplate) {
           this.$message.error("当前表格未绑定表单!");
           return;
         }
         Object.assign(this.defaultValue, row);
+
+        // console.log('123', this.defaultValue)
         this.jsonData = JSON.parse(data.dfVueTemplate);
         this.open = true;
         this.title = "修改信息";
-        this.form.password = this.initPassword;
+        // this.form.password = this.initPassword;
         this.$nextTick(() => {
           this.$refs.addFromRef.setData(row);
         });
@@ -466,10 +466,11 @@ export default {
           return delTableData(data);
         })
         .then(() => {
-
           // 调用子组件查询方法 目的是携带上子组件中的查询参数
-          this.$refs.mychild.pageList();
+          // this.$refs.mychild.pageList();
           this.$modal.msgSuccess("删除成功");
+          this.gettableListHandler(this.tableKey)
+
         })
         .catch(() => {
         });

+ 1 - 0
ruoyi-ui/src/views/relateTable/index.vue

@@ -144,6 +144,7 @@
         <el-form :model="groupForm" :rules="grouprules" ref="groupForm" label-width="100px" class="demo-ruleForm">
           <el-form-item label="菜单名称" prop="groupName">
             <el-input v-model="groupForm.groupName" placeholder="请输入菜单名称"
+            @input="iptChange()"
             ></el-input>
           </el-form-item>
           <el-form-item label="菜单描述" prop="groupDescription">