From f441ae9a813bb013911495ac532b07af17d8f95e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 3 Jan 2024 16:23:34 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/checkTypeProject.js | 10 +- src/api/quality/qcTable.js | 18 +- src/views/mes/reportWork/index.vue | 4 +- .../checkTypeProject/selectProject.vue | 41 +- src/views/quality/qcTableXJ/index.vue | 559 ++++++------------ 5 files changed, 234 insertions(+), 398 deletions(-) diff --git a/src/api/quality/checkTypeProject.js b/src/api/quality/checkTypeProject.js index 429d0d3..a5971d7 100644 --- a/src/api/quality/checkTypeProject.js +++ b/src/api/quality/checkTypeProject.js @@ -72,4 +72,12 @@ export function getProjectInfoList(query) { method: 'get', params: query }); -} \ No newline at end of file +} +//方案下拉 +export function getProjectOptions(query) { + return request({ + url: '/quality/checkTypeProject/getProjectOptions', + method: 'get', + params: query + }); +} diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js index 3d4b655..481e912 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -24,4 +24,20 @@ export function getWorkcenterList() { url: '/quality/staticTable/getWorkcenterList', method: 'get' }); -} \ No newline at end of file +} + +export function getXJCheckTableList(query) { + return request({ + url: '/quality/staticTable/getXJCheckTableList', + method: 'get', + params: query + }); +} + +export function getXJCheckTableDetail(query) { + return request({ + url: '/quality/staticTable/getXJCheckTableDetail', + method: 'get', + params: query + }); +} diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 9dfa09c..6e04378 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -92,7 +92,7 @@ @click="handleDelete" v-hasPermi="['mes:reportWork:remove']" >删除 - --> + 报工详情 - + --> + + + + + + + + 搜索 重置 @@ -76,7 +88,7 @@ - - diff --git a/src/views/kanban/exception/index.vue b/src/views/kanban/exception/index.vue index a3bffd6..169d572 100644 --- a/src/views/kanban/exception/index.vue +++ b/src/views/kanban/exception/index.vue @@ -1,36 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88,7 +206,6 @@ export default { box-shadow: 0 0 3px blue; display: flex; flex-direction: column; - overflow: auto; } .main-content { @@ -100,7 +217,7 @@ export default { .block-left-right-content { flex: 1; display: flex; - margin-top: 10px; + margin-top: 20px; } .block-top-bottom-content { @@ -108,7 +225,7 @@ export default { display: flex; flex-direction: column; box-sizing: border-box; - padding-left: 0px; + padding-left: 20px; } .block-top-content { @@ -118,18 +235,5 @@ export default { box-sizing: border-box; padding-bottom: 20px; } - .time { - font-size: 30px; - font-weight: 400; - color: #ffffff; - line-height: 71px; - - - position: fixed; - top: 0; - z-index: 9999;; - padding: 10px; - width: 100%; - } } diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue new file mode 100644 index 0000000..d96ac3d --- /dev/null +++ b/src/views/kanban/finishproduct/BottomRightTable1.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/views/kanban/finishproduct/TopLeftCmp.vue b/src/views/kanban/finishproduct/TopLeftCmp.vue new file mode 100644 index 0000000..03fa163 --- /dev/null +++ b/src/views/kanban/finishproduct/TopLeftCmp.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/views/kanban/finishproduct/TopMiddleCmp.vue b/src/views/kanban/finishproduct/TopMiddleCmp.vue new file mode 100644 index 0000000..3941989 --- /dev/null +++ b/src/views/kanban/finishproduct/TopMiddleCmp.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/views/kanban/finishproduct/TopRightCmp.vue b/src/views/kanban/finishproduct/TopRightCmp.vue new file mode 100644 index 0000000..3864818 --- /dev/null +++ b/src/views/kanban/finishproduct/TopRightCmp.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/kanban/finishproduct/index.vue b/src/views/kanban/finishproduct/index.vue new file mode 100644 index 0000000..9ae42c8 --- /dev/null +++ b/src/views/kanban/finishproduct/index.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/src/views/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue new file mode 100644 index 0000000..dba26fb --- /dev/null +++ b/src/views/mes/unitprice/index.vue @@ -0,0 +1,621 @@ + + + diff --git a/src/views/technology/childprocess/index.vue b/src/views/technology/childprocess/index.vue new file mode 100644 index 0000000..c1cc21a --- /dev/null +++ b/src/views/technology/childprocess/index.vue @@ -0,0 +1,486 @@ + + + From a5d882bad051515960e22b914b99da640bb56ebe Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 4 Jan 2024 08:45:49 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/checkTypeProject/selectProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue index 36bd014..38eeec4 100644 --- a/src/views/quality/checkTypeProject/selectProject.vue +++ b/src/views/quality/checkTypeProject/selectProject.vue @@ -68,7 +68,7 @@ - + Date: Thu, 4 Jan 2024 10:06:01 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E7=BB=B4=E4=BF=9D=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/equipment.js | 18 +++ src/views/wms/equipment/index.vue | 16 ++- src/views/wms/equipment/itemBYRecords.vue | 167 ++++++++++++++++++++++ src/views/wms/equipment/itemWXRecords.vue | 160 +++++++++++++++++++++ 4 files changed, 360 insertions(+), 1 deletion(-) create mode 100644 src/views/wms/equipment/itemBYRecords.vue create mode 100644 src/views/wms/equipment/itemWXRecords.vue diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js index b746322..c596c4a 100644 --- a/src/api/wms/equipment.js +++ b/src/api/wms/equipment.js @@ -114,3 +114,21 @@ export function getAuxiliaryEquipmentList(query) { params: query }); } + +// 查询维修记录 +export function getWXRecordsList(query) { + return request({ + url: '/wms/equipment/getWXRecordsList', + method: 'get', + params: query + }); +} + +// 查询保养记录 +export function getBYRecordsList(query) { + return request({ + url: '/wms/equipment/getBYRecordsList', + method: 'get', + params: query + }); +} diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index d5a72cb..9469bb6 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -907,6 +907,18 @@ :equipmentCode="form.equipmentCode" > + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/views/wms/equipment/itemWXRecords.vue b/src/views/wms/equipment/itemWXRecords.vue new file mode 100644 index 0000000..70a9449 --- /dev/null +++ b/src/views/wms/equipment/itemWXRecords.vue @@ -0,0 +1,160 @@ + + + From ece6265cf1e144c452e46a7dcdd4f05c9de38f81 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 4 Jan 2024 13:51:57 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E8=AE=BE=E5=A4=87=20=E7=BB=B4=E4=BF=AE--?= =?UTF-8?q?----->=E8=AE=BE=E5=A4=87=E5=AE=8C=E5=A5=BD=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/repairOrder/index.vue | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 5dfaeab..0a1c61e 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1729,7 +1729,7 @@ export default { indexMethod(index) { return index + 1; }, - //计算时间 结束维修时间-开始维修时间 + //计算时间 结束维修时间-开始维修时间 转化为小时 listeningTime() { if (this.form.workEndTime != null && this.form.workStartTime != null) { var time1 = moment(this.form.workStartTime); @@ -1738,26 +1738,14 @@ export default { let { _data } = duration; console.log("打印维修时间", _data); //拼接 - this.form.workCostTime = - _data.years + - "年" + - _data.months + - "月" + - _data.days + - "日" + - _data.hours + - "小时" + - _data.minutes + - "分" + - _data.seconds + - "秒"; + this.form.workCostTime = (_data.days*24 + _data.hours + (_data.minutes/60) + (_data.seconds/3600)).toFixed(1)+ "小时" ; } }, - //计算时间 结束停机时间-开始停机时间 - // listeningDownTime() { - // if (this.form.actualDownEndTime != null && this.form.actualDownStartTime != null) { - // var time1 = moment(this.form.actualDownStartTime); - // var time2 = moment(this.form.actualDownEndTime); + //计算时间 结束维修时间-开始维修时间 + // listeningTime() { + // if (this.form.workEndTime != null && this.form.workStartTime != null) { + // var time1 = moment(this.form.workStartTime); + // var time2 = moment(this.form.workEndTime); // let duration = moment.duration(time2.diff(time1)); // let { _data } = duration; // console.log("打印维修时间", _data); From 7a42f5ebfd6ca9b261b691688f36d574c950c7c8 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Thu, 4 Jan 2024 14:25:29 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/outorder/index.vue | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue index 206ea59..547c631 100644 --- a/src/views/wms/outorder/index.vue +++ b/src/views/wms/outorder/index.vue @@ -58,7 +58,7 @@ - + @@ -357,36 +357,36 @@ export default { Optionlistck: [], Packagingline: [ { - stationNo: 'LJ1', - stationname: '榄菊1', + stationNo: 'XL01', + stationname: '包装线01', }, { - stationNo: 'LJ2', - stationname: '榄菊2', + stationNo: 'XL02', + stationname: '包装线02', }, { - stationNo: 'LJ3', - stationname: '榄菊3', + stationNo: 'XL03', + stationname: '包装线03', }, { - stationNo: 'LJ4', - stationname: '榄菊4', + stationNo: 'XL04', + stationname: '包装线04', }, { - stationNo: 'LJ5', - stationname: '榄菊5', + stationNo: 'XL05', + stationname: '包装线05', }, { - stationNo: 'LJ6', - stationname: '榄菊6', + stationNo: 'XL06', + stationname: '包装线06', }, { - stationNo: 'LJ7', - stationname: '榄菊7', + stationNo: 'XL07', + stationname: '包装线07', }, { - stationNo: 'LJ8', - stationname: '榄菊8', + stationNo: 'XL08', + stationname: '包装线08', }, ], From 177f899cfb899d46c570247c66c53cefc6142d34 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 4 Jan 2024 15:45:18 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/qcTable.js | 8 + src/views/quality/checkTypeProject/index.vue | 2 +- src/views/quality/produceReport/index.vue | 5 +- src/views/quality/qcProduce/index.vue | 1 + src/views/quality/qcTableXJ/index.vue | 29 +-- src/views/quality/qcTableXJAnalysis/index.vue | 198 ++++++++++++++++++ 6 files changed, 216 insertions(+), 27 deletions(-) create mode 100644 src/views/quality/qcTableXJAnalysis/index.vue diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js index 481e912..0d56b5e 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -41,3 +41,11 @@ export function getXJCheckTableDetail(query) { params: query }); } + +export function getXJChartData(query) { + return request({ + url: '/quality/staticTable/getXJChartData', + method: 'get', + params: query + }); +} diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue index 1e8eca0..2bf54c8 100644 --- a/src/views/quality/checkTypeProject/index.vue +++ b/src/views/quality/checkTypeProject/index.vue @@ -114,7 +114,7 @@ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} - + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 2cba9c8..d14359a 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -87,12 +87,13 @@ - + + + + @@ -299,6 +417,7 @@ export default { title: "", // 是否显示弹出层 open: false, + firstReportOpen: false, // 查询参数 queryParams: { checkTimeArray: [], @@ -451,10 +570,20 @@ export default { this.queryParams.recordId = recordId; getProduce(recordId).then(response => { this.form = response.data; - this.form.printable = 'printFrom'; //打印时需要 - this.form.ignore = ['no-print'];//打印时需要 - this.open = true; - this.title = "查看过程检验报告"; + if(this.form.checkType =='checkTypeSC') { + //首检报告 + this.form.printable = 'firstReportPrint'; //打印时需要 + this.form.ignore = ['no-print'];//打印时需要 + this.firstReportOpen = true; + this.title = "首检检验报告"; + }else { + //巡检报告 + this.form.printable = 'printForm'; //打印时需要 + this.form.ignore = ['no-print'];//打印时需要 + this.open = true; + this.title = "巡检检验报告"; + } + }); this.getCheckedProjectList(); }, @@ -518,6 +647,10 @@ export default { properties: params.properties || null }) }, + handleDone() { + this.firstReportOpen = false; + this.reset(); + }, } }; diff --git a/src/views/quality/qcProjectType/index.vue b/src/views/quality/qcProjectType/index.vue index af6a6e1..28314f9 100644 --- a/src/views/quality/qcProjectType/index.vue +++ b/src/views/quality/qcProjectType/index.vue @@ -80,6 +80,8 @@ + +