diff --git a/src/config/getData2.js b/src/config/getData2.js index 276d249..0e0c47d 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -505,3 +505,11 @@ export const repaireDtlConfirm = (form, row, pname) => post('api/pda/sb/repaireD rows: row, product_person_name: pname }) + +/** 报修任务查询 */ +// 1.12部门下拉框 +export const deptList = () => post('api/pda/sb/deptList', {}) +// 1.13报修单查询 +export const repairRequest = (id) => post('api/pda/sb/repairRequest', { + dept_id: id +}) diff --git a/src/config/print.js b/src/config/print.js index 1932424..203bd50 100644 --- a/src/config/print.js +++ b/src/config/print.js @@ -23,12 +23,16 @@ export function toPrint (data) { LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '') LODOP.PRINT_INIT('') - LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', store.getters.printName) // 指定打印机 - LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') - LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) - LODOP.SET_PRINT_STYLE('FontSize', 12) - LODOP.SET_PRINT_STYLE('Bold', 1) + LODOP.SET_PRINTER_INDEX(store.getters.printName) // 指定打印机 + // LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') + // LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) + // LODOP.SET_PRINT_STYLE('FontSize', 12) + // LODOP.SET_PRINT_STYLE('Bold', 1) if (data.print_type === '05') { + LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') + LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontSize', 12) + LODOP.SET_PRINT_STYLE('Bold', 1) LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bag_id + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time) LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time) LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn) @@ -37,6 +41,10 @@ export function toPrint (data) { LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code) LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '还回人员：' + data.return_person) } else if (data.print_type === '04' && data.printWeight === undefined) { + LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') + LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontSize', 12) + LODOP.SET_PRINT_STYLE('Bold', 1) LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active) LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time) LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn) @@ -45,6 +53,10 @@ export function toPrint (data) { LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code) LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name) } else if (data.print_type === '04' && data.printWeight === true) { + LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') + LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontSize', 12) + LODOP.SET_PRINT_STYLE('Bold', 1) LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active) LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time) LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn) @@ -53,13 +65,21 @@ export function toPrint (data) { LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code) LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name) } else if (data.print_type === '04' && data.printWeight === false) { + LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') + LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontSize', 12) + LODOP.SET_PRINT_STYLE('Bold', 1) LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active) LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time) LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn) LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + data.bucketunique) LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code) LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name) - } else if (data.print_type === '02' || data.print_type === '03') { + } else if (data.print_type === '02') { + LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') + LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontSize', 12) + LODOP.SET_PRINT_STYLE('Bold', 1) LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active) LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time) LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn) @@ -68,7 +88,27 @@ export function toPrint (data) { LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code) LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name) LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order) + } else if (data.print_type === '03') { + LODOP.SET_PRINT_PAGESIZE(2, '100mm', '150mm', '') + LODOP.ADD_PRINT_RECT('2mm', '7mm', '140mm', '96mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontName', '黑体') + LODOP.SET_PRINT_STYLE('FontSize', 33) + LODOP.SET_PRINT_STYLE('Bold', 1) + LODOP.ADD_PRINT_TEXT('7mm', '9mm', '150mm', '40mm', '编码:' + data.material_code + '') + LODOP.ADD_PRINT_TEXT('22mm', '9mm', '145mm', '40mm', '牌号:' + data.old_mark + '') + LODOP.ADD_PRINT_TEXT('37mm', '9mm', '145mm', '40mm', '批次：' + pcsn) + LODOP.SET_PRINT_STYLE('FontSize', 20) + LODOP.SET_PRINT_STYLE('Bold', 1) + LODOP.ADD_PRINT_BARCODE('60mm', '10mm', '40mm', '40mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active) + LODOP.ADD_PRINT_TEXT('60mm', '45mm', '80mm', '27mm', '日期:' + data.input_time) + LODOP.ADD_PRINT_TEXT('72mm', '45mm', '80mm', '27mm', '桶号:' + data.bucketunique + '') + LODOP.ADD_PRINT_TEXT('84mm', '45mm', '80mm', '27mm', '重量:' + Number(data.storage_qty).toFixed(3) + 'kg') + LODOP.ADD_PRINT_TEXT('84mm', '108mm', '60mm', '27mm', '序号:' + data.record_order + '') } else if (data.print_type === '01') { + LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') + LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontSize', 12) + LODOP.SET_PRINT_STYLE('Bold', 1) LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active) LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time) LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn) diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue index 67373e6..125f4f5 100644 --- a/src/pages/login/Home.vue +++ b/src/pages/login/Home.vue @@ -21,7 +21,7 @@

修改密码

-

设备保养执行-维修工

