linwenxin 1 rok temu
rodzic
commit
2364fd8627

+ 7 - 2
src/views/workOrder/workOrderPool/detailModule/CompletionDetails/index.vue

@@ -204,7 +204,12 @@ export default {
           changeOrderGetOrderProduct({
             id: this.id
           }).then(res => {
-            this.completeDetailData = res.data
+            this.completeDetailData = res.data.map(item => {
+              return {
+                ...item,
+                status: ({ WAIT: "待采集", WAIT_SAVE: "待完善", WAIT_OK: "临时采集", OK: "已采集" })[item.status]
+              }
+            })
           })
         }
       },
@@ -239,7 +244,7 @@ export default {
   box-sizing: border-box;
   padding-left: 16px;
 
-  ::v-deep & > .zj-page-fill-scroll {
+  ::v-deep &>.zj-page-fill-scroll {
     box-sizing: border-box;
     padding-right: 16px;
 

+ 1 - 1
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/pandanxinxi.js

@@ -93,7 +93,7 @@ export default {
               this.orderInfo.orderWorkers = []
               this.getWorkers()
               if (val) {
-                this.orderInfo['websitName'] = this.websitList.find(item => item.value == val).name
+                this.orderInfo['websitName'] = this.websitList.find(item => item.value == val).label
               } else {
                 this.orderInfo['websitName'] = ''
               }

+ 1 - 0
src/views/workOrder/workOrderPool/index.vue

@@ -192,6 +192,7 @@ export default {
     },
     screeningAnalysis(jname, val) {
       if (jname == 'orderFlags') {
+        console.log(val)
         return (val || []).map(item => item.tagName).join(',')
       } else {
         return val