bug fix: 187

src/views/modules/quality/disqualification-detail.vue

@@ -53,7 +53,7 @@
         <e-desc-item label="交检数量">{{ dataForm.cnt }}</e-desc-item>
 
         <e-desc-item label="不合格数量">{{ dataForm.disqualificationCnt }}</e-desc-item>
-        <e-desc-item label="处理状态">{{ formatMeasureState(dataForm) }}</e-desc-item>
+        <e-desc-item label="处理状态">{{ dataForm.stateName }}</e-desc-item>
         <e-desc-item label="当前审理人">{{ dataForm.approver }}</e-desc-item>
 
         <e-desc-item label="责任人">{{ dataForm.responsibleName }}</e-desc-item>
@@ -74,7 +74,7 @@
 
         <e-desc-item label="不合格/报损数量">{{ dataForm.damageCnt }}</e-desc-item>
         <e-desc-item label="让步接收数量">{{ dataForm.concessionCnt }}</e-desc-item>
-      
+
       </e-desc>
       <e-desc label="顾客放行表">
         <upload-component :display="true" :accept="'*'" v-model="dataForm.releaseList" />
@@ -183,4 +183,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
+</style>

src/views/modules/quality/disqualification.vue

@@ -134,6 +134,7 @@
           prop="measureStateStr"
           header-align="center"
           align="center"
+          min-width="120"
           :show-tooltip-when-overflow="true"
           label="处理状态"
         >

src/views/modules/trace/order-detail.vue

@@ -68,7 +68,7 @@
             label="物料编号">
           </el-table-column>
           <el-table-column
-            prop="state"
+            prop="prodState"
             header-align="center"
             align="center"
             :formatter="formatState"
@@ -140,21 +140,29 @@
         fileList: [],
         // 状态：1：待排产，2:生产中，3:生产完成
         optionsState: [
+          {
+            code: '0',
+            value: '待核料'
+          },
           {
             code: '1',
-            value: '待排产'
+            value: '待试制前检查'
           },
           {
             code: '2',
-            value: '生产中'
+            value: '待排产'
           },
           {
             code: '3',
+            value: '生产中'
+          },
+          {
+            code: '4',
             value: '生产完成'
           },
           {
             code: '5',
-            value: '报废'
+            value: '不合格完成'
           }
         ]
       }
@@ -220,8 +228,8 @@
       },
       // 格式化物料状态
       formatState (row) {
-        if (!row.state) return ''
-        const item1 = this.optionsState.find((item) => item.code === row.state.toString())
+        if (!row.prodState) return ''
+        const item1 = this.optionsState.find((item) => item.code === row.prodState.toString())
         return item1 ? item1.value : ''
       },
       // 查看物料记录

src/views/modules/trace/search.vue

@@ -80,9 +80,9 @@ export default {
         let params = {
           'prodCode': this.code
         }
-        console.log(params)
+        // console.log(params)
         getProductByCode(params).then(({data}) => {
-          console.log(data)
+          // console.log(data)
           if (data && data.code === '200' && data.data) {
             this.defaultProductList = data.data.records
             this.defaultProductTotal = data.data.total