diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js index e9d3b3b..fdead41 100644 --- a/src/api/mes/reportWorkConsume.js +++ b/src/api/mes/reportWorkConsume.js @@ -96,4 +96,10 @@ export function getBomList(query) { }); } - +// 删除生产报工物料消耗 +export function deleteConsume(workorderCode) { + return request({ + url: '/mes/reportWorkConsume/deleteConsume/' + workorderCode, + method: 'delete' + }); +} diff --git a/src/api/quality/checkType.js b/src/api/quality/checkType.js index d227eac..a7570ea 100644 --- a/src/api/quality/checkType.js +++ b/src/api/quality/checkType.js @@ -85,3 +85,18 @@ export function delFile(id) { method: 'delete' }); } + +// 查询检验节点维护详细 +export function listBelongToStandars() { + return request({ + url: '/quality/checkType/listBelongToStandars', + method: 'get' + }); +} +// 查询检验节点维护详细 +export function listBelongToLines() { + return request({ + url: '/quality/checkType/listBelongToLines', + method: 'get' + }); +} \ No newline at end of file diff --git a/src/api/quality/userbind.js b/src/api/quality/userbind.js index 71c36a9..9900436 100644 --- a/src/api/quality/userbind.js +++ b/src/api/quality/userbind.js @@ -91,3 +91,12 @@ export function deleteByMaterialCode(data) { data: data }); } + +// 修改用户物料关联 +export function updateBelongTo(data) { + return request({ + url: '/quality/material/updateBelongTo', + method: 'put', + data: data + }); +} \ No newline at end of file diff --git a/src/views/kanban/quality/kanban2.vue b/src/views/kanban/quality/kanban2.vue index 04d4e51..49bca2d 100644 --- a/src/views/kanban/quality/kanban2.vue +++ b/src/views/kanban/quality/kanban2.vue @@ -22,13 +22,14 @@ +
@@ -41,6 +42,26 @@
订单异常信息
+ +
@@ -96,6 +117,27 @@
异常原因分布
+
@@ -115,42 +157,70 @@
订单异常明细
+
- - + + + - + + + +
序号 物料名称订单号物料名称订单号 来料时间 质检确认时间 质检数量质检单位 检验人质检不合格质检不合格不良描述不良类型不良数量
- + - - - + + + + - + + + +
{{ index + 1 }} {{ n.materialName }}{{ n.orderNo }}{{ n.checkTime }}{{ n.materialName }}{{ n.orderNo }} {{ n.incomeTime }}{{ n.checkTime }} {{ n.quality }}{{ n.unit }} {{ n.checkManName }}{{ n.checkResult }}{{ n.checkResult }}{{ n.className }}{{ n.defectSubclass }}{{ n.noOkQuality }}
- +
@@ -244,9 +314,21 @@ export default { ], RefreshTime:null, dictDatatype:[], + classOption: { + direction: 1, + hoverstop: true, + step: 0.1, + openNatch: true, + limitMoveNum: 7, + }, + ymdArray1:[], + ymdStart1: null, + ymdEnd1: null }; }, - created() { }, + created() { + this.getDate(); + }, destroyed() { clearInterval(this.time1); this.time1 = null; @@ -260,6 +342,24 @@ export default { this.gettime(); }, methods: { + /**获取默认查询时间段**/ + getDate() { + let start = this.Fungetdate(0); + let end = this.Fungetdate(1); + this.ymdArray1.push(start, end); + + this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD"); + this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD"); + }, + + Fungetdate(num) { + var dd = new Date(); + dd.setDate(dd.getDate()); + var y = dd.getFullYear(); + var m = dd.getMonth() + 1 + num; //获取当前月份的日期 + var d = dd.getDate(); + return y + "-" + m + "-" + d; + }, back() { this.$router.push({ path: "/index" }); }, @@ -293,6 +393,7 @@ export default { } }); }, + /** getDictData() { const _this = this; getDictData( @@ -308,13 +409,17 @@ export default { _this.getDeviceRefreshTime() } }); - }, + },**/ getdatalist() { const _this = this; + this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD"); + this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD"); getOverallInfo({ ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1 }).then((response) => { if (response) { _this.ordermessage = response; @@ -324,6 +429,8 @@ export default { ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1 }).then((response) => { if (response) { _this.optionDatalist2 = [] @@ -340,6 +447,8 @@ export default { ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1 }).then((response) => { if (response) { _this.optionDatalist3 = [] @@ -369,11 +478,14 @@ export default { ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1 }).then((response) => { if (response) { this.orderdetail = response this.orderdetail.forEach((item) => { - item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss') + item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD') + item.checkTime = moment(item.checkTime).format('YYYY-MM-DD HH:mm:ss') }); } }); @@ -1342,22 +1454,22 @@ export default { } .titlebox { - width: 431px; - height: 38px; - background: url("../../../assets/images/bg-title.png") no-repeat; - background-size: 100% 100%; - // text-align: center; - font-size: 20px; - font-weight: bold; - color: #ffffff; - line-height: 38px; - letter-spacing: 2px; - text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5); - padding-left: 60px; - // .titlename{ - // position: relative; - // left: 24px; - // } + width: 431px; + height: 38px; + background: url("../../../assets/images/bg-title.png") no-repeat; + background-size: 100% 100%; + // text-align: center; + font-size: 20px; + font-weight: bold; + color: #ffffff; + line-height: 38px; + letter-spacing: 2px; + text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5); + padding-left: 60px; + // .titlename{ + // position: relative; + // left: 24px; + // } } .titlebox2 { @@ -1392,7 +1504,7 @@ export default { display: flex; align-items: center; justify-content: space-around; - width: 350px; + width: 300px; margin-left: 50px; } diff --git a/src/views/kanban/quality/kanban3.vue b/src/views/kanban/quality/kanban3.vue index 9417b16..044e027 100644 --- a/src/views/kanban/quality/kanban3.vue +++ b/src/views/kanban/quality/kanban3.vue @@ -50,8 +50,9 @@ +
- +
- +
+
@@ -87,12 +89,13 @@ 物料名称 检验人 检验时间 + 检验地点 检验状态
- + {{ n.materialName }} +
{{ n.checkManName }} {{ n.checkTime }}{{ n.checkLoc }} {{ n.checkStatus }}
- +
@@ -176,6 +180,13 @@ export default { equipmentinfo: [], RefreshTime: null, dictDatatype: [], + classOption: { + direction: 1, + hoverstop: true, + step: 0.1, + openNatch: true, + limitMoveNum: 7, + }, }; }, created() { }, @@ -251,7 +262,11 @@ export default { if (response) { this.Inspectiondetails = response this.Inspectiondetails.forEach((item) => { - item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss') + item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss'); + if(item.checkTime!=null){ + item.checkTime = moment(item.checkTime).format('YYYY-MM-DD HH:mm:ss') + } + }); } }); diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index ccb0532..af36288 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -518,7 +518,7 @@
- + 一键清理 返回 确 定 取 消 @@ -704,7 +704,7 @@ import { submitConsumePS, submitReportInfo, getBomList, - getAllLevelConsumeList, + getAllLevelConsumeList,deleteConsume } from "@/api/mes/reportWorkConsume"; import ReportWorkConsume from "./reportWorkConsume.vue"; import ItemSelectUser from "./selectUser.vue"; @@ -1434,9 +1434,7 @@ export default { }); this.mergedArray = newPConsumeRows; this.pConsumeRows = newPConsumeRows; - console.log("过滤后:", this.pConsumeRows); } - console.log(this.pConsumeRows, selection, "wwwwww"); }, // 多选框选中all数据(报工物料消耗专用特殊逻辑，不准改zxl) allConsumeSelection(selection, row) { @@ -1490,6 +1488,16 @@ export default { this.loading = false; // 关闭 loading 状态 }); }, + /**清理重复报工损耗**/ + clearConsume(){ + const workorderCode = this.selectRow[0].workorderCode; + this.$modal.confirm('是否确认清理工单号"' + workorderCode + '"的数据项？').then(function() { + return deleteConsume(workorderCode); + }).then(() => { + this.$modal.msgSuccess("清理成功"); + this.cancel(); + }).catch(() => {}); + }, /** 导出按钮操作 */ handleExport() { this.download( diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue index 79be36b..0ce862e 100644 --- a/src/views/quality/checkType/index.vue +++ b/src/views/quality/checkType/index.vue @@ -154,34 +154,40 @@ - - - - - - diff --git a/src/views/quality/report/bpNookRate/index.vue b/src/views/quality/report/bpNookRate/index.vue index 2c1f9b6..12a91da 100644 --- a/src/views/quality/report/bpNookRate/index.vue +++ b/src/views/quality/report/bpNookRate/index.vue @@ -34,11 +34,12 @@ - - - + + + +
diff --git a/src/views/quality/report/bpReworkRate/index.vue b/src/views/quality/report/bpReworkRate/index.vue index e6df143..fcb9981 100644 --- a/src/views/quality/report/bpReworkRate/index.vue +++ b/src/views/quality/report/bpReworkRate/index.vue @@ -38,6 +38,7 @@ + diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue index c07d892..6f433f6 100644 --- a/src/views/wms/returnorderzs/index.vue +++ b/src/views/wms/returnorderzs/index.vue @@ -276,15 +276,6 @@ - - -
-
- -
-
- - @@ -292,12 +283,21 @@
-

普通领料/退料单

+

+ 普通领料/退料单 + +

领料 退料 ✓
+ + + + + +