diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue index c85add6e7..b36fd8bbc 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue @@ -107,7 +107,7 @@ - + @@ -166,7 +166,7 @@ export default { stor_id: '', sect_id: '', sectProp: null, - paper_tube_description: '', + paperTubeDescription: '', bucketProp: {}, structShow: false, bucketObj: null, @@ -337,9 +337,9 @@ export default { debugger this.form.tableMater = this.currentSelection this.form.checked = row.material_code - this.form.sale_order_name = this.sale_order_name + this.form.sale_order_name = this.saleOrderName await crudPackagerelation.updateEntityList(this.form) - const res = crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.sale_order_name }) + const res = crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.saleOrderName }) this.openParam = res.content this.clearSelection() this.form.tableMater = [] @@ -349,7 +349,9 @@ export default { divStruct() { debugger if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) { - this.paper_tube_description = this.currentSelection[0].paper_tube_description + debugger + const paper_description = this.currentSelection.filter(item => item.paper_tube_description !== null && item.paper_tube_description !== '') + this.paperTubeDescription = paper_description[0].paper_tube_description this.structShow = true this.$refs.child.getMsg(false) } else { diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue index de651c9a1..c406f6ecb 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue @@ -67,10 +67,10 @@ 请仔细核对子卷与木箱规格是否匹配,

- 木箱长度为:{{ this.box_length }}, + 木箱长度为:{{ this.boxLength }}

- 子卷规格为:{{ this.paper_tube_description }}, + 子卷规格为:{{ this.paperTubeDescription }}

点击确定后将立即生成木箱出库任务,无法更改! @@ -121,7 +121,7 @@ export default { }, data() { return { - box_length: '', + boxLength: '', classes: [], dialogVisible: false, dialogVisible1: false, @@ -211,7 +211,7 @@ export default { submit() { debugger this.rows = this.$refs.table.selection - this.box_length = this.rows[0].box_length + this.boxLength = this.rows[0].box_length if (this.rows.length <= 0) { this.$message('请先选择木箱信息') return diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue index bd5e38549..4f8db0261 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue @@ -127,7 +127,7 @@ @@ -198,7 +198,7 @@ export default { activeName: 'first', divShow: false, openParam: [], - sale_order_name: null, + saleOrderName: null, bussConfig: null, currentRow: null, dis_flag: true, @@ -224,15 +224,13 @@ export default { this.crud.toQuery() }, async divOpen() { - debugger - this.sale_order_name = this.currentRow.sale_order_name + this.saleOrderName = this.currentRow.sale_order_name const res = await crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.currentRow.sale_order_name }) this.openParam = res.content // this.divShow = true }, divOpen1() { - debugger - this.sale_order_name = this.currentRow.sale_order_name + this.saleOrderName = this.currentRow.sale_order_name crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.currentRow.sale_order_name }).then(res => { this.openParam = res.content this.divShow = true