From b321a9efb757ee843f521340fff290de65685adb Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 18 Jul 2024 17:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E5=AE=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |  9 ++-
 src/pages/fg/coms/comReceiptPopup.vue         | 81 +++++++------------
 src/pages/index/index.vue                     |  1 -
 .../components/u-select/u-select.vue          |  2 +-
 4 files changed, 36 insertions(+), 57 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 55b471b9..9f5389f7 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4263,5 +4263,10 @@ export  function planReceiptSubmit(params) {
 	});
 }
 
-
-
+export function getProductionlineAndWorkStation() {
+	return request({
+		url: baseApi + "/wms/production-main/getProductionlineAndWorkStation",
+		method: "get",
+		data: {},
+	});
+}
\ No newline at end of file
diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index 15c11a1b..7274125c 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -19,8 +19,8 @@
 								<view class="customerBorder" @click="showSelectLine">
 									{{productionLineName}}
 								</view>
-								<u-select v-model="showProductLineSelect" mode="single-column" :list="productLineList"
-									@confirm="confirmSelectLine"></u-select>
+								<u-select v-model="showProductLineSelect" mode="mutil-column-auto"
+									:list="productLineList" @confirm="confirmSelectLine"></u-select>
 
 								<view class="">
 									<image src="/static/icons/down.svg" mode=""
@@ -28,8 +28,6 @@
 									</image>
 								</view>
 							</view>
-
-
 							<view class='split_line'></view>
 
 							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
@@ -37,6 +35,7 @@
 								<view class="customerBorder">
 									{{itemCode}}
 								</view>
+								<view v-if="planQty>0">{{planQty}}({{getUomInfo(uom)}})</view>
 								<u-select v-model="showItemCodeSelect" mode="single-column" :list="itemCodeList"
 									@confirm="confirmSelectItem"></u-select>
 								<view class="">
@@ -58,25 +57,23 @@
 								</view>
 							</view>
 							<view class='split_line'></view>
-							<view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+							<!-- <view class="title " style="display: flex;align-items: center;padding: 10rpx;">
 								<text style=" flex-shrink: 0; width: 25%;">计划数量：</text>
 								<view class="customerBorder">
 									{{planQty}}
 								</view>
 								<view class="">
-									<image src="" mode=""
-										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
-										>
+									<image src="" mode="" style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;">
 									</image>
 								</view>
-							</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="customerBorder">
 									{{packUnit}}
 								</view>
-								<u-select v-model="showPackUnitSelect" mode="mutil-column-auto" :list="packUnitList"
+								<u-select v-model="showPackUnitSelect" mode="mutil-column" :list="packUnitList"
 									@confirm="confirmSelectPackUnit"></u-select>
 								<view class="">
 									<image src="/static/icons/down.svg" mode=""
@@ -104,7 +101,8 @@
 	import {
 		getIssueJobByProductionline,
 		getPlaneInfoByproductLine,
-		getPackUnitByItemCode
+		getPackUnitByItemCode,
+		getProductionlineAndWorkStation
 	} from '@/api/request2.js';
 	import {
 		getPackUnitName,
@@ -144,38 +142,7 @@
 				showPackUnitSelect: false,
 				itemCodeList: [],
 				showItemCodeSelect: false,
-				packUnitList: [{
-						value: 1,
-						label: '中国',
-						children: [{
-								value: 2,
-								label: '广东',
-
-							},
-							{
-								value: 5,
-								label: '广西',
-
-							}
-						]
-					},
-					{
-						value: 8,
-						label: '美国',
-						children: [{
-								value: 9,
-								label: '纽约',
-
-							},
-							{
-								value: 10,
-								label: '华盛顿',
-
-							}
-						]
-					}
-				]
-
+				packUnitList: [],
 			}
 		},
 		props: {
@@ -210,6 +177,7 @@
 				// this.packUnitList = []
 				this.itemCodeList = []
 				this.showItemCodeSelect = false
+
 			},
 
 			closeRequestPopup() {
@@ -279,12 +247,12 @@
 						title: "加载中",
 						mask: true
 					})
-					getIssueJobByProductionline().then(res => {
+					getProductionlineAndWorkStation().then(res => {
 						uni.hideLoading()
 						if (res.data && res.data.length > 0) {
-							res.data.forEach(item => {
-								item.label = item.name
-							})
+							// res.data.forEach(item => {
+							// 	item.label = item.name
+							// })
 							this.productLineList = res.data
 							this.showProductLineSelect = true
 						} else {
@@ -317,7 +285,8 @@
 						uni.hideLoading()
 						if (res.data && res.data.length > 0) {
 							res.data.forEach(item => {
-								item.label = item.itemCode
+								item.label = item.itemCode + "（" + item.planQty + item.uom + ")"
+								item.value = item
 							})
 							this.itemCodeList = res.data
 							this.showItemCodeSelect = true
@@ -335,11 +304,17 @@
 
 			},
 			confirmSelectItem(data) {
-				this.itemCode = data[0].label
-				var item = this.itemCodeList.find(res => res.itemCode == this.itemCode)
-				this.uom = item.uom
-				this.planQty = item.planQty
-				this.number = item.number
+				let productionPlan = data[0].value;
+				this.itemCode = productionPlan.itemCode;
+				// var item = this.itemCodeList.find(res => res.itemCode == this.itemCode)
+				this.uom = productionPlan.uom
+				this.planQty = productionPlan.planQty
+				this.number = productionPlan.number
+				// this.itemCode = data[0].label
+				// var item = this.itemCodeList.find(res => res.itemCode == this.itemCode)
+				// this.uom = item.uom
+				// this.planQty = item.planQty
+				// this.number = item.number
 			},
 
 			showSelectPackUnit() {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 071e4d88..9396f0d2 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -59,7 +59,6 @@
 									</view>
 
 								</view>
-
 							</view>
 						</view>
 					</view>
diff --git a/src/uni_modules/vk-uview-ui/components/u-select/u-select.vue b/src/uni_modules/vk-uview-ui/components/u-select/u-select.vue
index ac655b94..da19540b 100644
--- a/src/uni_modules/vk-uview-ui/components/u-select/u-select.vue
+++ b/src/uni_modules/vk-uview-ui/components/u-select/u-select.vue
@@ -415,7 +415,7 @@ export default {
 
 	&__body {
 		width: 100%;
-		height: 300rpx;
+		height: 500rpx;
 		overflow: hidden;
 		background-color: #fff;