From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3

---
 h5_standard/src/views/needToBeDealtWith/outbound.vue |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/h5_standard/src/views/needToBeDealtWith/outbound.vue b/h5_standard/src/views/needToBeDealtWith/outbound.vue
index a1d47d1..5e71a6d 100644
--- a/h5_standard/src/views/needToBeDealtWith/outbound.vue
+++ b/h5_standard/src/views/needToBeDealtWith/outbound.vue
@@ -34,11 +34,11 @@
                         <span>{{ item.materialName }} | {{ item.materialCode }}</span>
                     </div>
                     <div class="rework_qd_item_cate">
-                        <span class="green" v-if="item.qualityType === '0'">鍚堟牸&nbsp;|&nbsp;</span>
-                        <span class="yellow" v-if="item.qualityType === '1'">涓嶈壇&nbsp;|&nbsp;</span>
-                        <span class="red" v-if="item.qualityType === '2'">鎶ュ簾&nbsp;|&nbsp;</span>
-                        <span>{{ item.procedureName }}&nbsp;|&nbsp;</span>
-                        <span>{{ item.batch }}</span>
+                        <span class="green" v-if="item.qualityType === '0'">鍚堟牸</span>
+                        <span class="yellow" v-if="item.qualityType === '1'">涓嶈壇</span>
+                        <span class="red" v-if="item.qualityType === '2'">鎶ュ簾</span>
+                        <span>&nbsp;|&nbsp;{{ item.procedureName || '-' }}&nbsp;|&nbsp;</span>
+                        <span>{{ item.batch || '-' }}</span>
                     </div>
                     <div class="rework_qd_item_hw">
                         <span>鍑哄簱璐т綅锛歿{ item.locationName }}</span>
@@ -77,8 +77,8 @@
     import { useRouter } from 'vue-router'
     import { Toast } from 'vant'
     import { createForStandard } from '@/apis/WorkOrderAPI'
-    import Warehouse from '@/components/common/Warehouse.vue'
-    import Materials from '@/components/common/Materials.vue'
+    import Warehouse from '@/components/newCom/Warehouse.vue'
+    import Materials from '@/components/newCom/MaterialsB.vue'
     const Material = ref(null)
     const router = useRouter()
     // 琛ㄥ崟鏁版嵁
@@ -172,7 +172,8 @@
     // 鍒犻櫎
     const dele = (index: any) => {
         if (list.value.length === 1) {
-            Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+          //  Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+            Toast('鑷冲皯淇濈暀涓�鏉＄墿娴佹竻鍗曚俊鎭紒')
             return
         }
         list.value.splice(index, 1)
@@ -189,6 +190,7 @@
     const getValue = (item: any): void => {
         form.warehouseName = item.name
         form.warehouseId = item.id
+        list.value = []
         warehouseShow.value = false
     }
     const getValue1 = (item: any): void => {
@@ -353,7 +355,7 @@
                             color: #666666;
                         }
                         input {
-                            width: 140px;
+                            width: 180px;
                             height: 60px;
                             font-size: 28px;
                             font-family: PingFangSC-Regular, PingFang SC;

--
Gitblit v1.9.3