From e3f15089a8ae8e597e5015a6011dbcbd98622c8b Mon Sep 17 00:00:00 2001
From: mabaoyan <mabaoyan0405@163.com>
Date: Fri, 19 May 2023 17:52:27 +0800
Subject: [PATCH] =?UTF-8?q?overseamom-252=20feat=20sto=E6=89=8B=E6=8C=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/product/stoOutbound/detail.vue |  6 ++++-
 src/pages/product/stoOutbound/index.vue  | 30 +++++++++++++++++-------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/pages/product/stoOutbound/detail.vue b/src/pages/product/stoOutbound/detail.vue
index 7720d62..c79f81e 100644
--- a/src/pages/product/stoOutbound/detail.vue
+++ b/src/pages/product/stoOutbound/detail.vue
@@ -55,13 +55,17 @@ export default class RawReceiptDetail extends BasePage {
       barcode: barcode,
     };
     await this.model.deleteBarcode(SunmitList);
-    if (this.model.SubCode == 1) {
+    if (this.model.DeleteCode == 1) {
+      let index = this.model.stoBarcodeList.findIndex(val=>val.barcode==barcode);
+      this.model.stoBarcodeList.splice(index,1);
+      this.seleteData=[];
       uni.showToast({
         title: this.$t('message.success') as string,
         image: '/static/icons/icon-51.png',
       });
       this.seleteData={};
     }
+    // await this.model.QueryStoDetail
   }
 }
 </script>
diff --git a/src/pages/product/stoOutbound/index.vue b/src/pages/product/stoOutbound/index.vue
index f61cdde..bde8291 100644
--- a/src/pages/product/stoOutbound/index.vue
+++ b/src/pages/product/stoOutbound/index.vue
@@ -72,14 +72,15 @@
 
       <!-- 批次取消弹窗输入 -->
       <view>
-        <u-modal v-model="showCancel" :title="title" confirmText="confirm" cancelText="cancel" showCancelButton @confirm="CancelDo" @cancel="emptyMsg">
+        <u-modal ref="uModal" v-model="showCancel" :title="title" confirmText="confirm" :async-close="true" cancelText="cancel" showCancelButton @confirm="CancelDo" @cancel="emptyMsg">
           <!-- 运输公司 -->
           <u-form-item label="Batch No" borderBottom labelWidth="160">
-          <jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="SelectPcLine" showKey="value" valKey="value" :val="pcNo" class="search" :options="model.stoPcList" />
+          <jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="SelectPcLine" showKey="pcNo" valKey="pcNo" :val="pcNo" class="search" :options="model.stoPcList" />
             <!-- <u-input v-model="pcNo" placeholder="Batch No"></u-input> -->
           </u-form-item>
         </u-modal>
       </view>
+      <u-toast ref="uToast" />
 
       <!-- 出库库位 -->
       <!-- <view class="material">
@@ -235,6 +236,8 @@ export default class dnReceiptDom extends BasePage {
       this.customToast(this.$t('message.stoPleaseInput') as any);
       return;
     }
+    this.showVehicle = true;
+      this.showMsg = true;
   }
   //确认
   async ConfirmDo() {
@@ -243,7 +246,6 @@ export default class dnReceiptDom extends BasePage {
       return;
     }
     if (this.carNo == '' || this.company == '') {
-      this.showVehicle = true;
       this.showMsg = true;
       return;
     }
@@ -290,19 +292,27 @@ export default class dnReceiptDom extends BasePage {
 
   //批次取消
   async CancelDo() {
+    let uModal:any = this.$refs.uModal;
     if (!this.pcNo) {
-      this.customToast(this.$t('message.stoPcPleaseInput') as any);
+      uModal.clearLoading();
+      let uToast:any = this.$refs.uToast;
+      uToast.show({
+				title:this.$t('message.stoPcPleaseInput'),
+				type: 'warning',
+			})
+
+      // this.customToast(this.$t('message.stoPcPleaseInput') as any);
       return;
     }
-    console.log("222222222");
     const SunmitList = {
       loginName: session.loginName,
       factoryCode: session.factoryCode,
       stoNo: this.stoNo,
-      pcNo: this.pcNo,
+      pcNo: this.pcNo.pcNo,
     };
-    await this.model.stoCancel(SunmitList);
-    if (this.model.SubCode == 1) {
+    this.model.stoCancel(SunmitList);
+    console.log(this.model.SubCode ,'asd9ass')
+    if (this.model.CancelCode == 1) {
       uni.showToast({
         title: this.$t('message.success') as string,
         image: '/static/icons/icon-51.png',
@@ -310,10 +320,12 @@ export default class dnReceiptDom extends BasePage {
       this.pcNo = '';
       //不生效
       this.empty();
+      this.showCancel=false;
     } else {
       this.pcNo = '';
+      uModal.clearLoading();     
       //不生效
-      this.emptyMsg();
+      // this.emptyMsg();
     }
   }