关联表格样式处理

zkqy-ui/src/views/bussiness/OAMange.vue

@@ -248,7 +248,7 @@ export default {
           label: "任务编号",
         },
         {
-          prop: "bepTaskName",
+          prop: "bepTaskProcessName",
           label: "任务名称",
         },
         // {
@@ -308,7 +308,7 @@ export default {
             label: "任务编号",
           },
           {
-            prop: "bepTaskName",
+            prop: "bepTaskProcessName",
             label: "任务名称",
           },
           // {
@@ -570,7 +570,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         taskName: "",
-        taskProcessState: "1",
+        taskProcessState: "0",
+        taskProcessType: 1,
       };
       this.getList();
     },

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

@@ -12,6 +12,7 @@
       ref="singleTable"
       :data="tableList"
       height="300"
+      width="100%"
       highlight-current-row
       @row-click="
         (row, e, column) => handleCurrentChange(row, e, column, cardData)
@@ -423,7 +424,6 @@ export default {
               Object.assign(item, defaultData);
             });
 
-
             let res = await addTableData(data);
             if (res.code == 200) {
               this.$modal.msgSuccess("添加成功");

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

@@ -1,29 +1,29 @@
 <template>
   <div class="app-container">
-    <el-card shadow="always" :body-style="{ padding: '20px' }">
-      <template #header>
-        <div class="card_list">
-          <div
-            class="card_wrap"
-            v-for="(cardData, index) in tableLists"
-            :key="index"
-          >
-            <TableCard
-              :ref="'childComponent' + index"
-              @updateData="updateDataList"
-              @getChildData="getChildData"
-              @getDefaultCardData="getDefaultCardData"
-              @getEditHandle="getEditHandle"
-              :tableKey="cardData.tableKey"
-              :sort="cardData.sort"
-              :cardData="cardData"
-              :index="index"
-            ></TableCard>
-          </div>
-        </div>
-      </template>
-      <!-- card body -->
-    </el-card>
+    <!-- <el-card shadow="always" :body-style="{ padding: '20px' }"> -->
+    <!-- <template #header> -->
+    <div class="card_list">
+      <div
+        class="card_wrap"
+        v-for="(cardData, index) in tableLists"
+        :key="index"
+      >
+        <TableCard
+          :ref="'childComponent' + index"
+          @updateData="updateDataList"
+          @getChildData="getChildData"
+          @getDefaultCardData="getDefaultCardData"
+          @getEditHandle="getEditHandle"
+          :tableKey="cardData.tableKey"
+          :sort="cardData.sort"
+          :cardData="cardData"
+          :index="index"
+        ></TableCard>
+      </div>
+    </div>
+    <!-- </template> -->
+    <!-- card body -->
+    <!-- </el-card> -->
   </div>
 </template>
 
@@ -135,12 +135,14 @@ export default {
 <style lang="scss" scoped>
 .card_list {
   display: flex;
+  width: 100%;
   .card_wrap {
     // max-height: 400px;
     display: flex;
     flex-wrap: wrap;
     max-width: 400px;
     margin-right: 20px;
+    min-width: 30%;
   }
 }
 ::v-deep .box-card[data-v-f25ef500] {