Ver Fonte

no message

linwenxin há 9 meses atrás
pai
commit
f324c5dff1

+ 10 - 3
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/hs_productColumns.js

@@ -58,7 +58,7 @@ export default {
                 </el-form-item>
               </div>
             ) : (
-              <div style="padding-left:10px">{row.brandName}</div>
+              <div style="padding-left:10px">{row.bigName}</div>
             )
           }
         },
@@ -147,7 +147,7 @@ export default {
                 </el-form-item>
               </div>
             ) : (
-              <div style="padding-left:10px">{row.smallName}</div>
+              <div style="padding-left:10px">{row.productName}</div>
             )
           }
         },
@@ -220,7 +220,14 @@ export default {
                 </el-form-item>
               </div>
             ) : (
-              <div style="padding-left:10px">{row.smallName}</div>
+              <div style="padding-left:10px">
+                {this.serviceCategoryListMinusData
+                  .filter(item => row.pgOrderProductRecycles.includes(item.serviceCategoryItemId))
+                  .map(item => {
+                    return `${item.categoryName}-${item.dictName}`
+                  })
+                  .join(',')}
+              </div>
             )
           }
         },

+ 3 - 2
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/workOrderLogic.js

@@ -76,7 +76,8 @@ export default {
   },
   data() {
     return {
-      orderInfo: null
+      orderInfo: null,
+      shezhi: false
     }
   },
   watch: {
@@ -103,7 +104,7 @@ export default {
       immediate: true
     },
     orderType(n, o) {
-      if (n !== o && this.orderInfo.orderProducts) {
+      if (n !== o && o && this.orderInfo.orderProducts && this.shezhi) {
         this.orderInfo.orderProducts = []
       }
     }