修改关联表格修改单表key覆盖问题

zkqy-ui/src/views/bpmprocess/index.vue

@@ -24,7 +24,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="流程开启状态"
         class="item_label"
         prop="processOpneState"
@@ -49,7 +49,7 @@
           placeholder="请选择流程部署时间"
         >
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="版本状态" prop="processVersion">
 
         <el-select
@@ -151,13 +151,13 @@
         </template>
       </el-table-column>
       <el-table-column label="流程别名" align="center" prop="processKey" />
-      <el-table-column label="流程状态" align="center" prop="processOpneState">
+      <!-- <el-table-column label="流程状态" align="center" prop="processOpneState">
         <template slot-scope="scope">
           <span>{{
             getDictLabel(scope.row.processOpneState, dict.type.bpm_state)
           }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="流程类型" align="center" prop="processType">
         <template slot-scope="scope">
           <span>{{
@@ -165,7 +165,7 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="流程部署时间"
         align="center"
         prop="processDeployTime"
@@ -176,7 +176,7 @@
             parseTime(scope.row.processDeployTime, "{y}-{m}-{d}")
           }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="启动事件类型"
         align="center"

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

@@ -206,7 +206,9 @@ export default {
     async getTableHandle(res) {
       this.columns = [];
       // 得到当前模版信息 --- sql columns queryWhere
+
       this.templateInfo = res.data.resultMap;
+      console.log(this.templateInfo.template);
       this.queryParams.orderByColumn =
         res.data.resultMap.querySql.orderByColumn;
       this.sortOrder = JSON.parse(res.data.resultMap.querySql.sortOrder);

zkqy-ui/src/views/relateTable/index.vue

@@ -71,7 +71,6 @@
       <el-table-column label="表格组名" align="center" prop="groupName" />
       <el-table-column label="描述" align="center" prop="groupDescription" />
       <el-table-column label="表格数" align="center" prop="groupCount" />
-
       <el-table-column label="成员表格" width="180">
         <template slot-scope="scope">
           <el-popover trigger="hover" placement="top">
@@ -1070,7 +1069,7 @@ export default {
 
           this.relyFileds.tableFieldList = this.tableFieldList;
           this.relyFileds.tableName = this.tableItemForm.tableName;
-          this.tableItemForm.rowId = Date.now();
+          // this.tableItemForm.rowId = Date.now();
           let newTableData = {
             //收集到的表格编辑结果
             dtName: this.tableItemForm.title,
@@ -1081,7 +1080,7 @@ export default {
             timeFormate: this.tableItemForm.timeFormate,
             primaryKey: this.tableItemForm.selectFields,
             tId: this.tId,
-            tableKey: tableKey,
+            tableKey: this.tableItemForm.rowId || tableKey,
             sortOrder: this.tableItemForm.isAsc,
             sqlKey: sqlKey,
             dtColumnName: columns,
@@ -1211,7 +1210,6 @@ export default {
         this.tableFieldList = echoData.tableFieldData;
         this.tableItemForm.tId = row.tId;
         this.tableItemForm.rowId = row.tableKey;
-        console.log(typeof row.sortOrder);
         this.$set(this.tableItemForm, "isAsc", row.sortOrder);
         // this.tableItemForm.isAsc = row.sortOrder;
         this.tableItemForm.orderByColumn = row.orderByColumn;
@@ -1348,6 +1346,8 @@ export default {
             this.$message.error("请包含多个表格");
             return;
           }
+          // console.log(this.tableDataList);
+          // return;
           if (this.groupTitle) {
             let uuid = uuidv4();
             let groupKeyObj = {
@@ -1589,7 +1589,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      this.getTableList();
     },
     /** 重置按钮操作 */
     resetQuery() {