diff --git a/common/style/reset.css b/common/style/reset.css index 8e5b014..f906049 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -141,6 +141,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re .mgb10 { margin-bottom: 10rpx; } +.mgb20 { + margin-bottom: 20rpx; +} .pdl20 { padding-left: 20rpx; } diff --git a/pages.json b/pages.json index 7609972..da5139d 100644 --- a/pages.json +++ b/pages.json @@ -122,6 +122,14 @@ } } + ,{ + "path" : "pages/manage/axis-application", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/manage/axis-bind.vue b/pages/manage/axis-bind.vue index ed92db0..d5e7d9c 100644 --- a/pages/manage/axis-bind.vue +++ b/pages/manage/axis-bind.vue @@ -17,10 +17,9 @@ 分切设备 - - + + - @@ -105,8 +104,13 @@ let res = await getSlitterDeviceBox() this.options = [...res] }, - async _getSlitterNeedShaftPlans () { - let res = await getSlitterNeedShaftPlans(this.val1, this.index) + selectChange (e) { + if (e) { + this._getSlitterNeedShaftPlans(e) + } + }, + async _getSlitterNeedShaftPlans (e) { + let res = await getSlitterNeedShaftPlans(e) this.dataList = [...res] }, async _doSendShaft () { diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue index 1d5a43c..894a03f 100644 --- a/pages/manage/bake-process.vue +++ b/pages/manage/bake-process.vue @@ -15,10 +15,32 @@ - 流转单号 + 母卷号 - + + + + + + 大/小卷 + + + + {{index1 !== '' ? options1[index1].text : ''}} + + + + + + + 是否烘烤 + + + + @@ -35,12 +57,9 @@ 时间 - + + 分 @@ -48,7 +67,7 @@ 母卷号 - {{obj.roll_type}} + {{obj.order_code}} @@ -66,9 +85,9 @@ - + - + @@ -87,33 +106,52 @@ title: '', val1: '', val2: '', + options1: [{value: '1', text: '大卷'}, {value: '2', text: '小卷'}], + index1: '', + isChecked: false, val3: '', - time: '', - obj: {roll_type: '-', is_baking: '-', msg: '-'}, + val4: '', + obj: {order_code: '-', is_baking: '-', msg: '-'}, disabled: false }; }, + watch: { + val1(value) { + this.checkInputs(value, this.val2); + }, + val2(value) { + this.checkInputs(this.val1, value); + } + }, onLoad (options) { this.title = options.title }, methods: { - clearUp () { - this.val1 = '' - this.val2 = '' - this.val3 = '' - this.time = '' - this.obj = {roll_type: '-', is_baking: '-', msg: '-'} - this.disabled = false - }, - handleConfirm () { - if (this.val2) { - this._getHotTempPointInfo() - } - }, async _getHotTempPointInfo () { let res = await getHotTempPointInfo(this.val1, this.val2) this.obj = res }, + checkInputs(val1, val2) { + if (val1 && val2) { + this._getHotTempPointInfo() + } + }, + pickerChange (e) { + this.index1 = e.detail.value + }, + setWStatus () { + this.isChecked = !this.isChecked + }, + clearUp () { + this.val1 = '' + this.val2 = '' + this.index1 = '' + this.isChecked = false + this.val3 = '' + this.val4 = '' + this.obj = {order_code: '-', is_baking: '-', msg: '-'} + this.disabled = false + }, async _bakingQuality (type) { this.disabled = true if (!this.val1) { @@ -131,17 +169,15 @@ this.disabled = false } }, - dateChange (e) { - this.time = e - }, async _doModifyRawInfos () { this.disabled = true - if (!this.val1 || !this.val2 || !this.val3) { + if (!this.val1 || !this.val2 || this.index1 === '' || !this.val3 || !this.val4) { this.disabled = false return } try { - let res = await doModifyRawInfos(this.val1, this.val2, this.val3, this.time) + let checked = this.isChecked ? '1' : '0' + let res = await doModifyRawInfos(this.val1, this.val2, this.options1[this.index1].value, checked, this.val3, this.val4) this.clearUp() uni.showToast({ title: res.message, diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue index 91ad317..059e725 100644 --- a/pages/manage/raw-foil-progess.vue +++ b/pages/manage/raw-foil-progess.vue @@ -3,7 +3,7 @@ - + 点位 @@ -13,6 +13,16 @@ /> + + + + + + + + + + 流转单号 @@ -33,11 +43,8 @@ - - - - - + + @@ -125,14 +132,14 @@ this.disabled = false } }, - async _confirmBlanking () { + async _confirmBlanking (type) { this.disabled = true if (!this.val1) { this.disabled = false return } try { - let res = await confirmBlanking(this.val1) + let res = await confirmBlanking(this.val1, type) this.clearUp() uni.showToast({ title: res.message, @@ -147,6 +154,4 @@ diff --git a/pages/manage/split-feed.vue b/pages/manage/split-feed.vue index 7a45127..2e61806 100644 --- a/pages/manage/split-feed.vue +++ b/pages/manage/split-feed.vue @@ -4,15 +4,16 @@ - + 点位 - + + @@ -20,38 +21,26 @@ - - + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + +
母卷号子卷号序号母卷号 机台编号分切组生产顺序生产日期订单号纸筒/FRP管纸筒物料编码纸筒物料描述纸筒规格FRP管物料编码FRP管物料描述FRP管规格是否烘烤烘烤时间/分大小卷烘烤温度所在位置
{{e.source_container_name}}{{e.container_name}}{{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}}
{{ i + 1 }}{{e.container_name}}{{e.resource_name}}{{['否', '是'][Number(e.is_baking)]}}{{e.baking_time}}{{['大卷', '小卷'][Number(e.is_baking) - 1]}}{{e.baking_temperature}}{{e.zc_point}}
@@ -59,11 +48,11 @@ - - + + @@ -97,13 +86,14 @@ this.dataList = [...res.data] }, toCheck (e) { - this.pkId = e.container_name === this.pkId ? '' : e.container_name - this.pkObj = e.container_name === this.pkId ? e : {} + this.pkId = e.workorder_id === this.pkId ? '' : e.workorder_id + this.pkObj = e.workorder_id === this.pkId ? e : {} }, clearUp () { - this.index = '' this.val1 = '' - this.val2 = '' + this.dataList = [] + this.pkId = '' + this.pkObj = {} this.disabled = false }, async _slitvehicleReturn () { @@ -157,14 +147,14 @@ this.disabled = false } }, - async _slitallowCoiling () { + async _slitallowCoiling (type) { this.disabled = true if (!this.val1) { this.disabled = false return } try { - let res = await slitallowCoiling(this.val1) + let res = await slitallowCoiling(this.val1, type) this.clearUp() uni.showToast({ title: res.message, @@ -180,5 +170,5 @@ diff --git a/pages/manage/sub-vol-bind.vue b/pages/manage/sub-vol-bind.vue index 0c4c913..b916fb9 100644 --- a/pages/manage/sub-vol-bind.vue +++ b/pages/manage/sub-vol-bind.vue @@ -33,7 +33,7 @@ - + @@ -83,12 +83,12 @@ }, async _bindSlitterSubVolumeInfo () { this.disabled = true - if (!this.index2 || !this.val1) { + if (!this.index1 || !this.index2 || !this.val1) { this.disabled = false return } try { - let res = await bindSlitterSubVolumeInfo(this.index2, this.val1) + let res = await bindSlitterSubVolumeInfo(this.index1, this.index2, this.val1) this.clearUp() uni.showToast({ title: res.message, diff --git a/pages/manage/tube-core-out.vue b/pages/manage/tube-core-out.vue index 13c4606..4b2a8ce 100644 --- a/pages/manage/tube-core-out.vue +++ b/pages/manage/tube-core-out.vue @@ -3,16 +3,6 @@ - - - 物料编码 - - - - - 管芯规格 @@ -26,14 +16,14 @@ 管芯数量 - + - + @@ -53,7 +43,6 @@ index: '', options: [], val1: '', - val2: '', disabled: false }; }, @@ -68,18 +57,23 @@ }, clearUp () { this.val1 = '' - this.val2 = '' this.index = '' this.disabled = false }, async _gxconfirmedOutStorage () { this.disabled = true - if (!this.val1 || !this.val2 || this.index === '') { + if (!this.val1 || this.index === '') { this.disabled = false return } + let material_spec = '' + this.options.map(el => { + if (el.value === this.index) { + material_spec = el.text + } + }) try { - let res = await gxconfirmedOutStorage(this.val2, this.val1, this.index) + let res = await gxconfirmedOutStorage(this.val1, this.index, material_spec) this.clearUp() uni.showToast({ title: res.message, diff --git a/pages/manage/tube-core-storage.vue b/pages/manage/tube-core-storage.vue index 55af6b3..3160fdc 100644 --- a/pages/manage/tube-core-storage.vue +++ b/pages/manage/tube-core-storage.vue @@ -3,16 +3,6 @@ - - - 物料编码 - - - - - 管芯规格 @@ -21,19 +11,19 @@ - + 管芯数量 - + - + @@ -53,7 +43,6 @@ index: '', options: [], val1: '', - val2: '', qty: '', disabled: false }; @@ -70,40 +59,45 @@ async _gxremainingQty () { let res = await gxremainingQty() this.qty = res.qty - if (Number(this.val2) > Number(this.qty)) { + if (Number(this.val1) > Number(this.qty)) { uni.showToast({ title: '管芯库空位不足！', icon: 'none' }) - this.val2 = '' + this.val1 = '' } }, handleBlur () { - if (this.val2 !== '') { + if (this.val1 !== '') { this._gxremainingQty() - } else if (Number(this.val2) > 5) { + } else if (Number(this.val1) > 5) { uni.showToast({ title: '一次性最多只能入5根管芯！', icon: 'none' }) - this.val2 = '' + this.val1 = '' } }, clearUp () { this.val1 = '' - this.val2 = '' this.index = '' this.qty = '' this.disabled = false }, async _gxconfirmedInStorage () { this.disabled = true - if (!this.val1 || !this.val2 || this.index === '') { + if (!this.val1 || this.index === '') { this.disabled = false return } + let material_spec = '' + this.options.map(el => { + if (el.value === this.index) { + material_spec = el.text + } + }) try { - let res = await gxconfirmedInStorage(this.val2, this.val1, this.index) + let res = await gxconfirmedInStorage(this.val1, this.index, material_spec) this.clearUp() uni.showToast({ title: res.message, diff --git a/utils/getData2.js b/utils/getData2.js index fc1b12c..4e22edf 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -76,9 +76,9 @@ export const getSlitterDeviceBox = () => request({ url:'api/pda/nbj/getSlitterDeviceBox', data: {} }) -export const getSlitterNeedShaftPlans = () => request({ +export const getSlitterNeedShaftPlans = (device) => request({ url:'api/pda/nbj/getSlitterNeedShaftPlans', - data: {point_code: code, device: device} + data: {device: device} }) export const doSendShaft = (code, device) => request({ url:'api/pda/nbj/doSendShaft', @@ -127,9 +127,9 @@ export const slitsendSlitterRoll = (code) => request({ url:'api/pda/slitter/sendSlitterRoll', data: {point_code: code} }) -export const slitallowCoiling = (code) => request({ +export const slitallowCoiling = (code, option) => request({ url:'api/pda/slitter/allowCoiling', - data: {point_code: code} + data: {point_code: code, option} }) // 分切下料 export const querySlitterDeviceSubVolumeInfos = (code) => request({ @@ -145,9 +145,9 @@ export const devicePointQuery = (code) => request({ url:'api/pda/slitter/devicePointQuery', data: {device_code: code} }) -export const bindSlitterSubVolumeInfo = (code, cn) => request({ +export const bindSlitterSubVolumeInfo = (code, pcode, cn) => request({ url:'api/pda/slitter/bindSlitterSubVolumeInfo', - data: {device_code: code, container_name: cn} + data: {device_code: code, point_code: pcode, container_name: cn} }) // 生箔工序 export const needEmptyVehicle = (code) => request({ @@ -162,20 +162,25 @@ export const needEmptyAxisv2 = (code, order, is) => request({ url:'api/pda/raw/needEmptyAxis/v2', data: {point_code: code, order_code: order, is_call_empty: is} }) -export const confirmBlanking = (code) => request({ +export const confirmBlanking = (code, option) => request({ url:'api/pda/raw/confirmBlanking', - data: {point_code: code} + data: {point_code: code, option: option} }) // 烘烤工序 export const getHotTempPointInfo = (code, order) => request({ url:'api/pda/baking/getHotTempPointInfo', data: {point_code: code, order_code: order} }) -export const doModifyRawInfos = (code, order, temperature, time) => request({ +export const doModifyRawInfos = (code, order, type, is, temperature, time) => request({ url:'api/pda/baking/doModifyRawInfos', - data: {point_code: code, order_code: order, temperature: temperature, time: time} + data: {point_code: code, order_code: order, roll_type: type, is_baking: is, temperature: temperature, time: time} }) export const bakingQuality = (code, quality) => request({ url:'api/pda/baking/bakingQuality', data: {point_code: code, quality: quality} }) +// 套轴申请 +export const requestTubeShaft = (row) => request({ + url:'api/pda/slitter/requestTubeShaft', + data: {row: row} +}) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index 75de5b1..33b7549 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -8,12 +8,21 @@ export const authority = () => { {path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]}, {path: 'RF02', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]}, {path: 'RF03', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]}, - {path: 'RF04', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}, {title: '重量维护', path: '/pages/manage/weight-bind'}]}, + {path: 'RF04', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}, {title: '重量维护', path: '/pages/manage/weight-bind'}, {title: '套轴申请', path: '/pages/manage/axis-application'}]}, {path: 'RF05', title: '装箱区', sonTree: [{title: '装箱暂存管理', path: '/pages/manage/pack-storage'}]}, - {path: 'RF06', title: '分切管理', sonTree: [{title: '分切上料', path: '/pages/manage/split-feed'}, {title: '分切下料', path: '/pages/manage/split-cut'}, {title: '子卷绑定', path: '/pages/manage/sub-vol-bind'}]}, + {path: 'RF06', title: '分切管理', sonTree: [{title: '分切上料', path: '/pages/manage/split-feed'}, {title: '分切下料', path: '/pages/manage/split-cut'}, {title: '子卷维护', path: '/pages/manage/sub-vol-bind'}]}, {path: 'RF07', title: '生产管理', sonTree: [{title: '生箔工序', path: '/pages/manage/raw-foil-progess'}, {title: '烘烤工序', path: '/pages/manage/bake-process'}]} ] } }} return res +} + +export const getSlitterDeviceBox = () => { + let res = [{"text":"A1_FQ_01","value":"A10FQ00001"},{"text":"A1_FQ_02","value":"A10FQ00002"},{"text":"A1_FQ_03","value":"A10FQ00003"},{"text":"A1_FQ_04","value":null},{"text":"A1_FQ_05","value":null},{"text":"A1_FQ_06","value":null},{"text":"A1_FQ_07","value":null},{"text":"A1_FQ_08","value":null},{"text":"A1_FQ_09","value":null},{"text":"A1_FQ_10","value":null},{"text":"A1_FQ_11","value":null},{"text":"A1_FQ_12","value":null}] + return res +} +export const gxgetGxSpecification = () => { + let res = [{"text":"纸制筒管|纸管|3英寸|680","value":"482210000000013"},{"text":"1500*182.4*152.4*15*0*2","value":"482210000000014"}] + return res } \ No newline at end of file