diff --git a/src/api/auditManagement/auditType.js b/src/api/auditManagement/auditType.js index 58cb8ba..7d8d495 100644 --- a/src/api/auditManagement/auditType.js +++ b/src/api/auditManagement/auditType.js @@ -14,3 +14,6 @@ export const getUserBusinessRoleList = data => createAPI(`audit/getUserBusinessR // 保存用户审核权限信息 export const saveUserBusinessRole = data => createAPI(`audit/saveUserBusinessRole`,'POST',data) + +//获取工具类型 +export const getPartFamilyList = data => createAPI(`base/getPartFamilyList`,'POST' ,data) diff --git a/src/api/knifemold/receive.js b/src/api/knifemold/receive.js index 2eb7a0f..6f0e06e 100644 --- a/src/api/knifemold/receive.js +++ b/src/api/knifemold/receive.js @@ -21,5 +21,8 @@ export const exportList = data => createAPI(`toolMan/getExportList`,'POST',dat //获取审批记录信息 export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST' ,data) +// 获取工具打印 +export const printTool = data => createAPI(`toolMan/printTool`,'POST',data) + diff --git a/src/api/knifemold/tool-info.js b/src/api/knifemold/tool-info.js index afb6d84..c86aad2 100644 --- a/src/api/knifemold/tool-info.js +++ b/src/api/knifemold/tool-info.js @@ -18,5 +18,8 @@ export const getToolHeaderList = data => createAPI(`toolInfo/getToolHeaderList`, // 获取工具使用记录 export const updateToolDetail = data => createAPI(`toolInfo/updateToolDetail`,'POST',data) +// 获取工具打印 +export const printTool = data => createAPI(`toolMan/printTool`,'POST',data) + diff --git a/src/views/modules/auditManagement/auditRules.vue b/src/views/modules/auditManagement/auditRules.vue index 2fa84e1..1c18293 100644 --- a/src/views/modules/auditManagement/auditRules.vue +++ b/src/views/modules/auditManagement/auditRules.vue @@ -831,6 +831,7 @@ import { let queryData = { active : 'Y' } + this.selectList.select6 = [] getBusinessRoleList(queryData).then(({data}) =>{ let list = data.rows for (let i = 0; i < list.length; i++) { diff --git a/src/views/modules/auditManagement/auditType.vue b/src/views/modules/auditManagement/auditType.vue index 79fa30c..138667c 100644 --- a/src/views/modules/auditManagement/auditType.vue +++ b/src/views/modules/auditManagement/auditType.vue @@ -113,6 +113,16 @@ + + + + + + @@ -153,6 +163,7 @@ import { getBusinessRoleList, saveBusinessRole, deleteBusinessRole, + getPartFamilyList, } from '@/api/auditManagement/auditType.js' export default { components: { @@ -167,11 +178,13 @@ import { inputSearch5 : '备注', inputSearch6 : '状态', inputSearch7 : '记录类型', + inputSearch8 : '工具类型', saveAuditTypeData:{ roleItemNo : 0, roleDesc : '', remark : '', active : '', + familyId : '', }, //设置 setUp :{ @@ -205,6 +218,7 @@ import { value: 'N', label: '禁用' },], + partFamilyList : [], // 默认table 查询参数 queryTable: { functionId: 2201, @@ -263,6 +277,23 @@ import { status: true, fixed: false, }, + { + userId: this.$store.state.user.name, + functionId: 2201, + serialNumber: 'auditType2201FamilyName', + tableId: "auditType2201", + tableName: "auditType", + columnProp: "familyName", + headerAlign: "center", + align: "center", + columnLabel: "工具类型", + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: false, + }, { userId: this.$store.state.user.name, functionId: 2201, @@ -500,8 +531,21 @@ import { activated() { this.getDataList() this.getLanguageList() + this.getPartFamily() }, methods: { + getPartFamily(){ + let jsonData = { + site : this.site, + active : 'Y', + } + this.partFamilyList = [] + getPartFamilyList(jsonData).then(({data}) => { + if (data.success) { + this.partFamilyList = data.rows + } + }) + }, delAuditType(row){ this.$confirm("确定删除该记录吗？", '删除提示', { confirmButtonText: '确定', @@ -520,6 +564,13 @@ import { }, saveAuditType(){ this.setUp.saveButton = true + if(this.saveAuditTypeData.familyId == ''){ + this.$alert('请选择记录类型！', '错误', { + confirmButtonText: '确定' + }) + this.setUp.saveButton = false + return false + } saveBusinessRole(this.saveAuditTypeData).then(({data}) => { if (data.code == 0) { this.getDataList() @@ -544,11 +595,13 @@ import { this.saveAuditTypeData.remark = '' this.saveAuditTypeData.active = 'Y' this.saveAuditTypeData.recordTypeDb = '87' + this.saveAuditTypeData.familyId = '' }else { this.saveAuditTypeData.roleItemNo = row.roleItemNo this.saveAuditTypeData.roleDesc = row.roleDesc this.saveAuditTypeData.remark = row.remark this.saveAuditTypeData.recordTypeDb = row.recordTypeDb + this.saveAuditTypeData.familyId = row.familyId if(row.active == "启用"){ this.saveAuditTypeData.active = 'Y' }else { diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue index 0ef4419..3d29843 100644 --- a/src/views/modules/knifemold/receive.vue +++ b/src/views/modules/knifemold/receive.vue @@ -111,7 +111,7 @@ - + @@ -131,7 +131,8 @@ --> {{buttons.generate}} - {{buttons.print}} + {{buttons.toolLabel}} + {{buttons.screenLabel}} { + this.bannersBut = false + } + }); + return + } + let reportFamily = '' + if (val == 'Y'){ + reportFamily = '工具标签' + }else { + reportFamily = '网版标签' + } + let toolInstanceId = '' + for (let i = 0; i < this.currSelectList.length; i++) { + toolInstanceId += this.currSelectList[i].toolInstanceId + ";" + } + toolInstanceId = toolInstanceId.substring(0 ,toolInstanceId.length -1) + let jsonData = { + reportFamily : reportFamily, + toolInstanceId : toolInstanceId, + } + printTool(jsonData).then(({data}) =>{ + if (data.code != 0){ + this.$alert(data.msg, '操作提示', { + confirmButtonText: '确定', + callback: action => { + this.bannersBut = false + } + }); + } + }) + }, // 文件下载 fileDownload(row) { axios.get('/api/ftp/file/downFtpFile/' + row.id, { diff --git a/src/views/modules/knifemold/tool-info.vue b/src/views/modules/knifemold/tool-info.vue index d994ccf..17762a0 100644 --- a/src/views/modules/knifemold/tool-info.vue +++ b/src/views/modules/knifemold/tool-info.vue @@ -62,6 +62,7 @@ {{ buttons.edit }} + {{ buttons.print }} @@ -343,6 +344,7 @@ getSfdcToolingHistList, getToolHeaderList, updateToolDetail, + printTool, } from '@/api/knifemold/tool-info.js' export default { @@ -705,7 +707,8 @@ search: '查询', download: '导出', settingTable: '设置列表', - defaultTable: '设置默认配置' + defaultTable: '设置默认配置', + print : '打印', }, // 导出 start exportData: [], @@ -811,6 +814,31 @@ this.getLanguageList() }, methods: { + printMethod(){ + if (this.currentDetailData.toolInstanceId == ''){ + this.$alert('请选择工具信息！', '操作提示', { + confirmButtonText: '确定', + callback: action => { + } + }); + return + } + let reportFamily = '工具标签' + let toolInstanceId = this.currentDetailData.toolInstanceId + let jsonData = { + reportFamily : reportFamily, + toolInstanceId : toolInstanceId, + } + printTool(jsonData).then(({data}) =>{ + if (data.code != 0){ + this.$alert(data.msg, '操作提示', { + confirmButtonText: '确定', + callback: action => { + } + }); + } + }) + }, rowDblclick(row, column, event){ console.log(row) console.log(column) @@ -1042,7 +1070,7 @@ getFunctionButtonList() { searchFunctionButtonList(this.queryButton).then(({data}) => { if (JSON.stringify(data.data)!=='{}') { - this.buttons = data.data + //this.buttons = data.data } else { saveButtonList(this.buttonList).then(({data}) => { }) diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue index fddca3c..852c054 100644 --- a/src/views/modules/purchaseorder/procurementReview.vue +++ b/src/views/modules/purchaseorder/procurementReview.vue @@ -207,7 +207,7 @@ - +pdfUrl diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue index 07971f0..4e39ba1 100644 --- a/src/views/modules/purchaseorder/purchaseRequisition.vue +++ b/src/views/modules/purchaseorder/purchaseRequisition.vue @@ -221,8 +221,14 @@ :disabled="true"> - + + + + @@ -383,6 +389,7 @@ export default { components: {upload}, data() { return { + pdfUrl : '', insertFileList: [], fileList: [], // table 高度 @@ -436,6 +443,9 @@ export default { limit: '', page: '', }, + selectList: { + select1: [], + }, userId: this.$store.state.user.name, site: this.$store.state.user.site, //审核详情 @@ -1070,9 +1080,22 @@ export default { this.getLanguageList() this.initTblBaseDataList() this.initSupplier() + this.getPartFamily() }, methods: { + getPartFamily(){ + let jsonData = { + site : this.site, + active : 'Y', + } + this.selectList.select1 = [] + getPartFamilyList(jsonData).then(({data}) => { + if (data.success) { + this.selectList.select1 = data.rows + } + }) + }, //获取申请单号文件信息 getFileList(row) { let jsonData = {