From b0e7fe5312eb0c8a0c7bb6e7997cda40a46378e3 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:33:45 +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/2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                     |  12 +
 src/pages/fg/coms/comNoReceiptPopup.vue | 450 +++++++++++++-----------
 src/pages/fg/receiptNoPlan.vue          |  41 ++-
 3 files changed, 280 insertions(+), 223 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 8efbcaaf..07560d3c 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -370,6 +370,18 @@ export function getItempackagingByItemcode(itemCode) {
 export function getProductionlineItem(params) {
   return http.get("/wms/productionlineitem/page" , {params})
 }
+/**
+ * 查询生产线物料关系
+ * @param {*} productionLineCode  生产线code
+ *
+ */
+export function getBomVersionByProductionline(productionline) {
+	return request({
+		url: baseApi + "/wms/productionlineitem/getBomVersionByProductionline?productionline=" + productionline,
+		method: "get",
+		data: {},
+	});
+}
 /**
  * 通过物料查询包装规格
  * @param {*} itemCode 
diff --git a/src/pages/fg/coms/comNoReceiptPopup.vue b/src/pages/fg/coms/comNoReceiptPopup.vue
index c37b2c58..be96cac1 100644
--- a/src/pages/fg/coms/comNoReceiptPopup.vue
+++ b/src/pages/fg/coms/comNoReceiptPopup.vue
@@ -2,78 +2,98 @@
   <view class="">
     <uni-popup ref="popup" :maskClick="false">
       <view class="uni-flex uni-column pop_customer">
-        <view class="" style="padding: 10rpx">
+        <view class="" style="padding:10rpx">
           <view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
-            <view class="" style="font-size: 35rpx">
-              {{ title }}
+            <view class="" style="font-size: 35rpx;">
+              {{title}}
             </view>
-            <image style="width: 35rpx; height: 35rpx" src="/static/icons/icons_close.svg" @click="closeRequestPopup()"></image>
+            <image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+                   @click="closeRequestPopup()"></image>
           </view>
-          <view class="split_line"></view>
-          <view class="uni-flex uni-column" style="background-color: white">
+          <view class='split_line'></view>
+          <view class="uni-flex uni-column" style="background-color: white; ">
             <view class="uni-flex uni-column">
-              <view class="title" style="display: flex; align-items: center; padding: 10rpx">
-                <text style="flex-shrink: 0; width: 25%">生产线：</text>
+              <view class="title " style="display: flex; align-items: center;padding: 10rpx;">
+                <text style=" flex-shrink: 0;width: 25%;">生产线：</text>
                 <view class="customerBorder" @click="showSelectLine">
-                  {{ productionLineName }}
+                  {{productionLineName}}
                 </view>
-                <u-select v-model="showProductLineSelect" mode="mutil-column-auto" title="请选择生产线和工位" :list="productLineList" @confirm="confirmSelectLine"></u-select>
+                <u-select v-model="showProductLineSelect" mode="mutil-column-auto"
+                          :list="productLineList" @confirm="confirmSelectLine" title="生产线-工位"></u-select>
 
                 <view class="">
-                  <image src="/static/icons/down.svg" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx" @click="showSelectLine"> </image>
+                  <image src="/static/icons/down.svg" mode=""
+                         style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="showSelectLine">
+                  </image>
                 </view>
               </view>
-              <view class="split_line"></view>
-              <view class="title" style="display: flex; align-items: center; padding: 10rpx">
-                <text style="flex-shrink: 0; width: 25%">计划日期：</text>
+              <view class='split_line'></view>
+              <view class="title " style="display: flex; align-items: center;padding: 10rpx;">
+                <text style=" flex-shrink: 0;width: 25%;">计划日期：</text>
                 <view class="customerBorder" @click="showSelectDate">
-                  {{ planDate }}
+                  {{planDate}}
                 </view>
-                <u-select v-model="showDateSelect" mode="mutil-column-auto" :list="planDateList" @confirm="confirmSelectDate"></u-select>
+                <u-select v-model="showDateSelect" mode="mutil-column-auto" :list="planDateList"
+                          @confirm="confirmSelectDate"></u-select>
 
                 <view class="">
-                  <image src="/static/icons/down.svg" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx" @click="showSelectDate"> </image>
+                  <image src="/static/icons/down.svg" mode=""
+                         style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;" @click="showSelectDate">
+                  </image>
                 </view>
               </view>
-              <view class="split_line"></view>
-              <view class="title" style="display: flex; align-items: center; padding: 10rpx">
-                <text style="flex-shrink: 0; width: 25%">物料代码：</text>
+              <view class='split_line'></view>
+              <view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+                <text style=" flex-shrink: 0; width: 25%;">物料代码：</text>
                 <view class="customerBorder">
-                  {{ itemCode }}
+                  {{itemCode}}
                 </view>
-                <u-select v-model="showItemCodeSelect" mode="single-column" :list="itemCodeList" @confirm="confirmSelectItem"></u-select>
+                <view v-if="bomVersion" class="">
+                  Bom版本{{bomVersion}}
+                </view>
+                <u-select v-model="showItemCodeSelect" mode="mutil-column-auto" :list="itemCodeList"
+                          @confirm="confirmSelectItem" title="物料代码-Bom版本"></u-select>
                 <view class="">
-                  <image src="/static/icons/down.svg" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx" @click="showSelectItemCode"> </image>
+                  <image src="/static/icons/down.svg" mode=""
+                         style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
+                         @click="showSelectItemCode">
+                  </image>
                 </view>
               </view>
-              <view class="split_line"></view>
-              <view class="title" style="display: flex; align-items: center; padding: 10rpx">
-                <text style="flex-shrink: 0; width: 25%">数量：</text>
+              <view class='split_line'></view>
+              <view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+                <text style=" flex-shrink: 0; width: 25%;">数量：</text>
                 <uni-easyinput v-model="planQty"></uni-easyinput>
-                <view v-if="uom">({{ getUomInfo(uom) }})</view>
+                <view v-if="uom">({{getUomInfo(uom)}})</view>
                 <view class="">
-                  <image src="" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx"> </image>
+                  <image src="" mode="" style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;">
+                  </image>
                 </view>
               </view>
 
-              <view class="split_line"></view>
-              <view class="title" style="display: flex; align-items: center; padding: 10rpx">
-                <text style="flex-shrink: 0; width: 25%">包装规格：</text>
+              <view class='split_line'></view>
+              <view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+                <text style=" flex-shrink: 0; width: 25%;">包装规格：</text>
                 <view class="customerBorder">
-                  {{ packUnitName }}
+                  {{packUnitName}}
                 </view>
-                <u-select v-model="showPackUnitSelect" mode="single-column" :list="packUnitList" @confirm="confirmSelectPackUnit"></u-select>
+                <u-select v-model="showPackUnitSelect" mode="single-column" :list="packUnitList"
+                          @confirm="confirmSelectPackUnit"></u-select>
                 <view class="">
-                  <image src="/static/icons/down.svg" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx" @click="showSelectPackUnit"> </image>
+                  <image src="/static/icons/down.svg" mode=""
+                         style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
+                         @click="showSelectPackUnit">
+                  </image>
                 </view>
               </view>
-              <view class="split_line"></view>
+              <view class='split_line'></view>
 
-              <view class="title" style="display: flex; align-items: center; padding: 10rpx">
-                <text style="flex-shrink: 0; width: 25%">批次：</text>
+              <view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+                <text style=" flex-shrink: 0; width: 25%;">批次：</text>
                 <uni-easyinput v-model="batch"></uni-easyinput>
                 <view class="">
-                  <image src="" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx"> </image>
+                  <image src="" mode="" style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;">
+                  </image>
                 </view>
               </view>
             </view>
@@ -90,12 +110,28 @@
 </template>
 
 <script>
-import { getIssueJobByProductionline, getPlaneInfoByproductLine, getPackUnitByItemCode, getProductionlineAndWorkStation, getProductionlineItem } from '@/api/request2.js'
-import { getPackUnitName, getUomInfo } from '@/common/directory.js'
+import {
+  getIssueJobByProductionline,
+  getPlaneInfoByproductLine,
+  getPackUnitByItemCode,
+  getProductionlineAndWorkStation,
+  getBomVersionByProductionline
+} from '@/api/request2.js';
+import {
+  getPackUnitName,
+  getUomInfo
+} from '@/common/directory.js';
 
-import { getCurrDate, getBatch8, dateFormatData, lastThreeDays } from '@/common/basic.js'
+import {
+  getCurrDate,
+  getBatch8,
+  dateFormatData,
+  lastThreeDays
+} from '@/common/basic.js';
 
-import { calc } from '@/common/calc.js'
+import {
+  calc
+} from '@/common/calc.js';
 
 import uom from '@/mycomponents/qty/uom.vue'
 import packQty from '@/mycomponents/qty/packQty.vue'
@@ -107,36 +143,39 @@ export default {
     uom,
     balanceStatus,
     winScanItem,
-    packQty
+    packQty,
   },
   data() {
     return {
-      itemCode: '请选择物料信息',
-      uom: '',
+      itemCode: '',
+      itemName: '请选择物料信息',
+      uom: "",
       qty: null,
       planQty: 0,
       goodQty: 0,
-      planNumber: '',
-      productLineCode: '',
+      planNumber: "",
+      productLineCode: "",
       showProductLineSelect: false,
       productLineList: [],
-      productionLineName: '请选择生产线',
-      productionLineCode: '',
-      batch: '',
-      packUnitName: '请选择包装规格',
-      packUnit: '',
+      productionLineName: "请选择生产线",
+      productionLineCode: "",
+      batch: "",
+      packUnitName: "请选择包装规格",
+      packUnit: "",
       packUnitList: [],
-      packQtyHint: '',
+      packQtyHint: "",
       packQty: 0,
       showPackUnitSelect: false,
       itemCodeList: [],
       showItemCodeSelect: false,
-      workStationCode: '',
+      workStationCode: "",
       planDate: '',
       showDateSelect: false,
       planDateList: [],
-      fgLocationCode: '',
-      rawLocationCode: ''
+      fgLocationCode: "",
+      rawLocationCode: "",
+      workshop: "",
+      bomVersion: "",
     }
   },
   props: {
@@ -147,87 +186,91 @@ export default {
     itemCodeTypeList: {
       type: Array,
       default: []
-    }
+    },
   },
   methods: {
+
     openRequestPopup() {
-      this.initData()
+      this.initData();
       this.planDate = getCurrDate()
       this.batch = getBatch8()
       this.$refs.popup.open('bottom')
     },
     initData() {
-      this.itemCode = '请选择物料信息'
-      this.uom = ''
+      this.itemCode = '请选择物料信息';
+      this.uom = ""
       this.planQty = 0
-      this.goodQty = 0
-      this.packQty = 0
-      this.planNumber = ''
-      this.productLineCode = ''
+      this.goodQty = 0;
+      this.packQty = 0;
+      this.planNumber = ""
+      this.productLineCode = ""
       this.showProductLineSelect = false
       this.productLineList = []
-      this.productionLineName = '请选择生产线'
-      this.productionLineCode = ''
-      this.batch = ''
-      this.packUnitName = '请选择包装规格'
-      ;(this.packUnit = ''), (this.packQtyHint = '')
+      this.productionLineName = "请选择生产线"
+      this.productionLineCode = ""
+      this.batch = ""
+      this.packUnitName = "请选择包装规格"
+      this.packUnit = "",
+          this.packQtyHint = ""
       this.showPackUnitSelect = false
       // this.packUnitList = []
       this.itemCodeList = []
       this.showItemCodeSelect = false
-      this.workStationCode = ''
-      this.planDate = ''
+      this.workStationCode = ""
+      this.planDate = ""
       this.showDateSelect = false
       this.planDateList = []
-      this.fgLocationCode = ''
-      this.rawLocationCode = ''
+      this.fgLocationCode = ""
+      this.rawLocationCode = ""
+      this.workshop=""
+
     },
 
     closeRequestPopup() {
       this.$refs.popup.close()
     },
     itemCodeLoseFocus() {
-      this.itemCodeFocus = false
+      this.itemCodeFocus = false;
     },
 
     confirm() {
       if (!this.planDate) {
-        this.showErrorMessage('请先选择计划日期')
-        return
+        this.showErrorMessage('请先选择计划日期');
+        return;
       }
 
-      if (this.productionLineName == '请选择生产线') {
-        this.showErrorMessage('请选择生产线')
+      if (this.productionLineName == "请选择生产线") {
+        this.showErrorMessage("请选择生产线")
         return
       }
 
       if (!this.batch) {
-        this.showErrorMessage('请输入批次例如:20200101')
+        this.showErrorMessage("请输入批次例如:20200101")
         return
       }
 
-      if (this.itemCode == '请选择物料信息') {
-        this.showErrorMessage('请选择物料信息')
+      if (this.itemCode == "请选择物料信息") {
+        this.showErrorMessage("请选择物料信息")
         return
       }
 
       if (this.planQty <= 0) {
-        this.showErrorMessage('请输入完工数量')
+        this.showErrorMessage("请输入完工数量")
         return
       }
 
-      if (this.packUnitName == '请选择包装规格') {
-        this.showErrorMessage('请选择包装规格')
+      if (this.packUnitName == "请选择包装规格") {
+        this.showErrorMessage("请选择包装规格")
         return
       }
 
-      this.callback()
+      this.callback();
     },
 
     callback() {
-      const item = {
-        productionLineName: '',
-        productionLineCode: '', // 生产线
+      let item = {
+        productionLineName: "",
+        productionLineCode: this.productLineCode, //生产线
         itemCode: this.itemCode,
         itemName: this.itemName,
         uom: this.getUomInfo(this.uom),
@@ -238,41 +281,45 @@ export default {
         packQty: this.packQty,
         planQty: this.planQty,
         goodQty: this.goodQty,
-        planNumber: '',
+        planNumber: "",
         workStationCode: this.workStationCode,
         fgLocationCode: this.fgLocationCode,
-        rawLocationCode: this.rawLocationCode
-      }
-      this.closeRequestPopup()
-      this.$emit('confirm', item)
+        rawLocationCode: this.rawLocationCode,
+        workshop:this.workshop
+      };
+      this.closeRequestPopup();
+      this.$emit("confirm", item);
     },
 
     showErrorMessage(message, type) {
-      setTimeout((r) => {
-        this.$refs.comMessage.showErrorMessage(message, (res) => {})
+      setTimeout(r => {
+        this.$refs.comMessage.showErrorMessage(message, res => {})
       })
     },
     cancel(e) {
-      this.closeRequestPopup()
+      this.closeRequestPopup();
     },
 
     confirmSelectLine(data) {
-      this.productionLineName = `${data[0].label}—${data[1].label}`
+      this.productionLineName = data[0].label + "—" + data[1].label
       this.productionLineCode = data[0].value
       this.workStationCode = data[1].value
-      const parent = this.productLineList.filter((res) => res.value == this.productionLineCode)
-      const fgLocation = parent[0].children.filter((children) => children.value == this.workStationCode)
-      this.fgLocationCode = fgLocation[0].fgLocationCode
+      var parent = this.productLineList.filter(res => res.value == this.productionLineCode)
+      var fgLocation = parent[0].children.filter(children => children.value == this.workStationCode)
+      this.fgLocationCode = fgLocation[0].fgLocationCode;
+      this.workshop = parent[0].workshop;
+
       this.clearItemCode()
       this.clearPackUnit()
+
     },
     clearItemCode() {
       this.planDate = getCurrDate()
-      this.itemCode = '请选择物料信息'
-      this.uom = ''
-      this.planQty = 0
+      this.itemCode = "请选择物料信息"
+      this.uom = ""
+      this.planQty = 0;
       this.goodQty = 0
-      this.planNumber = ''
+      this.planNumber = ""
     },
 
     confirmSelectDate(data) {
@@ -280,13 +327,13 @@ export default {
     },
 
     showSelectDate() {
-      this.showDateSelect = true
-      const list = lastThreeDays(3)
+      this.showDateSelect = true;
+      var list = lastThreeDays(3);
       this.planDateList = []
-      list.forEach((res) => {
+      list.forEach(res => {
         this.planDateList.push({
           label: res,
-          value: ''
+          value: ""
         })
       })
     },
@@ -294,142 +341,135 @@ export default {
     showSelectLine() {
       if (this.productLineList.length == 0) {
         uni.showLoading({
-          title: '加载中',
+          title: "加载中",
           mask: true
         })
-        getProductionlineAndWorkStation()
-          .then((res) => {
-            uni.hideLoading()
-            if (res.data && res.data.length > 0) {
-              this.productLineList = res.data
-              this.showProductLineSelect = true
-            } else {
-              this.showErrorMessage('未查找到生产线信息')
-            }
-          })
-          .catch((error) => {
-            uni.hideLoading()
-            this.showErrorMessage(error)
-          })
+        getProductionlineAndWorkStation().then(res => {
+          uni.hideLoading()
+          if (res.data && res.data.length > 0) {
+            this.productLineList = res.data
+            this.showProductLineSelect = true
+          } else {
+            this.showErrorMessage('未查找到生产线信息');
+          }
+
+        }).catch(error => {
+          uni.hideLoading()
+          this.showErrorMessage(error);
+        })
       } else {
         this.showProductLineSelect = true
       }
+
+
     },
     showSelectItemCode() {
       if (!this.productionLineCode) {
-        this.showErrorMessage('请先选择生产线')
-        return
+        this.showErrorMessage('请先选择生产线');
+        return;
       }
       uni.showLoading({
-        title: '加载中',
+        title: "加载中",
         mask: true
       })
-      const param = {
-        pageSize: 20,
-        pageNo: 1,
-        productionLineCode: this.productionLineCode
-      }
-
-      getProductionlineItem(param)
-        .then((res) => {
-          uni.hideLoading()
-          if (res.data.list && res.data.list.length > 0) {
-            res.data.list.forEach((item) => {
-              item.label = item.itemCode
-              item.value = item
-            })
-            this.itemCodeList = res.data.list
-            this.showItemCodeSelect = true
-          } else {
-            this.showErrorMessage('未查找到物料信息')
-          }
-        })
-        .catch((error) => {
-          uni.hideLoading()
-          this.showErrorMessage(error)
-        })
+      getBomVersionByProductionline(this.productionLineCode).then(res => {
+        uni.hideLoading()
+        if (res.data && res.data.length > 0) {
+          this.itemCodeList = res.data
+          this.showItemCodeSelect = true
+        } else {
+          this.showErrorMessage('未查找到物料信息');
+        }
+      }).catch(error => {
+        uni.hideLoading()
+        this.showErrorMessage(error);
+      })
     },
     confirmSelectItem(data) {
-      const itemInfo = data[0].value
-      this.itemCode = itemInfo.itemCode
-      this.uom = itemInfo.uom
+      this.itemCode = data[0].label;
+      this.bomVersion = data[1].value;
+      this.uom=data[0].uom;
+      // this.uom = itemInfo.uom
 
-      // 清除其他数据
-      this.clearPackUnit()
+      //清除其他数据
+      this.clearPackUnit();
       uni.showLoading({
-        title: '加载中',
+        title: "加载中",
         mask: true
       })
-      getPackUnitByItemCode(this.itemCode)
-        .then((res) => {
-          uni.hideLoading()
-          if (res.data && res.data.list.length > 0) {
-            res.data.list.forEach((item) => {
-              item.value = item.packUnit
-              item.label = `${getPackUnitName(item.packUnit)}(${item.packQty}${this.getUomInfo(item.uom)})`
-            })
-            this.packUnitList = res.data.list
-            const defaultData = res.data.list.filter((item) => item.defaultPackageunit == 'TRUE')
-            this.confirmSelectPackUnit(defaultData)
-          }
-        })
-        .catch((error) => {
-          uni.hideLoading()
-        })
+      getPackUnitByItemCode(this.itemCode).then(res => {
+        uni.hideLoading()
+        if (res.data && res.data.list.length > 0) {
+          res.data.list.forEach(item => {
+            item.value = item.packUnit
+            item.label = getPackUnitName(item.packUnit) + "(" + item.packQty + this
+                .getUomInfo(item.uom) + ")";
+          })
+          this.packUnitList = res.data.list
+          var defaultData = res.data.list.filter(item => item.defaultPackageunit == "TRUE")
+          this.confirmSelectPackUnit(defaultData)
+        }
+
+      }).catch(error => {
+        uni.hideLoading()
+      })
     },
 
     clearPackUnit() {
-      this.packUnitName = '请选择包装规格'
-      this.packUnit = ''
-      const pack = this.packUnitList.filter((r) => r.packUnit == this.packUnit)
-      this.packQtyHint = ''
+      this.packUnitName = "请选择包装规格"
+      this.packUnit = ""
+      let pack = this.packUnitList.filter(r => r.packUnit == this.packUnit);
+      this.packQtyHint = "";
       this.packQty = 0
     },
 
     showSelectPackUnit() {
-      if (this.itemCode == '请选择物料信息') {
-        this.showErrorMessage('请先选择物料')
-        return
+      if (this.itemCode == "请选择物料信息") {
+        this.showErrorMessage('请先选择物料');
+        return;
       }
 
       uni.showLoading({
-        title: '加载中',
+        title: "加载中",
         mask: true
       })
-      getPackUnitByItemCode(this.itemCode)
-        .then((res) => {
-          uni.hideLoading()
-          if (res.data && res.data.list.length > 0) {
-            res.data.list.forEach((item) => {
-              item.value = item.packUnit
-              item.label = `${getPackUnitName(item.packUnit)}(${item.packQty}${this.getUomInfo(item.uom)})`
-            })
-            this.packUnitList = res.data.list
-            this.showPackUnitSelect = true
-          } else {
-            this.showErrorMessage('未查找到包装信息')
-          }
-        })
-        .catch((error) => {
-          uni.hideLoading()
-          this.showErrorMessage(error)
-        })
+      getPackUnitByItemCode(this.itemCode).then(res => {
+        uni.hideLoading()
+        if (res.data && res.data.list.length > 0) {
+          res.data.list.forEach(item => {
+            item.value = item.packUnit
+            item.label = getPackUnitName(item.packUnit) + "(" + item.packQty + this
+                .getUomInfo(item.uom) + ")";
+          })
+          this.packUnitList = res.data.list
+          this.showPackUnitSelect = true
+        } else {
+          this.showErrorMessage('未查找到包装信息');
+        }
+
+      }).catch(error => {
+        uni.hideLoading()
+        this.showErrorMessage(error);
+      })
+
     },
 
     confirmSelectPackUnit(data) {
       this.packUnitName = data[0].label
       this.packUnit = data[0].value
-      const pack = this.packUnitList.filter((r) => r.packUnit == this.packUnit)
-      this.packQtyHint = `${pack[0].packQty}(${this.getUomInfo(pack[0].uom)})`
+      let pack = this.packUnitList.filter(r => r.packUnit == this.packUnit);
+      this.packQtyHint = pack[0].packQty + "(" + this
+          .getUomInfo(pack[0].uom) + ")";
       this.packQty = pack[0].packQty
     },
     getUomInfo(uom) {
-      const item = getUomInfo(uom)
+      let item = getUomInfo(uom);
       if (item == '') {
-        return uom
+        return uom;
+      } else {
+        return item.label
       }
-      return item.label
-    }
+    },
   }
 }
 </script>
@@ -445,4 +485,4 @@ export default {
   border-radius: 5rpx;
   padding: 15rpx;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index f9522fce..7ae11e96 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -6,28 +6,25 @@
         <com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
       </view>
       <view class="" v-if="dataContent">
-        <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_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>
+        <view class='split_line'></view>
 
-        <view class="" style="padding: 10rpx; margin-left: 10rpx;">
+        <view class="" style="padding-top: 10rpx; padding-bottom: 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;padding: 0 10rpx;">
+        <view class="uni-flex uni-row space-between" style="align-items: center">
           <view style="word-break: break-all;">
             <batch :batch="dataContent.batch"></batch>
             <view class="card_view ">
@@ -142,8 +139,7 @@ export default {
     };
   },
 
-  onShow() {
-  },
+  onShow() {},
   onLoad() {
     this.options = getRemoveOption()
     this.openFg();
@@ -193,7 +189,12 @@ export default {
         packUnit: result.packUnit,
         workStationCode: result.workStationCode,
         fgLocationCode: result.fgLocationCode,
-        subList: []
+        subList: [],
+        productionLine: result.productionLineCode,
+        bomVersion: result.bomVersion,
+        workshop: result.workshop,
+        team: "",
+        shift: ""
       }
     },
 
@@ -467,10 +468,14 @@ page {
 
 .header {
   position: fixed;
+  /* #ifdef H5 */
+  top: 88rpx;
+  /* #endif */
   left: 0;
   width: 100%;
   background-color: #fff;
   z-index: 10;
+  padding: 10rpx;
   /* 确保头部在内容之上 */
 }