From 248212a279c444ffe90a2d29ef54eee231000f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 25 Oct 2024 15:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=AE=8C=E5=B7=A5=202024/8/3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/fg/coms/comReceiptPopup.vue |  4 +--
 src/pages/fg/receiptByPlan.vue        | 50 ++-------------------------
 src/pages/fg/receiptNoPlan.vue        |  7 ++++
 3 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index 998bbe86..68d39f9f 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -156,7 +156,7 @@ export default {
       this.initData()
       this.planDate = getCurrDate()
       // this.batch = getBatch8()
-      this.batch = this.planDate.replace('-', '')
+      this.batch = this.planDate.replace('-', '').replace('-', '');
       this.$refs.popup.open('bottom')
     },
 
@@ -281,7 +281,7 @@ export default {
 
     confirmSelectDate(data) {
       this.planDate = data[0].label
-      this.batch = this.planDate.replace('-', '')
+      this.batch = this.planDate.replace('-', '').replace('-', '')
       this.afterSelectPlanData()
     },
 
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index eda06576..87ce17e8 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -257,6 +257,8 @@ const commit = async () => {
       createPutawayRequestByPlan(list[0].requestNumber).then(res => {
         createInspectRequestByPlan(list[0].requestNumber)
       })
+    } else { //创建检验申请
+      createInspectRequestByPlan(list[0].requestNumber)
     }
 
     const queryParams = {
@@ -407,55 +409,7 @@ const showErrorMessage = (message) => {
 </script>
 
 <style scoped lang="scss">
-page {
-  width: 100%;
-  height: 100%;
-  background-color: #fff;
-}
-
-.page-wraper {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-}
-
-.header {
-  position: fixed;
-  /* #ifdef H5 */
-  /* #endif */
-  left: 0;
-  width: 100%;
-  background-color: #fff;
-  z-index: 10;
-}
 
-.page-footer {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-}
-
-.page-main {
-  flex: 1;
-  position: relative;
-}
-
-.page-main-scroll {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-}
-
-.page-main-list {
-  /*  height: 80rpx;
-	    line-height: 80rpx; */
-  text-align: center;
-  background: #e0e0e0;
-}
 
 .item {
   background-color: #fff;
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index d9f4561b..22d65d93 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -244,6 +244,10 @@ export default {
     },
 
     submit() {
+      this.scanedQty = this.scanedQty + this.showList.length;
+      this.showList = [];
+      this.dataContent.handleQty = 0;
+      return;
       if (this.allList.length == 0) {
         this.showErrorMessage("请先扫描唯一码")
         return;
@@ -299,10 +303,13 @@ export default {
 
         let createProductputawaySwitch = getSwitchInfoByCode(
             "CreateProductputawayRequestAfterProductreceiptRecordCreated")
+        //创建上架申请和检验申请
         if (createProductputawaySwitch) {
           createPutawayRequestByPlan(list[0].requestNumber).then(res => {
             createInspectRequestByPlan(list[0].requestNumber)
           })
+        }else { //创建检验申请
+          createInspectRequestByPlan(list[0].requestNumber)
         }
         this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list)
         this.scanedQty = this.scanedQty + this.showList.length;