diff --git a/src/api/knifemold/tool-info.js b/src/api/knifemold/tool-info.js index e7227d4..1ae86ad 100644 --- a/src/api/knifemold/tool-info.js +++ b/src/api/knifemold/tool-info.js @@ -35,25 +35,20 @@ export const printTool = data => createAPI(`toolMan/printTool`, 'POST', data) // 获取工具信息 export const getToolInfoList = data => createAPI(`toolInfo/getToolInfoList`, 'POST', data) - // 获取出入库信息 export const getToolTransInfoList = data => createAPI(`toolInfo/getToolTransInfoList`, 'POST', data) - // 工具接收信息 export const getPoReceiptList = data => createAPI(`toolInfo/getPoReceiptList`, 'POST', data) - // 接收对账 export const updatePoReceiptList = data => createAPI(`toolInfo/updatePoReceiptList`, 'POST', data) - // 取消对账 export const updatePoReceiptListR = data => createAPI(`toolInfo/updatePoReceiptListR`, 'POST', data) - export const updateToolDetailInfo = data => createAPI(`toolInfo/updateToolDetailInfo`, 'POST', data) - // 修改工具接收编码 export const updateReceiveToolDetail = data => createAPI(`PRHeader/updateReceiveToolDetail`, 'POST', data) - export const queryToolOperatorRecord = data => createAPI(`toolInfo/queryToolOperatorRecord`, 'POST', data) +export const saveToolUseQtyAssess = data => createAPI(`toolInfo/saveToolUseQtyAssess`, 'POST', data) +export const getToolUseQtyAssessList = data => createAPI(`toolInfo/getToolUseQtyAssessList`, 'POST', data) diff --git a/src/views/modules/knifemold/tool-info-list.vue b/src/views/modules/knifemold/tool-info-list.vue index 43574bd..b64ef27 100644 --- a/src/views/modules/knifemold/tool-info-list.vue +++ b/src/views/modules/knifemold/tool-info-list.vue @@ -1,25 +1,5 @@ @@ -103,11 +146,19 @@ import getLodop from '@/utils/LodopFuncs.js' import column from '../common/column' import Chooselist from '@/views/modules/common/Chooselist' -import {getToolInfoList} from '@/api/knifemold/tool-info.js' +import {getToolInfoList,saveToolUseQtyAssess} from '@/api/knifemold/tool-info.js' import {printToolData} from '@/api/knifemold/receive.js' var functionId = '106001005' export default { components: {column, Chooselist}, + watch: { + assessData: { + deep: true, + handler: function (newV, oldV) { + this.assessData.newEstUseQty = Number(this.assessData.estUseQty) + Number(this.assessData.addUseQty) + } + } + }, data () { return { buttons: { @@ -175,7 +226,7 @@ export default { tableName: 'common', columnProp: 'toolId', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '工具编码', columnHidden: false, columnImage: false, @@ -192,7 +243,7 @@ export default { tableName: 'common', columnProp: 'toolInstanceId', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '工具实例编码', columnHidden: false, columnImage: false, @@ -209,7 +260,7 @@ export default { tableName: 'common', columnProp: 'toolDescription', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '工具名称', columnHidden: false, columnImage: false, @@ -226,7 +277,7 @@ export default { tableName: 'common', columnProp: 'createDate', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '接收日期', columnHidden: false, columnImage: false, @@ -243,7 +294,7 @@ export default { tableName: 'common', columnProp: 'status', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '状态', columnHidden: false, columnImage: false, @@ -258,9 +309,9 @@ export default { serialNumber: 'toolOIRecordCurrLocationId', tableId: 'toolOIRecord', tableName: 'common', - columnProp: 'currLocationId', + columnProp: 'locationId', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '库位编码', columnHidden: false, columnImage: false, @@ -277,7 +328,7 @@ export default { tableName: 'common', columnProp: 'locationName', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '库位名称', columnHidden: false, columnImage: false, @@ -292,7 +343,7 @@ export default { serialNumber: 'toolOIRecordActualuseQty', tableId: 'toolOIRecord', tableName: 'common', - columnProp: 'actualuseQty', + columnProp: 'actualUseQty', headerAlign: 'center', align: 'right', columnLabel: '已使用寿命', @@ -309,7 +360,7 @@ export default { serialNumber: 'toolOIRecordEstuseQty', tableId: 'toolOIRecord', tableName: 'common', - columnProp: 'estuseQty', + columnProp: 'estUseQty', headerAlign: 'center', align: 'right', columnLabel: '预计使用寿命', @@ -347,7 +398,20 @@ export default { exportName: this.$route.meta.title, exportHeader: [this.$route.meta.title], exportFooter: [], - exportDefaultValue: '' + exportDefaultValue: '', + assessData: { + toolId: '', + toolDescription: '', + toolInstanceId: '', + estUseQty: 0, + ActualUseQty: 0, + newEstUseQty: '', + addUseQty: '', + prop: '', + status: '', + createBy: this.$store.state.user.name + }, + useQtyAssessFlag: false } }, activated () { @@ -358,6 +422,41 @@ export default { }) }, methods: { + /** + * 新增寿命评估记录 + */ + saveToolUseQtyAssess () { + this.assessData.status = '待审核' + saveToolUseQtyAssess(this.assessData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.useQtyAssessFlag = false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + /** + * 寿命评估 + */ + useQtyAssessModal (row) { + this.assessData.toolId = row.toolId + this.assessData.toolDescription = row.toolDescription + this.assessData.toolInstanceId = row.toolInstanceId + this.assessData.estUseQty = row.estUseQty + this.assessData.ActualUseQty = row.ActualUseQty + this.assessData.prop = row.prop + this.useQtyAssessFlag = true + }, printMethod (row, printType) { let dto = { site: this.$store.state.user.site, diff --git a/src/views/modules/knifemold/tool-info.vue b/src/views/modules/knifemold/tool-info.vue index 29388e0..9e9417e 100644 --- a/src/views/modules/knifemold/tool-info.vue +++ b/src/views/modules/knifemold/tool-info.vue @@ -71,7 +71,7 @@ - +
数据明细/编辑 @@ -80,6 +80,7 @@ 复制 编辑 工具标签 + 发起 @@ -191,54 +192,42 @@
- -
+ +
工具使用记录 + + + 操作类型: + + + + + + + + + + + + + - - - - -
- -
- 工具维修记录 - + style="width: 100%;" + :key="myTable"> + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -279,60 +333,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -945,7 +999,6 @@ export default { fixed: '', columnWidth: 100 }, - { userId: this.$store.state.user.name, functionId: 106001003, @@ -1920,81 +1973,6 @@ export default { console.log(array) printToolLabelPreview(array); }, - // labelPrintWB(printDataList) { - // const LODOP = getLodop() - // if (LODOP) { - // // 循环调用打印机 - // for (let i = 0; i < printDataList.length; i++) { - // let printData = printDataList[i] - // LODOP.NewPage() - // LODOP.SET_PRINT_PAGESIZE(0, 700, 180, '') - // LODOP.SET_PRINT_MODE('PRINT_NOCOLLATE', 1) - // LODOP.ADD_PRINT_RECT(2, 5, 250, 67, 0, 1) - // LODOP.ADD_PRINT_LINE(19, 5, 18, 255, 0, 1) - // LODOP.ADD_PRINT_LINE(36, 5, 35, 205, 0, 1) - // LODOP.ADD_PRINT_LINE(54, 5, 53, 205, 0, 1) - // LODOP.ADD_PRINT_LINE(2, 65, 69, 66, 0, 1) - // LODOP.ADD_PRINT_LINE(68, 205, 18, 206, 0, 1) - // LODOP.ADD_PRINT_BARCODE(21, 208, 90, 60, 'QRCode', printData.toolInstanceId) - // LODOP.ADD_PRINT_TEXT(5, 9, 60, 14, '工具名称') - // LODOP.ADD_PRINT_TEXT(21, 9, 60, 15, '工具编号') - // LODOP.ADD_PRINT_TEXT(38, 9, 60, 15, '实例编号') - // LODOP.ADD_PRINT_TEXT(55, 9, 60, 15, '经办人') - // LODOP.ADD_PRINT_TEXT(4, 70, 180, 14, printData.toolDescription) - // LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2) - // LODOP.ADD_PRINT_TEXT(21, 71, 133, 14, printData.toolId) - // LODOP.ADD_PRINT_TEXT(39, 71, 133, 14, printData.toolInstanceId) - // LODOP.ADD_PRINT_TEXT(55, 71, 133, 14, printData.createdBy) - // } - // LODOP.PREVIEW() - // } - // }, - // labelPrintGJ(printDataList) { - // const LODOP = getLodop() - // if (LODOP) { - // // 循环调用打印机 - // for (let i = 0; i < printDataList.length; i++) { - // let printData = printDataList[i] - // LODOP.NewPage() - // LODOP.SET_PRINT_PAGESIZE(0, 700, 540, '') - // LODOP.ADD_PRINT_RECT(6, 5, 250, 190, 0, 1) - // LODOP.ADD_PRINT_LINE(24, 5, 23, 255, 0, 1) - // LODOP.ADD_PRINT_LINE(41, 5, 40, 255, 0, 1) - // LODOP.ADD_PRINT_LINE(58, 5, 57, 255, 0, 1) - // LODOP.ADD_PRINT_LINE(75, 5, 74, 255, 0, 1) - // LODOP.ADD_PRINT_LINE(92, 5, 91, 255, 0, 1) - // LODOP.ADD_PRINT_LINE(109, 5, 108, 255, 0, 1) - // LODOP.ADD_PRINT_LINE(126, 5, 125, 178, 0, 1) - // LODOP.ADD_PRINT_LINE(144, 5, 143, 178, 0, 1) - // LODOP.ADD_PRINT_LINE(162, 5, 161, 178, 0, 1) - // LODOP.ADD_PRINT_LINE(179, 5, 178, 255, 0, 1) - // LODOP.ADD_PRINT_LINE(23, 65, 195, 66, 0, 1) - // LODOP.ADD_PRINT_LINE(178, 177, 108, 178, 0, 1) - // LODOP.ADD_PRINT_BARCODE(110, 183, 110, 85, 'QRCode', printData.toolInstanceId) - // LODOP.ADD_PRINT_TEXT(9, 94, 100, 14, '工具标签') - // LODOP.SET_PRINT_STYLEA(0, 'Bold', 1) - // LODOP.ADD_PRINT_TEXT(26, 9, 60, 14, '工具名称') - // LODOP.ADD_PRINT_TEXT(43, 9, 60, 15, '规格型号') - // LODOP.ADD_PRINT_TEXT(60, 9, 60, 15, '工具编号') - // LODOP.ADD_PRINT_TEXT(77, 9, 60, 15, '实例编号') - // LODOP.ADD_PRINT_TEXT(94, 9, 60, 15, '厂商') - // LODOP.ADD_PRINT_TEXT(111, 9, 60, 15, '入库日期') - // LODOP.ADD_PRINT_TEXT(129, 9, 60, 15, '库位') - // LODOP.ADD_PRINT_TEXT(147, 9, 60, 15, '经办人') - // LODOP.ADD_PRINT_TEXT(181, 9, 60, 15, '检验签章') - // LODOP.ADD_PRINT_TEXT(25, 72, 180, 14, printData.toolDescription) - // LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2) - // LODOP.ADD_PRINT_TEXT(42, 72, 180, 14, printData.spec) // 规格 - // LODOP.ADD_PRINT_TEXT(60, 72, 180, 14, printData.toolId) - // LODOP.ADD_PRINT_TEXT(78, 71, 180, 14, printData.toolInstanceId) - // LODOP.ADD_PRINT_TEXT(94, 71, 180, 14, printData.SupplierName) - // LODOP.ADD_PRINT_TEXT(111, 71, 95, 14, this.dayjs(printData.createDate).format('YYYY-MM-DD')) - // LODOP.ADD_PRINT_TEXT(130, 71, 95, 14, printData.locationId) - // LODOP.ADD_PRINT_TEXT(148, 71, 95, 14, printData.createdBy) - // } - // LODOP.PREVIEW() - // } - // }, getBaseData(val) { if (this.tagNo === 70) { this.headerData.toolId = val.ToolID @@ -2030,7 +2008,6 @@ export default { if (val === 7) { strVal = this.editHeaderData.umid } - console.log(this.editHeaderData.familyId) this.$refs.baseList.init(val, strVal) }) }, @@ -2189,8 +2166,9 @@ export default { let list = data.rows if (list.length > 0) { this.currentDetailData = list[0] - this.getToolInstanceIdUseHist() - this.getSfdcToolingHistList() + this.toolOperatorChange(); + // this.getToolInstanceIdUseHist() + // this.getSfdcToolingHistList() } }) }, @@ -2237,6 +2215,12 @@ export default { this.getDetailList() } }) + }, + /** + * 发起新增使用寿命 + */ + addUseQty () { + }, fields() { let json = '{' diff --git a/src/views/modules/knifemold/toolUseQtyAssess.vue b/src/views/modules/knifemold/toolUseQtyAssess.vue new file mode 100644 index 0000000..15bd54d --- /dev/null +++ b/src/views/modules/knifemold/toolUseQtyAssess.vue @@ -0,0 +1,449 @@ + + + +