From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug

---
 h5_standard/src/views/needToBeDealtWith/outbound.vue |   42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/h5_standard/src/views/needToBeDealtWith/outbound.vue b/h5_standard/src/views/needToBeDealtWith/outbound.vue
index 634b0f8..e864ac8 100644
--- a/h5_standard/src/views/needToBeDealtWith/outbound.vue
+++ b/h5_standard/src/views/needToBeDealtWith/outbound.vue
@@ -34,17 +34,17 @@
                         <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>
                         <div class="rework_qd_item_hw_right">
                             <span>鏁伴噺锛�</span>
-                            <input type="number" v-model="item.num" placeholder="0" />
+                            <input type="number" v-model="item.num" @input="changeNum(item)" placeholder="0" />
                             <span>{{ item.unitName }}</span>
                         </div>
                     </div>
@@ -61,7 +61,7 @@
         <Warehouse :show="warehouseShow" @close="close" @value="getValue" />
         <Materials ref="Material" :show="materialsShow" :id="form.warehouseId.toString()" @close="close1" @value="getValue1" />
         <!-- 鍗曟嵁绫诲瀷 -->
-        <van-popup v-model:show="typeShow" position="bottom" :style="{ height: '50%' }">
+        <van-popup v-model:show="typeShow" round position="bottom" :style="{ height: '50%' }">
             <van-picker
                 :columns="columns"
                 @confirm="onConfirm1"
@@ -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()
     // 琛ㄥ崟鏁版嵁
@@ -111,7 +111,16 @@
     const onCancel = () => {
         typeShow.value = false
     }
-    
+    const changeNum = (obj: any) => {
+        if (obj.num < 0) {
+            obj.num = ''
+            return Toast('鍑哄簱鐗╂枡鏁伴噺蹇呴』澶т簬0')
+        }
+        if (obj.num > obj.total) {
+            obj.num = ''
+            return Toast('鍑哄簱鐗╂枡鏁伴噺涓嶈兘澶т簬搴撳瓨鏁�')
+        }
+    }
     // 鑾峰彇褰撳ぉ骞存湀鏃�
     const getDay = () => {
       var date = new Date();
@@ -124,9 +133,10 @@
     // 鎻愪氦
     const onConfirm = () => {
         if (!form.type) return Toast('璇烽�夋嫨鍗曟嵁绫诲瀷')
+        if (!form.warehouseId) return Toast('璇烽�夋嫨鍑哄簱浠撳簱')
+        if (list.value.length === 0) return Toast('鑷冲皯閫夋嫨涓�鏉″嚭搴撶墿鏂�')
         for (let i = 0; i < list.value.length; i++) {
-            if (!list.value[i].num || list.value[i].num == '' || list.value[i].num == 0) {
-                return Toast(`绗�${i + 1}涓嚭搴撶墿鏂欐暟閲忓繀椤诲ぇ浜�0`)
+            if (!list.value[i].num || list.value[i].num == '' || list.value[i].num <= 0) {
             }
             if (list.value[i].num > list.value[i].total) {
                 return Toast(`绗�${i + 1}涓墿鏂欐暟閲忎笉鑳藉ぇ浜庡簱瀛橀噺锛乣)
@@ -161,7 +171,8 @@
     // 鍒犻櫎
     const dele = (index: any) => {
         if (list.value.length === 1) {
-            Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+          //  Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+            Toast('鑷冲皯淇濈暀涓�鏉＄墿娴佹竻鍗曚俊鎭紒')
             return
         }
         list.value.splice(index, 1)
@@ -178,6 +189,7 @@
     const getValue = (item: any): void => {
         form.warehouseName = item.name
         form.warehouseId = item.id
+        list.value = []
         warehouseShow.value = false
     }
     const getValue1 = (item: any): void => {
@@ -342,7 +354,7 @@
                             color: #666666;
                         }
                         input {
-                            width: 140px;
+                            width: 180px;
                             height: 60px;
                             font-size: 28px;
                             font-family: PingFangSC-Regular, PingFang SC;
@@ -350,7 +362,7 @@
                             color: #333333;
                             background: #FFFFFF;
                             border-radius: 8px;
-                            border: 1px solid #CCCCCC;
+                            border: 1PX solid #CCCCCC;
                             margin: 0 20px;
                             padding: 0 30px;
                             box-sizing: border-box;

--
Gitblit v1.9.3