From 76e80fe14958c211fca3521cc14b04d9ac868917 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Sat, 12 Nov 2022 22:11:36 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=B3=B0=E5=9B=BD=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E8=BD=AC=E6=8D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/MaterialConversion/index.vue    | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/pages/raw/warehouse/MaterialConversion/index.vue b/src/pages/raw/warehouse/MaterialConversion/index.vue
index ddb3001..506fc1e 100644
--- a/src/pages/raw/warehouse/MaterialConversion/index.vue
+++ b/src/pages/raw/warehouse/MaterialConversion/index.vue
@@ -51,8 +51,8 @@
           <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
         <u-col :span="6">
-          <u-button type="primary" @click="submit">{{ $t('message.InventoryFinish') }} </u-button></u-col
-        >
+          <u-button type="primary" @click="submit">{{ $t('message.InventoryFinish') }} </u-button>
+        </u-col>
       </u-row>
     </u-form>
   </view>
@@ -90,12 +90,22 @@ export default class KanDanHandOver extends BasePage {
         orderType: 'MC',
       });
       if (this.model.code == '1') {
-        uni.showToast({
-          //icon: 'success',
-          title: this.model.records.msg,
-          duration: 2000,
-          image: '/static/icons/icon-51.png',
-        });
+        if (this.model.orderInInfoList.length != 0) {
+          uni.showToast({
+            icon: 'success',
+            title: this.$t('message.Warehouse_Tip9') as string,
+            duration: 2000,
+            image: '/static/icons/icon-51.png',
+          });
+        } else {
+          uni.showToast({
+            //icon: 'success',
+            title: this.model.records.msg,
+            duration: 2000,
+            image: '/static/icons/icon-51.png',
+          });
+        }
+
         this.model.orderInInfoList.forEach((item: any) => {
           let arr: any = {
             label: item.productCode,
@@ -184,13 +194,16 @@ export default class KanDanHandOver extends BasePage {
     font-size: 34rpx;
     font-weight: 500;
     text-align: center;
+
     .title {
       flex: 3;
     }
+
     .left,
     .right {
       flex: 1;
     }
+
     .icon {
       display: flex;
       justify-content: center;
@@ -219,20 +232,24 @@ export default class KanDanHandOver extends BasePage {
       padding: 30rpx 0;
       line-height: 35rpx;
     }
+
     .single {
       width: 100%;
       height: 100rpx;
       display: flex;
+
       .single-left {
         width: 80%;
         height: 100%;
         display: flex;
+
         view {
           width: 110rpx;
           height: 100%;
           line-height: 100rpx;
         }
       }
+
       .single-right {
         button {
           margin-top: 15rpx;
@@ -241,12 +258,14 @@ export default class KanDanHandOver extends BasePage {
         }
       }
     }
+
     .title {
       margin-bottom: 40rpx;
       color: #1a1a1a;
       font-size: 30rpx;
       font-weight: 500;
     }
+
     .button-bar {
       position: fixed;
       bottom: 0;