From a42d288bc8467df7e6370d0df992fe4fb4541495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
<8702040+cai-ling@user.noreply.gitee.com>
Date: Sun, 24 Nov 2024 21:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=87=BA=E5=BA=93=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/style/layout.styl | 2 +-
pages/outbound/bill-out-store.vue | 53 ++++++++++++++++++++-----------
utils/getData2.js | 47 ++++++++++++++-------------
3 files changed, 60 insertions(+), 42 deletions(-)
diff --git a/common/style/layout.styl b/common/style/layout.styl
index b697a8f..602ffd4 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -77,7 +77,7 @@ uni-button:after {
.filter_input {
width: 100%;
height: 80rpx;
- line-height: 80rpx;
+ line-height: 30rpx;
border: 0;
background-color: transparent;
font-size: 28rpx;
diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue
index 80a448a..a24983b 100644
--- a/pages/outbound/bill-out-store.vue
+++ b/pages/outbound/bill-out-store.vue
@@ -16,27 +16,27 @@
单据编码
- {{currentData.code}}
+ {{currentData.code}}
单据类型
- {{currentData.form_type}}
+ {{currentData.form_type}}
备注
- {{currentData.remark}}
+ {{currentData.remark}}
创建时间
- {{currentData.create_time}}
+ {{currentData.create_time}}
创建人
- {{currentData.create_name}}
+ {{currentData.create_name}}
物料编码
- {{currentData.material_code}}
+ {{currentData.material_code}}
申请数量
- {{currentData.qty}}
+ {{currentData.qty}}
计划数量
- {{currentData.plan_qty}}
+ {{currentData.plan_qty}}
已分配数量
@@ -46,17 +46,15 @@
批次号
- {{currentData.pcsn}}
- 创建时间
- {{currentData.create_time}}
+ {{currentData.pcsn}}
-
+
@@ -86,7 +92,7 @@
-
+
@@ -106,7 +112,9 @@
options: [],
index: '',
currentData: {},
- disabled: false
+ disabled: false,
+ options1: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}],
+ options2: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}],
};
},
onLoad (options) {
@@ -119,7 +127,7 @@
if (this.$store.getters.publicObj !== '') {
this.currentData = this.$store.getters.publicObj
this.currentData.children.map(el => {
- this.$set(el, 'assign_qty', el.qty)
+ this.$set(el, 'now_assign_qty', el.qty)
})
this.$store.dispatch('setPublicObj', '')
}
@@ -139,8 +147,8 @@
}
},
handleBlur (e) {
- if (e.assign_qty < 0 || e.assign_qty > e.qty) {
- e.assign_qty = e.qty
+ if (e.now_assign_qty < 0 || e.now_assign_qty > e.qty) {
+ e.now_assign_qty = e.qty
}
},
toEmpty () {
@@ -155,6 +163,9 @@
}
try {
let res = await outStorageConfirm(this.currentData)
+ if (res.code === '200') {
+ this.toEmpty()
+ }
this.disabled = false
uni.showToast({
title: res.msg,
@@ -171,4 +182,8 @@
\ No newline at end of file
diff --git a/utils/getData2.js b/utils/getData2.js
index 7492a88..7230ce9 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -159,7 +159,7 @@ export const outStorageOrderList = (page, size, type) => request({
// "code": "22984980",
// "form_type": "单据类型",
// "remark": "备注",
-// "create_time": "创建时间",
+// "create_time": "2024-10-20 21:41:50",
// "create_name": "创建人",
// "material_code": "物料编码",
// "qty": 0.0,
@@ -169,34 +169,30 @@ export const outStorageOrderList = (page, size, type) => request({
// "pcsn": "批次",
// "children": [
// {
-// "id": "",
// "code": "bbb",
-// "proc_inst_id": "",
-// "source_form_id": "",
-// "source_form_type": "",
-// "source_form_date": "",
-// "form_type": "",
-// "status": "",
-// "remark": "",
-// "create_time": "",
-// "create_name": "",
-// "material_id": "",
// "material_name": "物料名称",
// "material_code": "物料编码",
// "material_spec": "物料类型",
-// "single_weight": "",
+// "stor_code": "FStockPallet",
+// "product_area": "A4",
// "qty": 10.0,
// "plan_qty": 0.0,
// "assign_qty": 0.0,
// "unit_id": "单位",
-// "pcsn": "批次",
-// "vehicle_code": "",
-// "vehicle_id": "",
-// "form_data": {
-// "": {}
-// },
-// "parent_id": "",
-// "HasChildren": "public static final Boolean FALSE = new Boolean(false);"
+// "pcsn": "批次"
+// },
+// {
+// "code": "CCC",
+// "material_name": "物料名称",
+// "material_code": "物料编码",
+// "material_spec": "物料类型",
+// "stor_code": "FStockPallet",
+// "product_area": "A4",
+// "qty": 10.0,
+// "plan_qty": 0.0,
+// "assign_qty": 0.0,
+// "unit_id": "单位",
+// "pcsn": "批次"
// }
// ]
// }
@@ -210,4 +206,11 @@ export const outStorageOrderList = (page, size, type) => request({
export const outStorageConfirm = (obj) => request({
url:'api/pda/outStorage/confirm',
data: obj
-})
\ No newline at end of file
+})
+// export const outStorageConfirm = (obj) => {
+// let res = {
+// code: '200',
+// msg: 'ok'
+// }
+// return res
+// }
\ No newline at end of file