From 129b9338934b22f33cd04def12f244cbbdfad4eb 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 13:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=202024/8/2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/fg/coms/comNoReceiptPopup.vue |  4 +-
 src/pages/fg/receiptNoPlan.vue          | 61 ++++++++-----------------
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/src/pages/fg/coms/comNoReceiptPopup.vue b/src/pages/fg/coms/comNoReceiptPopup.vue
index fd85a14b..91b9983f 100644
--- a/src/pages/fg/coms/comNoReceiptPopup.vue
+++ b/src/pages/fg/coms/comNoReceiptPopup.vue
@@ -48,7 +48,7 @@
                 <view class="customerBorder">
                   {{itemCode}}
                 </view>
-                <view v-if="bomVersion" class="">
+                <view v-if="bomVersion" class="" style="min-width: 160rpx;text-align: center;">
                   Bom版本{{bomVersion}}
                 </view>
                 <u-select v-model="showItemCodeSelect" mode="mutil-column-auto" :list="itemCodeList"
@@ -158,6 +158,7 @@ export default {
       showProductLineSelect: false,
       productLineList: [],
       productionLineName: "请选择生产线",
+      productLineCode: "",
       batch: "",
       packUnitName: "请选择包装规格",
       packUnit: "",
@@ -175,6 +176,7 @@ export default {
       rawLocationCode: "",
       workshop: "",
       bomVersion: "",
+      uom: ""
     }
   },
   props: {
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index 7ae11e96..b813bd62 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -6,25 +6,29 @@
         <com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
       </view>
       <view class="" v-if="dataContent">
-        <view class="cell_box uni-flex uni-row">
-          <view class="cell_info">
-            <view class="text_lightblue">完工库位</view>
-            <view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
-            </view>
+        <view class="page-header">
+          <view class="header-view" >
+            <view class="cell_box uni-flex uni-row">
+              <view class="cell_info">
+                <view class="text_lightblue">完工库位</view>
+                <view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
+                </view>
 
-          </view>
-          <view class="cell_info">
-            <view class="text_lightblue">计划数</view>
-            <view>{{dataContent.planQty}}{{dataContent.uom}}</view>
+              </view>
+              <view class="cell_info">
+                <view class="text_lightblue">计划数</view>
+                <view>{{dataContent.planQty}}{{dataContent.uom}}</view>
+              </view>
+            </view>
           </view>
         </view>
         <view class='split_line'></view>
 
-        <view class="" style="padding-top: 10rpx; padding-bottom: 10rpx; margin-left: 10rpx;">
+        <view class="" style="padding: 10rpx;margin-left: 10rpx;">
           <item :dataContent="dataContent"></item>
         </view>
         <view class='split_line'></view>
-        <view class="uni-flex uni-row space-between" style="align-items: center">
+        <view class="uni-flex uni-row space-between" style="align-items: center;padding-left:10rpx">
           <view style="word-break: break-all;">
             <batch :batch="dataContent.batch"></batch>
             <view class="card_view ">
@@ -140,10 +144,12 @@ export default {
   },
 
   onShow() {},
+
   onLoad() {
     this.options = getRemoveOption()
     this.openFg();
   },
+
   onReachBottom() {
     console.log("onReachBottom")
     //避免多次触发
@@ -190,7 +196,7 @@ export default {
         workStationCode: result.workStationCode,
         fgLocationCode: result.fgLocationCode,
         subList: [],
-        productionLine: result.productionLineCode,
+        productionLine: result.productionLine,
         bomVersion: result.bomVersion,
         workshop: result.workshop,
         team: "",
@@ -247,7 +253,6 @@ export default {
     },
 
     async commit() {
-
       try {
         uni.showLoading({
           title: "提交中...",
@@ -259,7 +264,6 @@ export default {
         let list = []
         var planData = await planReceiptSubmit(params)
         if (planData.data) {
-
           planData.data.forEach(item => {
             list.push({
               itemCode: item.itemCode, // 物品代码
@@ -302,27 +306,6 @@ export default {
           pageNo: 1,
           pageSize: 100,
         }
-
-        var planeInfo = await getPlanByNumber(queryParams);
-        if (planeInfo.data && planeInfo.data.list.length > 0) {
-          if (planeInfo.data.list[0].goodQty >= planeInfo.data.list[0].planQty) {
-            this.clear();
-          } else {
-            this.dataContent.planNumber = planeInfo.data.list[0].number;
-            this.dataContent.handleQty = 0;
-            this.dataContent.planQty = planeInfo.data.list[0].planQty
-            this.dataContent.goodQty = planeInfo.data.list[0].goodQty
-            this.dataContent.noGoodQty = calc.sub(planeInfo.data.list[0].planQty, planeInfo.data.list[
-                0].goodQty),
-                this.dataContent.subList = []
-            this.showList = [];
-            this.allList = []
-            this.index = 1
-          }
-
-        } else {
-          throw new Error("未查找到单据信息")
-        }
         uni.hideLoading()
         this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list)
 
@@ -331,7 +314,6 @@ export default {
         var hint = error.message ? error.message : error
         this.showErrorMessage(hint)
       }
-
     },
 
     setParams() {
@@ -431,7 +413,7 @@ export default {
     showCommitSuccessMessage(hint, pointData) {
       this.$refs.comMessage.showSuccessMessage(hint, res => {
         if (pointData.length > 0) {
-          uni.navigateTo({
+          uni.redirectTo({
             url: `/pages/point/index?points=${JSON.stringify(pointData)}`
           });
         }
@@ -468,15 +450,10 @@ page {
 
 .header {
   position: fixed;
-  /* #ifdef H5 */
-  top: 88rpx;
-  /* #endif */
   left: 0;
   width: 100%;
   background-color: #fff;
   z-index: 10;
-  padding: 10rpx;
-  /* 确保头部在内容之上 */
 }
 
 .page-footer {