1

src/views/recordComponents/plan.vue

@@ -13,6 +13,7 @@
         row-key="id"
         :columns="columns"
         :datasource="datasource"
+        @columns-change="handleColumnChange"
         :cache-key="cacheKeyUrl"
         autoAmendPage
       >

src/views/recordComponents/workOrder.vue

@@ -13,6 +13,7 @@
         :columns="columns"
         :datasource="datasource"
         :cache-key="cacheKeyUrl"
+        @columns-change="handleColumnChange"
         autoAmendPage
       >
         <template v-slot:toolbar> </template>
@@ -184,8 +185,11 @@
             showOverflowTooltip: true,
             minWidth: 110,
             formatter: (row) => {
+              if ((row.type == 2 && row.status == 1) || row.type != 1) {
+                return row.executeUsers.map((i) => i.userName).join(',');
+              }
+              return '';
               // if (row.type == 0) {
-              return row.executeUsers.map((i) => i.userName).join(',');
               // }
             }
           },

src/views/recordComponents/workOrderReport.vue

@@ -289,8 +289,8 @@
     </el-form>
 
     <parentList
-      :classType="pageName == 'steamInjectionInspectionRecord' ? '1' : '2'"
-      :type="pageName == 'steamInjectionInspectionRecord' ? '17' : '19'"
+      :classType="pageName == 'solidWasteRecord' ? '2' : '1'"
+      :type="pageName == 'solidWasteRecord' ? '19' : '17'"
       ref="parentListRef"
       @changeParent="changeParent"
     >