From a26e5dd64b8787a0e48da040bccdbf5d59e13702 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:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E6=AC=A1=E7=9A=84?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=202024/8/2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/fg/coms/comNoReceiptPopup.vue | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/pages/fg/coms/comNoReceiptPopup.vue b/src/pages/fg/coms/comNoReceiptPopup.vue
index be96cac1..fd85a14b 100644
--- a/src/pages/fg/coms/comNoReceiptPopup.vue
+++ b/src/pages/fg/coms/comNoReceiptPopup.vue
@@ -158,7 +158,6 @@ export default {
       showProductLineSelect: false,
       productLineList: [],
       productionLineName: "请选择生产线",
-      productionLineCode: "",
       batch: "",
       packUnitName: "请选择包装规格",
       packUnit: "",
@@ -193,7 +192,7 @@ export default {
     openRequestPopup() {
       this.initData();
       this.planDate = getCurrDate()
-      this.batch = getBatch8()
+      this.batch = this.planDate.replace('-', '')
       this.$refs.popup.open('bottom')
     },
     initData() {
@@ -207,7 +206,7 @@ export default {
       this.showProductLineSelect = false
       this.productLineList = []
       this.productionLineName = "请选择生产线"
-      this.productionLineCode = ""
+      this.productLineCode = ""
       this.batch = ""
       this.packUnitName = "请选择包装规格"
       this.packUnit = "",
@@ -222,7 +221,7 @@ export default {
       this.planDateList = []
       this.fgLocationCode = ""
       this.rawLocationCode = ""
-      this.workshop=""
+      this.workshop = ""
 
     },
 
@@ -270,7 +269,7 @@ export default {
     callback() {
       let item = {
         productionLineName: "",
-        productionLineCode: this.productLineCode, //生产线
+        productionLine: this.productLineCode, //生产线
         itemCode: this.itemCode,
         itemName: this.itemName,
         uom: this.getUomInfo(this.uom),
@@ -285,7 +284,7 @@ export default {
         workStationCode: this.workStationCode,
         fgLocationCode: this.fgLocationCode,
         rawLocationCode: this.rawLocationCode,
-        workshop:this.workshop
+        workshop: this.workshop
       };
       this.closeRequestPopup();
       this.$emit("confirm", item);
@@ -293,7 +292,8 @@ export default {
 
     showErrorMessage(message, type) {
       setTimeout(r => {
-        this.$refs.comMessage.showErrorMessage(message, res => {})
+        this.$refs.comMessage.showErrorMessage(message, res => {
+        })
       })
     },
     cancel(e) {
@@ -302,9 +302,9 @@ export default {
 
     confirmSelectLine(data) {
       this.productionLineName = data[0].label + "—" + data[1].label
-      this.productionLineCode = data[0].value
+      this.productLineCode = data[0].value
       this.workStationCode = data[1].value
-      var parent = this.productLineList.filter(res => res.value == this.productionLineCode)
+      var parent = this.productLineList.filter(res => res.value == this.productLineCode)
       var fgLocation = parent[0].children.filter(children => children.value == this.workStationCode)
       this.fgLocationCode = fgLocation[0].fgLocationCode;
       this.workshop = parent[0].workshop;
@@ -324,6 +324,7 @@ export default {
 
     confirmSelectDate(data) {
       this.planDate = data[0].label
+      this.batch = this.planDate.replace('-', '');
     },
 
     showSelectDate() {
@@ -364,7 +365,7 @@ export default {
 
     },
     showSelectItemCode() {
-      if (!this.productionLineCode) {
+      if (!this.productLineCode) {
         this.showErrorMessage('请先选择生产线');
         return;
       }
@@ -372,7 +373,7 @@ export default {
         title: "加载中",
         mask: true
       })
-      getBomVersionByProductionline(this.productionLineCode).then(res => {
+      getBomVersionByProductionline(this.productLineCode).then(res => {
         uni.hideLoading()
         if (res.data && res.data.length > 0) {
           this.itemCodeList = res.data
@@ -388,7 +389,7 @@ export default {
     confirmSelectItem(data) {
       this.itemCode = data[0].label;
       this.bomVersion = data[1].value;
-      this.uom=data[0].uom;
+      this.uom = data[0].uom;
       // this.uom = itemInfo.uom
 
       //清除其他数据