修改bug

src/views/produce/components/new_produceOrder.vue

@@ -67,6 +67,14 @@
         </div>
       </template>
 
+      <template v-slot:entrustStatus="{ row }">
+        <div v-if="row.entrustStatus">
+          <span v-if="row.entrustStatus == 1">未请托</span>
+          <span v-if="row.entrustStatus == 2">请托中</span>
+          <span v-if="row.entrustStatus == 3">请托完成</span>
+        </div>
+      </template>
+
       <template v-slot:workOrderType="{ row }">
         <span v-if="row.workOrderType == 1">普通订单</span>
         <span v-if="row.workOrderType == 2">临时订单</span>
@@ -236,6 +244,13 @@
             slot: 'outsourceStatus',
             showOverflowTooltip: true
           },
+          {
+            prop: 'entrustStatus',
+            label: '请托状态',
+            align: 'center',
+            slot: 'entrustStatus',
+            showOverflowTooltip: true
+          },
           {
             prop: 'productionCodes',
             label: '生产编号',
@@ -431,6 +446,10 @@
         if (row.outsourceStatus == 2) {
           return 'warning-row';
         }
+
+        if (row.entrustStatus == 2) {
+          return 'ent-row';
+        }
       },
 
       /* 表格数据源 */
@@ -536,6 +555,11 @@
     // color: #39d9ac;
   }
 
+  ::v-deep .el-table .ent-row {
+    background: #5419d4;
+    // color: #39d9ac;
+  }
+
   ::v-deep .el-table .success-row {
     background: #f0f9eb;
   }

src/views/produce/components/outsourcing/details.vue

@@ -18,6 +18,7 @@
       max-height="61vh"
       :need-page="false"
       v-if="activeName == '1'"
+      @refresh="refresh"
     >
       <template v-slot:toolbar>
         <div class="rx-sc">
@@ -152,6 +153,7 @@
       max-height="61vh"
       :need-page="false"
       v-if="activeName == '2'"
+      @refresh="refresh"
     >
       <template v-slot:toolbar>
         <div class="rx-sc">
@@ -190,6 +192,12 @@
         <el-tag v-else-if="row.sendStatus == 2" type="success">{{
           '已收货'
         }}</el-tag>
+        <el-tag v-else-if="row.sendStatus == 3" type="success">{{
+          '受托已发'
+        }}</el-tag>
+        <el-tag v-else-if="row.sendStatus == 4" type="success">{{
+          '请托已收'
+        }}</el-tag>
       </template>
 
       <template v-slot:approvalStatus="{ row }">
@@ -257,13 +265,30 @@
           发货
         </el-link>
 
+        <el-link
+          type="primary"
+          :underline="false"
+          @click="sendGoods(row, 'receipt')"
+          v-if="row.approvalStatus == 2 && row.sendStatus == 3"
+        >
+          收货
+        </el-link>
+
+        <el-link
+          type="primary"
+          :underline="false"
+          @click="sendGoods(row, 'receipt')"
+          v-if="row.approvalStatus == 2 && row.sendStatus == 4"
+        >
+          收货详情
+        </el-link>
+
         <el-link
           type="primary"
           :underline="false"
           @click="sendGoods(row, 'detail')"
           v-if="
-            row.approvalStatus == 2 &&
-            (row.sendStatus == 1 || row.sendStatus == 2)
+            row.approvalStatus == 2 && row.sendStatus != 0 && row.sendStatus
           "
         >
           发货详情
@@ -761,7 +786,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 180,
+            width: 220,
             align: 'center',
             resizable: false,
             fixed: 'right',
@@ -915,17 +940,23 @@
 
       /* 刷新表格 */
       reload() {
+        console.log('999');
         this.$nextTick(() => {
-          console.log('88');
-          // this.getList(this.workListIds);
+          if (this.activeName == '2') {
+            this.getPleaseData(this.workOrderCode);
+          } else {
+            this.getDataList(this.workOrderCode);
+          }
         });
       },
       refresh() {
         this.$nextTick(() => {
-          console.log('88');
-          // this.getList(this.workListIds);
+          if (this.activeName == '2') {
+            this.getPleaseData(this.workOrderCode);
+          } else {
+            this.getDataList(this.workOrderCode);
+          }
         });
-        // this.getList(this.workListIds);
       },
 
       handleAdd() {