From def1dd4fe6a205e0d77d1014efc240a1ceaa4304 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: Fri, 29 Nov 2024 14:46:20 +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 | 9 +++- pages/outbound/bill-out-store.vue | 81 +++++++++++++++++++++---------- utils/getData2.js | 10 ++-- 3 files changed, 70 insertions(+), 30 deletions(-) diff --git a/common/style/layout.styl b/common/style/layout.styl index 602ffd4..6a58489 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -77,11 +77,13 @@ uni-button:after { .filter_input { width: 100%; height: 80rpx; - line-height: 30rpx; + line-height: 28rpx; border: 0; background-color: transparent; font-size: 28rpx; color: #606266; + white-space: pre-wrap; + overflow-wrap: break-word; } .filter_input_disabled { background-color: #eee; @@ -186,6 +188,11 @@ uni-button:after { z-index: 101; box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20); } +.slide_new table th .td_3, .slide_new table td.td_3 { + width: 100px; + line-height: 28rpx; + white-space: unset; +} .slide_new table th.fontcol1,.slide_new table td.fontcol1 { color: #4e6ef2; font-weight: bold; diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue index a24983b..2b69a46 100644 --- a/pages/outbound/bill-out-store.vue +++ b/pages/outbound/bill-out-store.vue @@ -14,31 +14,31 @@ - + 单据编码 {{currentData.code}} 单据类型 {{currentData.form_type}} - + 备注 {{currentData.remark}} 创建时间 {{currentData.create_time}} - + 创建人 {{currentData.create_name}} 物料编码 {{currentData.material_code}} - + 申请数量 {{currentData.qty}} 计划数量 {{currentData.plan_qty}} - + 已分配数量 {{currentData.assign_qty}} 单位 @@ -46,7 +46,19 @@ 批次号 - {{currentData.pcsn}} + + + + 仓库 + + + + + + 车间 + + + @@ -54,36 +66,28 @@ - - - - + + - - - - - - - + + + - -
单据id物料名称物料编码物料类型 + + 物料名称 + + 申请数量 计划数量 已分配数量 单位 批次号仓库车间
{{e.code}}{{e.material_name}}{{e.material_code}}{{e.material_spec}}
{{e.material_name}} {{e.qty}} {{e.plan_qty}} {{e.unit_id}} {{e.pcsn}} - - - -
@@ -112,9 +116,11 @@ options: [], index: '', currentData: {}, + dataList: [], disabled: false, options1: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}], options2: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}], + allCheck: false }; }, onLoad (options) { @@ -126,8 +132,10 @@ onShow () { if (this.$store.getters.publicObj !== '') { this.currentData = this.$store.getters.publicObj - this.currentData.children.map(el => { + this.dataList = this.currentData.children + this.dataList.map(el => { this.$set(el, 'now_assign_qty', el.qty) + this.$set(el, 'checked', false) }) this.$store.dispatch('setPublicObj', '') } @@ -154,6 +162,19 @@ toEmpty () { this.index = '' this.currentData = {} + this.dataList = [] + this.allCheck = false + }, + toAllCheck () { + this.allCheck = !this.allCheck + this.dataList.map(el => { + el.checked = this.allCheck + }) + }, + toCheck (e) { + e.checked = !e.checked + let arr = this.dataList.filter(el => el.checked === true) + this.allCheck = arr.length === this.dataList.length }, async _outStorageConfirm () { this.disabled = true @@ -161,8 +182,10 @@ this.disabled = false return } + let arr = this.dataList.filter(el => el.checked === true) + let obj = Object.assign(this.currentData, {children: arr}) try { - let res = await outStorageConfirm(this.currentData) + let res = await outStorageConfirm(obj) if (res.code === '200') { this.toEmpty() } @@ -180,10 +203,18 @@ \ No newline at end of file diff --git a/utils/getData2.js b/utils/getData2.js index a226aee..5c5dfd8 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -163,21 +163,23 @@ export const outStorageOrderList = (page, size, type) => request({ // "totalElements": 10, // "content": [ // { -// "code": "22984980", +// "code": "PPBOM241102856", // "form_type": "单据类型", // "remark": "备注", // "create_time": "2024-10-20 21:41:50", // "create_name": "创建人", -// "material_code": "物料编码", +// "material_code": "04.01.DY.00531", // "qty": 0.0, // "plan_qty": 0.0, // "assign_qty": 0.0, // "unit_id": "单位", // "pcsn": "批次", +// "stor_code": "FStockPallet", +// "product_area": "A4", // "children": [ // { // "code": "bbb", -// "material_name": "物料名称", +// "material_name": "白色插座下线套 (模号587#)（色号12081407乳白）", // "material_code": "物料编码", // "material_spec": "物料类型", // "stor_code": "FStockPallet", @@ -186,7 +188,7 @@ export const outStorageOrderList = (page, size, type) => request({ // "plan_qty": 0.0, // "assign_qty": 0.0, // "unit_id": "单位", -// "pcsn": "批次" +// "pcsn": "批次", // }, // { // "code": "CCC",