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 @@
{{productionLineName}}
-
+
-
-
@@ -37,6 +35,7 @@
{{itemCode}}
+ {{planQty}}({{getUomInfo(uom)}})
@@ -58,25 +57,23 @@
-
+
包装规格:
{{packUnit}}
-
{
+ 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 @@
-
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;