From a958d5c793dbbeae60141486ede7814ef2a986f3 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 11 Aug 2022 14:29:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=202022-08-11=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/knifemold/tool-info.js | 3 + src/api/purchaseorder/procurementReview.js | 4 + src/assets/scss/global.scss | 10 + src/views/modules/knifemold/receive.vue | 41 +-- src/views/modules/knifemold/tool-info.vue | 343 +++++++++++++++--- .../modules/knifemold/tool-oi-record.vue | 22 +- .../beginMaterialSlittedSet.vue | 22 +- .../searchSAPPurchaseOrder.vue | 21 +- 8 files changed, 359 insertions(+), 107 deletions(-) diff --git a/src/api/knifemold/tool-info.js b/src/api/knifemold/tool-info.js index bbbbb45..ed09dbd 100644 --- a/src/api/knifemold/tool-info.js +++ b/src/api/knifemold/tool-info.js @@ -20,6 +20,9 @@ export const editToolHeader = data => createAPI(`toolInfo/editToolHeader`,'POST' // 保存 工具主表信息 export const saveToolHeader = data => createAPI(`toolInfo/saveToolHeader`,'POST',data) +// deleteToolHeader +export const deleteToolHeader = data => createAPI(`toolInfo/deleteToolHeader`,'POST',data) + // 获取工具使用记录 export const updateToolDetail = data => createAPI(`toolInfo/updateToolDetail`,'POST',data) diff --git a/src/api/purchaseorder/procurementReview.js b/src/api/purchaseorder/procurementReview.js index 883d366..60faffe 100644 --- a/src/api/purchaseorder/procurementReview.js +++ b/src/api/purchaseorder/procurementReview.js @@ -21,3 +21,7 @@ export const getReviewStep = data => createAPI(`PRHeader/getReviewStep`,'POST',d //获取审批记录信息 export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST' ,data) + +// 获取对应用户的工具待审核数量 +export const getReviewToolCount = data => createAPI(`PRHeader/getReviewToolCount`,'POST',data) + diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 92f411c..71c25f5 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -388,3 +388,13 @@ a:hover{ padding: 5px 5px; } +.el-button--small, .el-button--small.is-round { + padding: 5px 10px; +} + +.el-dropdown-menu--medium .el-dropdown-menu__item { + line-height: 30px; + padding: 0 17px; + font-size: 12px; +} + diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue index 9a4e1fe..0d004fc 100644 --- a/src/views/modules/knifemold/receive.vue +++ b/src/views/modules/knifemold/receive.vue @@ -262,45 +262,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1053,7 +1014,7 @@ 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, ""); // 规格 + 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); diff --git a/src/views/modules/knifemold/tool-info.vue b/src/views/modules/knifemold/tool-info.vue index cdb81df..6ec1882 100644 --- a/src/views/modules/knifemold/tool-info.vue +++ b/src/views/modules/knifemold/tool-info.vue @@ -5,6 +5,7 @@ {{ buttons.add }} {{ buttons.edit }} + {{ '删除' }} @@ -69,7 +70,8 @@ - + @@ -247,6 +249,31 @@ + + + + + @@ -399,7 +426,9 @@ saveTableDefaultList, saveTableUser, getTableDefaultListLanguage, - getTableUserListLanguage + getTableUserListLanguage, + removerDefault, + removerUser } from "@/api/table.js" import { userFavoriteList, @@ -415,12 +444,16 @@ updateToolDetail, saveToolInfoDetail, editToolHeader, - saveToolHeader + saveToolHeader, + deleteToolHeader } from '@/api/knifemold/tool-info.js' import { printToolData } from "@/api/knifemold/receive.js" + import { + searchProcessRouteTool, + } from "@/api/base/productProcessRoute.js" export default { components: { @@ -696,7 +729,7 @@ columnSortable: true, sortLv: 0, status: true, - fixed: false, + fixed: '', }, { userId: this.$store.state.user.name, @@ -713,7 +746,7 @@ columnSortable: true, sortLv: 0, status: true, - fixed: false, + fixed: '', }, { userId: this.$store.state.user.name, @@ -730,7 +763,7 @@ columnSortable: true, sortLv: 0, status: true, - fixed: false, + fixed: '', } ], // 展示列集 @@ -765,7 +798,7 @@ columnSortable: true, sortLv: 0, status: true, - fixed: false, + fixed: '', }, { userId: this.$store.state.user.name, @@ -781,7 +814,7 @@ columnSortable: true, sortLv: 0, status: true, - fixed: false, + fixed: '', }, { userId: this.$store.state.user.name, @@ -797,7 +830,7 @@ columnSortable: true, sortLv: 0, status: true, - fixed: false, + fixed: '', }, // { // userId: this.$store.state.user.name, @@ -813,42 +846,194 @@ // columnSortable: true, // sortLv: 0, // status: true, - // fixed: false, + // fixed: '', // } ], - columnList2: [ + // 工具显示列表 + toolRouteDataList: [], + // 工具使用清单 + routeToolList: [ { userId: this.$store.state.user.name, - functionId: 2501, - tableId: "toolHeader2501", - tableName: "toolHeader", - columnProp: "toolId", + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TablePartNo', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "partNo", headerAlign: "center", - align: "center", - columnLabel: "工具编码", + align: "left", + columnLabel: "产品编码", columnHidden: false, columnImage: false, - columnSortable: true, + columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '', + columnWidth: 150 }, { userId: this.$store.state.user.name, - functionId: 2501, - tableId: "toolHeader2501", - tableName: "toolHeader", - columnProp: "toolDescription", + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TablePartDescription', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "partDescription", headerAlign: "center", - align: "center", - columnLabel: "工具名称", + align: "left", + columnLabel: "产品名称", columnHidden: false, columnImage: false, - columnSortable: true, + columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '', + columnWidth: 200 + }, + { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TableSpec', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "spec", + headerAlign: "center", + align: "left", + columnLabel: "规格型号", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TableRevNo', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "revNo", + headerAlign: "center", + align: "left", + columnLabel: "工艺路线版本", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TableItemNo', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "itemNo", + headerAlign: "center", + align: "left", + columnLabel: "工序号", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 60 + }, + { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TableActive', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "active", + headerAlign: "center", + align: "left", + columnLabel: "产品是否在用", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + + { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TableActive', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "toolqty", + headerAlign: "center", + align: "right", + columnLabel: "工具数量", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TableSite', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "remark", + headerAlign: "center", + align: "left", + columnLabel: "备注", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 160 + }, + { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TableSite', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "createdate", + headerAlign: "center", + align: "left", + columnLabel: "录入日期", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 }, + { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + serialNumber: this.$route.meta.menuId + 'TableSite', + tableId: "toolRouteInfo", + tableName: "查询工艺路线工具", + columnProp: "createby", + headerAlign: "center", + align: "left", + columnLabel: "录入人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + } ], // 数据集 dataList: [], @@ -991,6 +1176,45 @@ this.getLanguageList() }, methods: { + // 删除 工具主表信息 + deleteToolHeader() { + this.$confirm(`确定进行删除操作?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let dto = { + site: this.site, + toolId: this.headerData.toolId + } + // 删除工具主记录 + deleteToolHeader(dto).then(({data}) => { + if (data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + }) + + }, + // 选在 tab 时触发 + selectTabs() { + if (this.activeName == 'tool') { + this.getToolRouteList() + } + }, + // 获取工具对应的使用工序信息 + getToolRouteList() { + let query = { + site: this.site, + toolID: this.headerData.toolId, + user: this.$store.state.user.name + } + searchProcessRouteTool(query).then(({data}) => { + this.toolRouteDataList = data.rows + }) + }, printMethod(val) { if (!this.currentDetailData.toolInstanceId) { this.$alert('请选择工具信息！', '操作提示', { @@ -1062,8 +1286,8 @@ LODOP.ADD_PRINT_TEXT(55, 71, 133, 14, printData.createdBy); } //LODOP.PRINT_DESIGN(); - //LODOP.PREVIEW(); - LODOP.PRINT(); + LODOP.PREVIEW(); + // LODOP.PRINT(); } }, @@ -1104,7 +1328,7 @@ 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, ""); // 规格 + 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); @@ -1115,8 +1339,8 @@ } //LODOP.PRINT_DESIGN(); - //LODOP.PREVIEW(); - LODOP.PRINT(); + LODOP.PREVIEW(); + //LODOP.PRINT(); } }, getBaseData(val) { @@ -1491,25 +1715,50 @@ }) }, // 保存 默认配置 列 - saveColumnList() { - - saveTableDefaultList(this.columnList).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - // this.showDefault = false - } else { - this.$message.error(data.msg) + async saveColumnList() { + // 删除所有的该页面下保存的数据 + if (this.userColumnList) { + //删除 user自定义的数据 + await removerUser(this.queryTable) + } + // 删除默认配置 + await removerDefault(this.queryTable) + // 保存页面 table属性 + let sumColumnList = this.columnList.concat(this.columnList1); + sumColumnList = sumColumnList.map(item => { + return item = { + tableId: item.tableId, + tableName: item.tableName, + columnProp: item.columnProp, + columnLabel: item.columnLabel, + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: item.columnWidth, + format: item.format, + functionId: this.$route.meta.menuId, + sortLv: item.sortLv, + status: true, + fixed: item.fixed, + serialNumber: item.serialNumber, + columnType: item.columnType, + align: item.align } }) - saveTableDefaultList(this.columnList1).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - // this.showDefault = false - } else { - this.$message.error(data.msg) + + await saveTableDefaultList(sumColumnList) + // 保存页面 button label title 属性 + let buttons = this.buttonList.map(item => { + return item = { + functionId: this.$route.meta.menuId, + languageValue: item.languageValue, + objectId: item.objectId, + objectType: item.objectType, + tableId: item.tableId } }) - this.getFunctionButtonList(); + await saveButtonList(buttons) + this.getFunctionButtonList() this.getColumnList() }, // 获取 tableDefault 列 diff --git a/src/views/modules/knifemold/tool-oi-record.vue b/src/views/modules/knifemold/tool-oi-record.vue index bbb4775..596992f 100644 --- a/src/views/modules/knifemold/tool-oi-record.vue +++ b/src/views/modules/knifemold/tool-oi-record.vue @@ -43,7 +43,7 @@ - + @@ -51,6 +51,7 @@ + @@ -165,7 +166,7 @@ startDate: '', endDate: '', transNo: '', - transType: '' + transTypes: '' }, pageIndex: 1, pageSize: 100, @@ -315,6 +316,23 @@ fixed: '', columnWidth: 200, }, + { + userId: this.$store.state.user.name, + serialNumber: 'toolOIRecordTransPrice', + tableId: "toolOIRecord", + tableName: "toolOIRecord", + columnProp: "transPrice", + headerAlign: "center", + align: "right", + columnLabel: "金额", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { userId: this.$store.state.user.name, serialNumber: 'toolOIRecordTransQty', diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue index f44fe2d..2f8d84a 100644 --- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue +++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue @@ -41,6 +41,9 @@ + + + @@ -59,7 +62,6 @@ 客户编号： - 产品编码： @@ -236,11 +238,12 @@ checked: false, referenceSupplierID:'', referenceSupplierName:'', + suppRollNo: '' }, - sum1: '', - sum2: '', - sum3: '', - sum4: '', + sum1: 0, + sum2: 0, + sum3: 0, + sum4: 0, dataList: [], dataList3: [], dataList1: [], @@ -933,7 +936,12 @@ }, doSaveCRoll() { - saveCRollData(this.dataList1).then(({data}) => { + let dto = this.dataList1.map(item => { + item.suppRollNo = this.dataForm.suppRollNo + item.suppRollNoFlag = 'Y' + return item; + }) + saveCRollData(dto).then(({data}) => { if (data && data.code == 200) { this.dataList1 = []; this.sum1 = 0; @@ -946,7 +954,7 @@ searchCRollInfoDetail(inData).then(({data}) => { this.dataList3 = data.rows for (let i = 0; i < data.total; i++) { - this.sum4 += this.dataList3[i].rollQty; + this.sum4 += Number(this.dataList3[i].rollQty); } this.sum3 = data.total; }) diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue index 74d912a..4d84973 100644 --- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue +++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue @@ -129,6 +129,9 @@ + + + @@ -142,16 +145,6 @@ 插入 - - - - - - - - - - @@ -394,6 +387,7 @@ referenceSupplierID:'', referenceSupplierName:'', XX: '', + suppRollNo:'', }, sum1: '', sum2: '', @@ -1156,7 +1150,12 @@ }) }, doSaveCRoll() { - saveCRollData(this.dataList1).then(({data}) => { + let dto = this.dataList1.map(item => { + item.suppRollNo = this.dataForm.suppRollNo + item.suppRollNoFlag = 'Y' + return item; + }) + saveCRollData(dto).then(({data}) => { if (data && data.code == 200) { this.dataList1 = []; this.sum1 = 0;