ly il y a 1 an
Parent
commit
83ee40a642

+ 15 - 7
src/views/business/entrust/workOrder/once/index.vue

@@ -80,12 +80,12 @@
         min-width="250"
         prop="companyName"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="税号"
         align="center"
         prop="socialCreditCode"
         min-width="160"
-      />
+      /> -->
       <el-table-column
         label="工单类型"
         align="center"
@@ -96,6 +96,12 @@
           {{ scope.row.type === 1 ? "循环工单" : "代办工单" }}
         </template>
       </el-table-column>
+         <el-table-column
+        label="说明"
+        align="center"
+        prop="explain"
+        min-width="180"
+      />
       <el-table-column
         label="项目"
         align="center"
@@ -103,15 +109,17 @@
         min-width="600"
       >
         <template #default="scope">
-          {{ scope.row.noContract === 1 ? scope.row.remark : "" }}
-          {{ scope.row.taskTypeName }}
           {{
-            scope.row.taskTypeDetailName
-              ? `-${scope.row.taskTypeDetailName}`
-              : ""
+            scope.row.noContract === 1? scope.row.remark: `${scope.row.taskTypeName}${scope.row.alterType ?`-${scope.row.alterType}` : ""}${scope.row.taskTypeDetailName? `-${scope.row.taskTypeDetailName}` : ""}`
           }}
         </template>
       </el-table-column>
+      <el-table-column
+      label="说明"
+      align="center"
+      prop="explain"
+      min-width="180"
+    />
       <el-table-column label="工单执行人" align="center" min-width="120">
         <template #default="scope">
           {{

+ 13 - 11
src/views/business/production/onceWork/index.vue

@@ -70,12 +70,12 @@
         min-width="250"
         prop="companyName"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="税号"
         align="center"
         prop="socialCreditCode"
         min-width="150"
-      />
+      /> -->
       <el-table-column label="工单类型" align="center" prop="amount" width="80">
         <template #default="scope">
           {{ scope.row.type === 1 ? "循环工单" : "代办工单" }}
@@ -87,16 +87,18 @@
         prop="taskTypeName"
         width="200"
       >
-        <template #default="scope">
-          {{ scope.row.noContract === 1 ? scope.row.remark : "" }}
-          {{ scope.row.taskTypeName }}
-          {{
-            scope.row.taskTypeDetailName
-              ? `-${scope.row.taskTypeDetailName}`
-              : ""
-          }}
-        </template>
+      <template #default="scope">
+        {{
+          scope.row.noContract === 1? scope.row.remark: `${scope.row.taskTypeName}${scope.row.alterType ?`-${scope.row.alterType}` : ""}${scope.row.taskTypeDetailName? `-${scope.row.taskTypeDetailName}` : ""}`
+        }}
+      </template>
       </el-table-column>
+      <el-table-column
+      label="说明"
+      align="center"
+      prop="explain"
+      min-width="180"
+    />
       <el-table-column label="执行人" align="center" width="100">
         <template #default="scope">
           {{

+ 8 - 2
src/views/business/service/once/index.vue

@@ -96,12 +96,12 @@
         prop="companyName"
         min-width="250"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="税号"
         align="center"
         prop="socialCreditCode"
         min-width="180"
-      />
+      /> -->
       <el-table-column
         label="服务内容"
         align="center"
@@ -116,6 +116,12 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column
+        label="说明"
+        align="center"
+        prop="explain"
+        min-width="180"
+      />
       <el-table-column label="状态" align="center" width="80">
         <template #default="scope">
           <div :style="getStatusStyle(scope.row)">