diff --git a/locale/en-1.json b/locale/en-1.json index 0c027cf..b287873 100644 --- a/locale/en-1.json +++ b/locale/en-1.json @@ -80,6 +80,7 @@ "grid.coretype": "Core type", "grid.corename": "Core name", "grid.areaname": "Area name", + "grid.signnum": "Allocated quantity", "select.uppershaft": "Upper shaft", "select.lowershaft": "Lower shaft", "select.leftroll": "Left roll", diff --git a/locale/id-1.json b/locale/id-1.json index 95ddb0c..e7a6b53 100644 --- a/locale/id-1.json +++ b/locale/id-1.json @@ -78,6 +78,7 @@ "grid.coretype": "Jenis inti", "grid.corename": "Nama inti", "grid.areaname": "Nama daerah", + "grid.signnum": "Jumlah yang dialokasikan", "select.uppershaft": "Poros Atas", "select.lowershaft": "Poros bawah", "select.leftroll": "Gulung Kiri", diff --git a/locale/zh-Hans-1.json b/locale/zh-Hans-1.json index 433fb47..e1dc0a5 100644 --- a/locale/zh-Hans-1.json +++ b/locale/zh-Hans-1.json @@ -81,6 +81,7 @@ "grid.coretype": "管芯类型", "grid.corename": "管芯名称", "grid.areaname": "区域名称", + "grid.signnum": "已分配数量", "select.uppershaft": "上轴", "select.lowershaft": "下轴", "select.leftroll": "左卷", diff --git a/pages/SecondPhase/slitting/PaperBind.vue b/pages/SecondPhase/slitting/PaperBind.vue index 17f575a..f837e68 100644 --- a/pages/SecondPhase/slitting/PaperBind.vue +++ b/pages/SecondPhase/slitting/PaperBind.vue @@ -32,12 +32,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('filter.pallet-number')}}{{$t('filter.tubecode')}}{{$t('filter.rownum')}}{{$t('filter.colnum')}}
{{e.vehicle_code}}{{e.paper_code}}{{e.row_num}}{{e.col_num}}
+
- - + + @@ -62,24 +91,14 @@ index1: '', options2: [{value: '1', text: '1'}, {value: '2', text: '2'}, {value: '3', text: '3'}, {value: '4', text: '4'}, {value: '5', text: '5'}], index2: '', - options: [], - newoptions: [], + dataList: [], disabled: false }; }, onLoad (options) { this.title = options.title }, - created () { - this._queryPaperMaterial() - }, methods: { - /**查询物料下拉框*/ - async _queryPaperMaterial () { - let res = await queryPaperMaterial() - this.options = [...res.rows] - this.newoptions = [...res.rows] - }, /** 选择器 */ selectChange1 (e) { this.index1 = e @@ -87,11 +106,20 @@ selectChange2 (e) { this.index2 = e }, - showSelector () { - this.newoptions = this.options + handleAdd02 () { + if (!this.val1 || !this.index1 || !this.index2 || !this.val3) { + return + } + if (this.dataList.length > 0 && (this.index1 !== this.dataList[0].row_num)) { + return + } + if (this.dataList.length > 4) { + return + } + this.dataList.push({vehicle_code: this.val1, row_num: this.index1, col_num: this.index2, paper_code: this.val3}) }, async handleConfirm(type) { - if (!this.val1 || !this.index1 || !this.index2 || !this.val3) { + if (!this.dataList.length) { return } const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?") @@ -102,7 +130,7 @@ async _operateIvt (type) { this.disabled = true try { - let res = await operateIvt(type, this.val1, this.index1, this.index2, this.val3) + let res = await operateIvt(type, this.dataList) uni.showToast({ title: res.message, icon: 'none' @@ -118,6 +146,7 @@ this.val3 = '' this.index1 = '' this.index2 = '' + this.dataList = [] } } } diff --git a/pages/SecondPhase/slitting/SlittingCutting2.vue b/pages/SecondPhase/slitting/SlittingCutting2.vue index 6786b5e..e2ec9ca 100644 --- a/pages/SecondPhase/slitting/SlittingCutting2.vue +++ b/pages/SecondPhase/slitting/SlittingCutting2.vue @@ -47,9 +47,9 @@ - + @@ -162,17 +162,17 @@ radioChange02 (e) { this.index02 = e.detail.value }, - handleAdd () { - if (!this.val1.trim()) { - return - } - const index = this.dataList.findIndex(item => item === this.val1) - if (index !== -1) { - this.dataList.splice(index, 1) - } - this.dataList.push({container_name: this.val1, site: this.index1}) - this.val1 = '' - }, + // handleAdd () { + // if (!this.val1.trim()) { + // return + // } + // const index = this.dataList.findIndex(item => item === this.val1) + // if (index !== -1) { + // this.dataList.splice(index, 1) + // } + // this.dataList.push({container_name: this.val1, site: this.index1}) + // this.val1 = '' + // }, handleAdd02 () { if (!this.val1.trim()) { return diff --git a/pages/SecondPhase/slitting/TubeStock.vue b/pages/SecondPhase/slitting/TubeStock.vue index 1a9e2d7..8f7f403 100644 --- a/pages/SecondPhase/slitting/TubeStock.vue +++ b/pages/SecondPhase/slitting/TubeStock.vue @@ -4,7 +4,7 @@ - + {{$t('filter.area')}} @@ -18,6 +18,16 @@ + + {{$t('filter.quantity')}} + + + + @@ -29,6 +39,7 @@ {{$t('grid.coretype')}} {{$t('grid.corename')}} {{$t('filter.quantity')}} + {{$t('grid.signnum')}} {{$t('filter.point')}} {{$t('filter.area')}} {{$t('grid.areaname')}} @@ -41,6 +52,7 @@ {{e.material_code}} {{e.material_name}} {{e.total_num}} + {{e.sign_num}} {{e.point_code}} {{e.product_area}} {{e.product_area_name}} @@ -52,7 +64,7 @@ - + @@ -73,6 +85,7 @@ }, data() { return { + val1: '', pkId: '', pkObj: {}, // val3: '', @@ -126,7 +139,7 @@ this.dataList = [...res.rows] }, async handleConfirm() { - if (!this.index1 || !this.index2) { + if (this.val1 || !this.index1 || !this.index2) { return } const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?") @@ -161,7 +174,7 @@ this.disabled = false }, async _showPapervehicleView () { - let res = await showPapervehicleView(this.index1, this.index2) + let res = await showPapervehicleView(this.index1, this.index2, this.val1) if (res) { this.dataList = [...res.rows] } diff --git a/utils/getData3.js b/utils/getData3.js index f32d401..7e4e56f 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -162,9 +162,9 @@ export const updatePackageInfo2 = (ivt, cn, code) => request({ /** * 纸管绑定 */ -export const operateIvt = (type, vcode, rnum, cnum, pcode) => request({ +export const operateIvt = (type, rows) => request({ url:'api/pda/stockingivt/operateIvt', - data: {type: type, vehicle_code: vcode, row_num: rnum, col_num: cnum, paper_code: pcode} + data: {type: type, rows: rows} }) /** * 分切暂存下料纸管绑定 diff --git a/utils/getData4.js b/utils/getData4.js index a4f2103..24aa4a4 100644 --- a/utils/getData4.js +++ b/utils/getData4.js @@ -3,11 +3,12 @@ import request from './request.js' * add */ // 管芯备货-查询管芯库存 -export const showPapervehicleView = (area, code) => request({ +export const showPapervehicleView = (area, code, qty) => request({ url:'api/pda/stockingivt/showPapervehicleView', data: { product_area: area, material_code: code, + material_qty: qty } }) // 管芯备货-备货