From 67d69833bafc7f6065e4e62537b3686739c37fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Wed, 11 Sep 2024 11:33:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?2024-09-11=20=E8=AE=BE=E5=A4=87-=E4=BF=9D?= =?UTF-8?q?=E5=85=BB=E5=B7=A5=E5=8D=95=E4=B8=8A=E6=96=B9=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/upkeepOrder/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index ab04060..69765f2 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -403,6 +403,7 @@ type="primary" plain icon="el-icon-edit" + :disabled="single" size="mini" @click="handleUpdate" v-hasPermi="['device:upkeepOrder:edit']" @@ -1581,6 +1582,7 @@ export default { loading: true, // 选中数组 ids: [], + selsectOrderCode: [], // 多个保养单号 orderCodes: [], // 非单个禁用 @@ -2173,6 +2175,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map((item) => item.orderId); + this.selsectOrderCode = selection.map((item) => item.orderCode); this.orderCodes = selection.map((item) => item.orderCode); console.log('this.ids',this.ids); console.log('this.orderCodes',this.orderCodes); @@ -2190,7 +2193,7 @@ export default { this.loading = true; this.reset(); this.recordList = []; - const orderCode = row.orderCode || this.ids; + const orderCode = row.orderCode || this.selsectOrderCode; getDeviceOrder(orderCode).then((response) => { this.form = response.data; if (response.data.timeArray[0] == null) { From e1b1e1d5c378856ea47dc7fd86caa684ed2d3500 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 11 Sep 2024 16:13:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/plan/workorder.js | 7 + src/layout/components/Navbar.vue | 4 +- src/views/mes/prepare/index.vue | 157 ++++++++++------------ src/views/plan/workorder/printID.vue | 17 +++ src/views/quality/produceReport/index.vue | 21 +-- src/views/quality/qcTableDL/index.vue | 14 +- src/views/technology/proroute/index.vue | 2 +- 7 files changed, 127 insertions(+), 95 deletions(-) diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js index d1fa835..24729a8 100644 --- a/src/api/plan/workorder.js +++ b/src/api/plan/workorder.js @@ -188,6 +188,13 @@ export function getIdCardList(data){ data:data }) } +export function getIdCardListRefresh(data){ + return request({ + url:'/plan/pro/workorder/getIdCardListRefresh', + method:'post', + data:data + }) +} export function getBatchCode(workorderId){ return request({ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index a438160..ef12da5 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,14 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); - /** + //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); - **/ + }, components: { Breadcrumb, diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 66fc58c..09ef7df 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -226,62 +226,56 @@
+ + + + +
+ +
+ + - - - -
- 生产订单备料单({{printData.printTitle}}) -
- - - - 工厂:{{printData.factory}} - 工作中心:{{printData.workCenter}} - 线体:{{printData.prodLineCode}} - -
- -
- - - - 生产日期:{{printData.productDate}} - 打印日期:{{printData.printDate}} - 页次: 1/ 1 -
+ + +
+ 生产订单备料单({{printData.printTitle}}) +
+ + + + 工厂:{{printData.factory}} + 工作中心:{{printData.workCenter}} + 线体:{{printData.prodLineCode}} + + + 生产日期:{{printData.productDate}} + 打印日期:{{printData.printDate}} + 条数: {{printData.pageNo}} + - - - - - - - - + border style="width: 100%;padding-bottom: 1px;"> + + + + + + - - + + -
-
- - - - + + 发料人: 收料人: 白色:车间联 @@ -290,8 +284,10 @@ SAP-No:{{printData.SAPNo}} - Z-PM-F-030-A.2 + Z-PM-F-030-A.2 +
+
@@ -313,8 +309,8 @@ export default { // components: {Detail}, data() { return { - fenyeNumber:4, - fenyeNumberTwo:6, + fenyeNumber:5, + fenyeNumberTwo:7, shengchan:true, newWorkerLoading: false, refreshNewWorkerTable:true, @@ -324,6 +320,7 @@ export default { // 打印 printData: { printable: 'printFrom', + pageNo:1, ignore: ['no-print'], workCenter: "暂无数据", SAPNo: null, @@ -430,17 +427,11 @@ export default { printJS({ printable: params.printable, // 'printFrom', // 标签元素id type: params.type || 'html', - dpi: 300, // 清晰度 + dpi: 360, // 清晰度 //font_size: "",// 设置字体大小 header: params.header, // '表单', targetStyles: ['*'], - style: ` - - body {margin: 3mm;padding: 0;} - .fy{page-break-after: always;} - table { border-collapse: collapse; } table, th, td { border: 2px solid black; } - .el-table .cell{padding-left:5px;padding-right:5px;} - `, + //没用//style:'body {margin: 2mm;padding: 0;}.fy{page-break-after: always;} table { width:100%;height:800px;border-collapse: collapse;} table, th, td { border: 2px solid black; white-space: pre-wrap; word-break: break-all;} .el-table .cell{padding-left:1px;padding-right:1px;border: 2px solid black;}', ignoreElements: params.ignore || [], // ['no-print'] properties: params.properties || null }) @@ -450,6 +441,7 @@ export default { this.shengchan = true; // 清楚缓存 this.printData.workCenter = "暂无数据"; + this.printData.pageNo =0 ; this.printData.printDate = null; this.printData.workTable = []; this.printData.factory = null; @@ -466,16 +458,17 @@ export default { this.printData.productDate = response.data.mesPrepareDetailList[0].productDate this.printData.printDate = moment(new Date()).format('YYYY-MM-DD') this.printData.workTable = response.data.mesPrepareDetailList; + this.printData.pageNo = response.data.mesPrepareDetailList.length; let chunkedArray = []; -// 遍历this.printData.workTable - for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) { - // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素） - let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); - // 将切割后的数组添加到chunkedArray中 - chunkedArray.push(chunk); - } - this.printData.workTable = chunkedArray; + //遍历this.printData.workTable + for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) { + // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素） + let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); + // 将切割后的数组添加到chunkedArray中 + chunkedArray.push(chunk); + } + this.printData.workTable = chunkedArray; this.printData.prodLineCode = response.data.mesPrepare.prodLineCode this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 this.newWorkerLoading = false // 设置加载状态为false，表示加载完成 @@ -509,14 +502,17 @@ export default { this.printData.productDate = moment(this.queryParams.productDate).format('YYYY-MM-DD') this.printData.printDate = moment(new Date()).format('YYYY-MM-DD') this.printData.workTable = response.data.mesPrepareDetailList + this.printData.pageNo = response.data.mesPrepareDetailList.length; let chunkedArray = []; -// 遍历this.printData.workTable + // 遍历this.printData.workTable for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) { - // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素） - let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); - // 将切割后的数组添加到chunkedArray中 - chunkedArray.push(chunk); + + + // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素） + let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); + // 将切割后的数组添加到chunkedArray中 + chunkedArray.push(chunk); } this.printData.workTable = chunkedArray; this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 @@ -672,12 +668,8 @@ export default { border: 1px solid black !important; } - - - - .my-print-head { - margin-top: 2px; + margin-top: 5px; font-weight: bold; text-align: center; } @@ -694,18 +686,17 @@ export default { } .my-print-foot { - margin-top: 20px; + margin-top: 10px; } -@media print { - body { - font-family: 'Arial', sans-serif; /* 设置字体为'Arial'或其他清晰的无衬线字体 */ - font-size: 14px; /* 设置字体大小 */ - - } - .my-print-table .el-table { - border-collapse: collapse; /* 合并表格边框 */ +.my-print-foot0 { + margin-top: -1px; + padding-top:2px; + border-top: 1px solid black; + width: 94%; } - + +@media print { + } .fy{ page-break-after: always; diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue index eee1517..bf1fb1a 100644 --- a/src/views/plan/workorder/printID.vue +++ b/src/views/plan/workorder/printID.vue @@ -3,6 +3,7 @@
+ @@ -31,6 +32,7 @@ + 重置
@@ -85,6 +87,7 @@ import { getIdCardList, getBatchCode, + getIdCardListRefresh } from '@/api/plan/workorder'; import QRCode from 'qrcode'; @@ -198,6 +201,20 @@ export default { }) }, + async refreshCards(){ + let response = await getIdCardListRefresh({workorderCode:this.workorderCode}); + this.printData.idCardList = response; + this.$nextTick(() => { + this.printData.idCardList.forEach((item, index) => { + const canvas = document.getElementById('qrcode-' + index); + QRCode.toCanvas(canvas, item.palletCode, { width: 300 , margin:1 }, function (error) { + if (error) console.error(error); + console.log('success!'); + }); + }); + }) + }, + // 打印预览-增打 async showAddPrint() { console.log('执行了新增打印预览'); diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index d3fbd88..011427c 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -664,12 +664,17 @@ + + + @@ -680,7 +685,7 @@ @@ -912,7 +917,7 @@ export default { delFlag: null, jgy: null, pgy: null, - + cxzz: null }; this.spanArr = []; this.position = 0; diff --git a/src/views/quality/qcTableDL/index.vue b/src/views/quality/qcTableDL/index.vue index 3ca3399..2b223fd 100644 --- a/src/views/quality/qcTableDL/index.vue +++ b/src/views/quality/qcTableDL/index.vue @@ -223,7 +223,9 @@ :visible.sync="open" width="1300px" append-to-body - > + > + + 导出CPK
{ this.getList() this.$modal.msgSuccess('同步成功') From e676a5e46c49de62f50b5dbbdf99d37f7c96dddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Thu, 12 Sep 2024 11:26:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?2024-09-12=20=E8=AE=BE=E5=A4=87-=E7=94=B3?= =?UTF-8?q?=E9=A2=86=E8=AE=B0=E5=BD=95-=E9=9A=90=E8=97=8F=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/sparePartsApplicationRecord/index.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/device/sparePartsApplicationRecord/index.vue b/src/views/device/sparePartsApplicationRecord/index.vue index d077b2b..322fbed 100644 --- a/src/views/device/sparePartsApplicationRecord/index.vue +++ b/src/views/device/sparePartsApplicationRecord/index.vue @@ -390,6 +390,7 @@ > + @@ -528,9 +530,6 @@ export default { applyTime: [ { required: true, message: "领用时间不能为空", trigger: "blur" }, ], - applyPeople: [ - { required: true, message: "申领人不能为空", trigger: "blur" }, - ], }, }; }, From 673ac5fca6cea082208a75dccc6ef835ab529cd2 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 12 Sep 2024 11:29:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=92=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96=E3=80=81=E7=99=BD?= =?UTF-8?q?=E5=9D=AF=E5=8D=95=E4=BD=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/dailyReportNew/index.vue | 11 ++++++++--- src/views/quality/produceReport/index.vue | 10 +++++++++- src/views/quality/productReport/index.vue | 2 +- .../quality/qcInventory/selectPutInOrder.vue | 19 ++++++++++++++----- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue index 54fdbc5..dce5ee5 100644 --- a/src/views/mes/dailyReportNew/index.vue +++ b/src/views/mes/dailyReportNew/index.vue @@ -85,13 +85,13 @@ > - + - + - + @@ -251,6 +251,11 @@ export default { return cellValue.slice(7,18); //返回值 } }, + teamLeaderFormate(row, column, cellValue){ + if(cellValue != null){ + return cellValue.split("-")[0]; //返回值 + } + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 011427c..2ce8a72 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -656,7 +656,13 @@ - + + √合格 + ×不合格 + + + 备注:判定合格打“√”，不合格打“×” + @@ -739,6 +745,7 @@ export default { validateRules: [], checkList: [], standardNo: null, + checkResult: 'Y', printData: { printable: 'printForm', ignore: ['no-print'], @@ -960,6 +967,7 @@ export default { this.form.ignore = ['no-print'];//打印时需要 this.firstReportOpen = true; this.title = "首检检验报告"; + this.checkResult = response.data.checkResult; }) this.queryParams.recordId = recordId; this.getCheckedProjectList(); diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue index d0976b4..4e44993 100644 --- a/src/views/quality/productReport/index.vue +++ b/src/views/quality/productReport/index.vue @@ -544,7 +544,7 @@ export default { this.checkProjectList0 = itemType0s; this.total = response.total; this.loading = false; - this.form.standardNo = this.checkProjectList[0].standardNo; + //this.form.standardNo = this.checkProjectList[0].standardNo; this.rowspan() }); diff --git a/src/views/quality/qcInventory/selectPutInOrder.vue b/src/views/quality/qcInventory/selectPutInOrder.vue index 8f50c9b..e237ca7 100644 --- a/src/views/quality/qcInventory/selectPutInOrder.vue +++ b/src/views/quality/qcInventory/selectPutInOrder.vue @@ -9,10 +9,19 @@ - + + + + - - + + From ed7f9eab1e6b435211d65f5d35897f06e6b5e3e1 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 12 Sep 2024 23:55:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?cpk=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/cpkUpdown.js | 44 ++ src/api/quality/qcTable.js | 2 +- src/views/mes/mesLine/index.vue | 6 +- src/views/quality/cpkUpDowConfig/index.vue | 442 ++++++++++++++++++ .../quality/cpkUpDowConfig/selectMaterial.vue | 153 ++++++ 5 files changed, 642 insertions(+), 5 deletions(-) create mode 100644 src/api/quality/cpkUpdown.js create mode 100644 src/views/quality/cpkUpDowConfig/index.vue create mode 100644 src/views/quality/cpkUpDowConfig/selectMaterial.vue diff --git a/src/api/quality/cpkUpdown.js b/src/api/quality/cpkUpdown.js new file mode 100644 index 0000000..9b9831f --- /dev/null +++ b/src/api/quality/cpkUpdown.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询检验节点维护列表 +export function listCpkUpdown(query) { + return request({ + url: '/quality/cpkUpdown/list', + method: 'get', + params: query + }); +} + +// 查询检验节点维护详细 +export function getCpkUpdown(id) { + return request({ + url: '/quality/cpkUpdown/' + id, + method: 'get' + }); +} + +// 新增检验节点维护 +export function addCpkUpdown(data) { + return request({ + url: '/quality/cpkUpdown', + method: 'post', + data: data + }); +} + +// 修改检验节点维护 +export function updateCpkUpdown(data) { + return request({ + url: '/quality/cpkUpdown', + method: 'put', + data: data + }); +} + +// 删除检验节点维护 +export function delCpkUpdown(id) { + return request({ + url: '/quality/cpkUpdown/' + id, + method: 'delete' + }); +} diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js index 625d967..ccdbd82 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -167,4 +167,4 @@ export function getIncomeChartList(query) { method: 'post', data: query }); -} \ No newline at end of file +} diff --git a/src/views/mes/mesLine/index.vue b/src/views/mes/mesLine/index.vue index ea9d752..d33b23c 100644 --- a/src/views/mes/mesLine/index.vue +++ b/src/views/mes/mesLine/index.vue @@ -27,8 +27,7 @@ @@ -36,8 +35,7 @@ diff --git a/src/views/quality/cpkUpDowConfig/index.vue b/src/views/quality/cpkUpDowConfig/index.vue new file mode 100644 index 0000000..db10abf --- /dev/null +++ b/src/views/quality/cpkUpDowConfig/index.vue @@ -0,0 +1,442 @@ + + + diff --git a/src/views/quality/cpkUpDowConfig/selectMaterial.vue b/src/views/quality/cpkUpDowConfig/selectMaterial.vue new file mode 100644 index 0000000..4dfee3a --- /dev/null +++ b/src/views/quality/cpkUpDowConfig/selectMaterial.vue @@ -0,0 +1,153 @@ + +