+ - + + {{e.up_limit_value | numeric(4)}} {{e.down_limit_value | numeric(4)}} @@ -100,6 +101,12 @@ + + 检测值有为空，是否继续？ + @@ -107,13 +114,15 @@ import NavBar from '@components/NavBar.vue' import DropdownMenu from '@components/DropdownMenu.vue' import InputNumber from '@components/InputNumber.vue' +import Modal from '@components/Modal.vue' import {queryWorkProducedure, queryInspection, inspectConfirm, updateWorkStatus} from '@config/getData2.js' export default { name: 'ResultEntry', components: { NavBar, DropdownMenu, - InputNumber + InputNumber, + Modal }, data () { return { @@ -136,7 +145,8 @@ export default { disabled: JSON.stringify(this.$store.getters.materObj1) !== '{}', disabled1: false, device_id: '', - sure: false + sure: false, + mdShow: false } }, beforeRouteLeave (to, from, next) { @@ -179,19 +189,19 @@ export default { } }, methods: { - handleFocus (e) { - e.testing_value = '' - }, - handleBlur (e) { - if (e.testing_value === '') { - e.testing_value = e.testing_value2 - } - if (Number(e.testing_value) < Number(e.down_limit_value) || Number(e.testing_value) > Number(e.up_limit_value)) { - e.bred = true - } else { - e.testing_value2 = e.testing_value - } - }, + // handleFocus (e) { + // e.testing_value = '' + // }, + // handleBlur (e) { + // if (e.testing_value === '') { + // e.testing_value = e.testing_value2 + // } + // if (Number(e.testing_value) < Number(e.down_limit_value) || Number(e.testing_value) > Number(e.up_limit_value)) { + // e.bred = true + // } else { + // e.testing_value2 = e.testing_value + // } + // }, goIn () { if (this.$route.query.url === 'ProcessGrindBall') { this.$router.push('/ProcessGrindBall') @@ -287,6 +297,10 @@ export default { }, toSure () { this.disabled1 = true + if (!this.sure) { + this.disabled1 = false + return + } if (this.val1 === '') { this.toast('请选择物料') this.disabled1 = false @@ -317,9 +331,19 @@ export default { this.disabled1 = false return } - if (this.sure) { - this._inspectConfirm() + let arr = this.dataList.filter(el => el.testing_value === '') + if (arr.length > 0) { + this.mdShow = true + return } + this._inspectConfirm() + }, + closeModalCallback () { + this.disabled1 = false + this.mdShow = false + }, + comfirmCallback () { + this._inspectConfirm() }, calculate () { let flag = false diff --git a/src/pages/xinrui/liku/GroupDiskOperate.vue b/src/pages/xinrui/liku/GroupDiskOperate.vue index 1e96ac2..beef530 100644 --- a/src/pages/xinrui/liku/GroupDiskOperate.vue +++ b/src/pages/xinrui/liku/GroupDiskOperate.vue @@ -154,12 +154,12 @@ export default { this.val2 = '' return } - let arr2 = this.dataList.filter(el => { return el.material_code === res.bucket_jo.material_code && el.pcsn === res.bucket_jo.pcsn }) - if (!arr2.length) { - this.toast('物料编码和批次必须一致') - this.val2 = '' - return - } + // let arr2 = this.dataList.filter(el => { return el.material_code === res.bucket_jo.material_code && el.pcsn === res.bucket_jo.pcsn }) + // if (!arr2.length) { + // this.toast('物料编码和批次必须一致') + // this.val2 = '' + // return + // } this.bucket_jo = res.bucket_jo this.val2 = this.bucket_jo.bucketunique this.dataList.push(this.bucket_jo) diff --git a/src/pages/xinrui/production/GroupDiskOperateN.vue b/src/pages/xinrui/production/GroupDiskOperateN.vue index 07f46e9..0fbea9c 100644 --- a/src/pages/xinrui/production/GroupDiskOperateN.vue +++ b/src/pages/xinrui/production/GroupDiskOperateN.vue @@ -156,12 +156,12 @@ export default { this.val2 = '' return } - let arr2 = this.dataList.filter(el => { return el.material_code === res.bucket_jo.material_code && el.pcsn === res.bucket_jo.pcsn }) - if (!arr2.length) { - this.toast('物料编码和批次必须一致') - this.val2 = '' - return - } + // let arr2 = this.dataList.filter(el => { return el.material_code === res.bucket_jo.material_code && el.pcsn === res.bucket_jo.pcsn }) + // if (!arr2.length) { + // this.toast('物料编码和批次必须一致') + // this.val2 = '' + // return + // } this.bucket_jo = res.bucket_jo this.val2 = this.bucket_jo.bucketunique this.dataList.push(this.bucket_jo) diff --git a/src/router/index.js b/src/router/index.js index 2371c23..9f6c9c6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -111,6 +111,7 @@ const MaterInfoSearchCheckBox = r => require.ensure([], () => r(require('../page const UploadPict = r => require.ensure([], () => r(require('../pages/xinrui/common/UploadPict')), 'common') const Password = r => require.ensure([], () => r(require('../pages/xinrui/common/Password')), 'common') const UploadPicts = r => require.ensure([], () => r(require('../pages/xinrui/common/UploadPicts')), 'common') +const SearchRepairTask = r => require.ensure([], () => r(require('../pages/xinrui/common/SearchRepairTask')), 'common') Vue.use(Router) @@ -508,6 +509,10 @@ export default new Router({ { path: '/UploadPicts', // 上传多张图片 component: UploadPicts + }, + { + path: '/SearchRepairTask', // 报修任务查询 + component: SearchRepairTask } ], scrollBehavior (to, from, savedPosition) {