diff --git a/src/api/mes/reportWorks.js b/src/api/mes/reportWorks.js index adf968b..2d2fb70 100644 --- a/src/api/mes/reportWorks.js +++ b/src/api/mes/reportWorks.js @@ -7,3 +7,11 @@ export function listReportWorks(query) { params: query }); } + +export function getProductTraceList(query) { + return request({ + url: '/mes/reportWorks/getProductTrace', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/api/quality/checkTaskDefect.js b/src/api/quality/checkTaskDefect.js index 562261d..45d5760 100644 --- a/src/api/quality/checkTaskDefect.js +++ b/src/api/quality/checkTaskDefect.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function getDefectValue(belongToDetail) { +export function getDefectValue(belongToDetail,checkType) { return request({ - url: '/quality/qcCheckTaskDefect/getDefectValue/' + belongToDetail, + url: '/quality/qcCheckTaskDefect/getDefectValue/' + belongToDetail+'/'+checkType, method: 'get', }); } diff --git a/src/api/quality/income.js b/src/api/quality/income.js index ae04250..c79debc 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -150,9 +150,9 @@ export function commitCheckResult(data) { }) } -export function getDefectList(defectType) { +export function getDefectList(checkType) { const data = { - defectType + checkType } return request({ url: '/quality/qcIncome/getDefectList', @@ -243,4 +243,25 @@ export function getWarehouseList(query) { method: 'get', params: query }); +} + +export function getClassInfoListByCheckType(query) { + return request({ + url: '/quality/defectClass/getClassInfoListByCheckType', + method: 'get', + params: query + }); +} + +//状态修改 +export function submitCheckPics(recordId,fileList) { + const data = { + recordId, + fileList + } + return request({ + url: '/quality/qcIncome/submitCheckPics', + method: 'put', + data: data + }) } \ No newline at end of file diff --git a/src/api/wms/put.js b/src/api/wms/put.js index 2912fbf..407f645 100644 --- a/src/api/wms/put.js +++ b/src/api/wms/put.js @@ -9,6 +9,13 @@ export function listPut(query) { }); } +export function handleUpdateSAP102(data) { + return request({ + url: '/wms/odsRawOrderIn/handleUpdateSAP102', + method: 'post', + data: data + }); +} // 查询成品生产入库详细 export function getPut(id) { return request({ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b974304..288daf7 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -314,14 +314,14 @@ export default { 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); - - + if(process.env.VUE_APP_BASE_API !='/dev-api'){ + //先执行一次 + this.getUnReadList(); + // 实现轮询 + this.timer = setInterval(() => { + setTimeout(this.getUnReadList(), 30000); + }, 30000); + } }, components: { Breadcrumb, diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 44122e1..56496f1 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -2524,6 +2524,7 @@ export default { message: "提交成功！", type: "success", }); + this.getList(); } }); }, diff --git a/src/views/mes/productTrace/index.vue b/src/views/mes/productTrace/index.vue new file mode 100644 index 0000000..9cd8c10 --- /dev/null +++ b/src/views/mes/productTrace/index.vue @@ -0,0 +1,284 @@ + + + diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index c45a128..896c6fe 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -1033,7 +1033,6 @@ export default { }, // 派发-工单派发按钮操作 handleUpdateDown(row) { - var statusesArray = this.statuses; for (var i = 0; i < statusesArray.length; i++) { if (statusesArray[i] != 'w0') {//已经下达的不允许操作 diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index 7d14c46..c20e284 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -4,7 +4,7 @@ v-if="showFlag" :visible.sync="showFlag" :modal= false - width="1400px" + width="1300px" > @@ -51,26 +51,24 @@ - - - - - - - --> - - - - + --> + + + + + + + + @@ -79,9 +77,9 @@ - - - + + + diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue index 147aa33..b066d37 100644 --- a/src/views/system/role/authUser.vue +++ b/src/views/system/role/authUser.vue @@ -151,7 +151,7 @@ export default { }, // 返回按钮 handleClose() { - const obj = { path: "/system/role" }; + const obj = { path: "/op/system/role" }; this.$tab.closeOpenPage(obj); }, /** 搜索按钮操作 */ diff --git a/src/views/wms/emnews/index.vue b/src/views/wms/emnews/index.vue index 43a7b80..02997dd 100644 --- a/src/views/wms/emnews/index.vue +++ b/src/views/wms/emnews/index.vue @@ -19,7 +19,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + - + - + - + @@ -139,11 +139,11 @@ - - - + + + + + - - - - - - - - + sum + (row.amount || 0), 0); + // const totalOutNumber = data.reduce((sum, row) => sum + (row.outNumber || 0), 0); + // const totalRemaining = totalAmount - totalOutNumber; + // return [ + // { amount: totalAmount, outNumber: totalOutNumber, remaining: totalRemaining }, + // ]; + // }, + getSummary(param) { + const { columns, data } = param; + const totalAmount = data.reduce((sum, row) => sum + (row.amount || 0), 0); + const totalOutNumber = data.reduce((sum, row) => sum + (row.outNumber || 0), 0); + const totalRemaining = totalAmount - totalOutNumber; + const summary = columns.map((column, index) => { + if (index === 7) { // "计划数量"在第8列 + return totalAmount; + } else if (index === 8) { // "已入库数量"在第9列 + return totalOutNumber; + }else if (index === 9) { // "已入库数量"在第9列 + return totalRemaining; + } + return ''; // 其余列不汇总，返回空 + }); + return summary; + }, handlequeryform() { this.showMaterialDialog = true; // 显示领料单信息弹窗 this.fetchMaterials(); // 加载领料单数据 @@ -630,10 +626,12 @@ export default { console.log("Materials processed"); this.showMaterialDialog = false; // 关闭领料单弹窗 }, - handleRemoveBatch(row) { - + handleRemoveBatch() { + const ids = this.ids; + let postData = this.ids.map(id => ({ mateOrderInSnId: id })); + console.log(postData) this.$modal.confirm('是否确认删除标识卡编号为"' + wlCode + '"的数据项？').then(function() { - return Removecard(); + return Removecard(postData); }).then(() => { this.editBatch(); this.$modal.msgSuccess("删除成功"); diff --git a/src/views/wms/outorderTS/index.vue b/src/views/wms/outorderTS/index.vue index e3a48bf..de2940e 100644 --- a/src/views/wms/outorderTS/index.vue +++ b/src/views/wms/outorderTS/index.vue @@ -72,8 +72,8 @@ 完成 - - + +