diff --git a/pages/manage/axis-bind.vue b/pages/manage/axis-bind.vue index d5e7d9c..49efa24 100644 --- a/pages/manage/axis-bind.vue +++ b/pages/manage/axis-bind.vue @@ -27,38 +27,37 @@ - + + - - - - - - + + + - - + + + - - - - - - - + + + + + + +
母卷号 子卷号上下轴左右卷 机台编号 分切组 生产顺序 生产日期 订单号 纸筒/FRP管纸筒物料编码纸筒物料描述纸筒规格FRP管物料编码FRP管物料描述FRP管规格纸筒/FRP管物料编码纸筒/FRP管物料描述纸筒/FRP管规格
{{e.source_container_name}}
{{e.container_name}}{{e.up_or_down}}{{e.left_or_right}} {{e.point_code}} {{e.split_group}} {{e.manufacture_sort}} {{e.manufacture_date}} {{e.mfg_order_name}}{{e.paper_tube_or_FRP}}{{e.paper_tube_material}}{{e.paper_tube_description}}{{e.paper_tube_model}}{{e.FRP_material}}{{e.FRP_description}}{{e.FRP_model}}{{['纸管', 'FRP管'][Number(e.paper_tube_or_FRP) - 1]}}{{e.paper_tube_material}}{{e.paper_tube_description}}{{e.paper_tube_model}}{{e.frp_material}}{{e.frp_description}}{{e.frp_model}}
@@ -69,7 +68,7 @@ - + @@ -90,8 +89,7 @@ index: '', options: [], dataList: [], - pkId: '', - pkObj: {}, + checkArr: [], disabled: false }; }, @@ -111,6 +109,9 @@ }, async _getSlitterNeedShaftPlans (e) { let res = await getSlitterNeedShaftPlans(e) + res.map(el => { + this.$set(el, 'checked', false) + }) this.dataList = [...res] }, async _doSendShaft () { @@ -149,12 +150,19 @@ }, async _doBindingGx () { this.disabled = true - if (!this.val1 || !this.pkId) { + if (!this.val1 || !this.checkArr.length) { this.disabled = false return } + if (this.checkArr.length > 2) { + uni.showToast({ + title: '最多选择两条信息', + icon: 'none' + }) + return + } try { - let res = await doBindingGx(this.val1, [this.pkObj]) + let res = await doBindingGx(this.val1, this.checkArr) this.clearUp() uni.showToast({ title: res.message, @@ -168,13 +176,12 @@ this.val1 = '' this.index = '' this.dataList = [] - this.pkId = '' - this.pkObj = {} + this.checkArr = [] this.disabled = false }, toCheck (e) { - this.pkId = this.pkId === e.container_name ? '' : e.container_name - this.pkObj = this.pkId === e.container_name ? e : {} + e.checked = !e.checked + this.checkArr = this.dataList.filter(el => el.checked === true) } } } diff --git a/pages/manage/sub-vol-offline.vue b/pages/manage/sub-vol-offline.vue index a5ef506..de14467 100644 --- a/pages/manage/sub-vol-offline.vue +++ b/pages/manage/sub-vol-offline.vue @@ -3,39 +3,19 @@ - - - 子卷号 - - - - - - + 成品称重暂存区 - + - - - 载具号 - - - - - - + @@ -52,10 +32,8 @@ data() { return { title: '', - val1: '', index: '', options: [], - val2: '', disabled: false }; }, @@ -70,12 +48,12 @@ }, async _doSubVolumeDown () { this.disabled = true - if (!this.val1 || !this.index) { + if (!this.index) { this.disabled = false return } try { - let res = await doSubVolumeDown(this.index, this.val1, this.val2) + let res = await doSubVolumeDown(this.index) this.clearUp() uni.showToast({ title: res.message, @@ -86,9 +64,7 @@ } }, clearUp () { - this.val1 = '' this.index = '' - this.val2 = '' this.disabled = false } } diff --git a/utils/getData2.js b/utils/getData2.js index 7e8ba1a..78b9a71 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -189,7 +189,7 @@ export const getWeightCacheInfos = () => request({ url:'api/pda/nbj/getWeightCacheInfos', data: {} }) -export const doSubVolumeDown = (code, cn, vcode) => request({ +export const doSubVolumeDown = (code) => request({ url:'api/pda/nbj/doSubVolumeDown', - data: {point_code: code, container_name: cn, vehicle_code: vcode} + data: {point_code: code} }) \ No newline at end of file