diff --git a/src/api/mes/unitPrice.js b/src/api/mes/unitPrice.js index f39eeee..a7a492e 100644 --- a/src/api/mes/unitPrice.js +++ b/src/api/mes/unitPrice.js @@ -16,7 +16,6 @@ export function getUnitPrice(picId) { method: 'get' }); } - // 新增unitPrice export function addUnitPrice(data) { return request({ diff --git a/src/api/mes/unitPriceReport.js b/src/api/mes/unitPriceReport.js index 847ccf5..417d7c8 100644 --- a/src/api/mes/unitPriceReport.js +++ b/src/api/mes/unitPriceReport.js @@ -8,12 +8,7 @@ export function listUnitPriceReport(query) { params: query }); } -// export function getReport(id) { -// return request({ -// url: '/mes/unitPriceReport/' + id, -// method: 'get' -// }); -// } + // 查询【计件工资】详细 export function getReport(id) { return request({ @@ -29,3 +24,20 @@ export function updateUnitPriceReport(data) { data: data }); } +// 新增 +// 计件工资统计 +export function addUnitPriceReport(data) { + return request({ + url: '/mes/unitPriceReport', + method: 'post', + data: data + }); +} +// 查询生产工单列表--顶级母 +export function listWorkorderLevel0(query) { + return request({ + url: '/plan/pro/workorder/listLevel0', + method: 'get', + params: query + }); +} diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js index 298c59c..f3c2697 100644 --- a/src/api/plan/workorder.js +++ b/src/api/plan/workorder.js @@ -181,10 +181,7 @@ export function getProdLineList() { params: {} }); } -export function getIdCardList(workorderCode){ - const data={ - workorderCode - } +export function getIdCardList(data){ return request({ url:'/plan/pro/workorder/getIdCardList', method:'post', diff --git a/src/api/system/user.js b/src/api/system/user.js index 3b071f9..c464094 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -17,6 +17,14 @@ export function getUser(userId) { method: 'get' }) } +// 查询用户详细-通过工号 +export function getUserByUserName(data) { + return request({ + url: '/system/user/getInfoByUserName/', + method: 'post', + data: data + }) +} // 新增用户 export function addUser(data) { diff --git a/src/assets/icons/svg/print.svg b/src/assets/icons/svg/print.svg new file mode 100644 index 0000000..3f17cb3 --- /dev/null +++ b/src/assets/icons/svg/print.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/views/mes/unitpriceReport/index.vue b/src/views/mes/unitpriceReport/index.vue index 498d4e9..6faaa9e 100644 --- a/src/views/mes/unitpriceReport/index.vue +++ b/src/views/mes/unitpriceReport/index.vue @@ -42,10 +42,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -69,16 +69,15 @@ - - - - - - - - - - + 补录 + - + @@ -281,16 +280,243 @@ 取 消 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ + diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index 4d4defe..87f2c7d 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -1838,7 +1838,7 @@ export default { this.$modal.msgError("还未派发请到工单变更进行调整！"); return; } - + this.batchLoading = true; const workOrdercode = this.codes[0]; @@ -1987,8 +1987,17 @@ export default { /**打印标识卡弹出框**/ printIdCard() { + + //var statusesArray = this.statuses; + //for (var i = 0; i < statusesArray.length; i++) { + // if (statusesArray[i] == 'w0') {//已经下达的不允许操作 + // this.$modal.msgError("工单只有未派发和已派发才可变更！"); + // return + // } + //} + + this.$refs.printID.init(this.selectWork.workorderCode); this.$refs.printID.printDialogVisible = true; - this.$refs.printID.init("20021221552"); }, //标识卡选择确认 printIdFunc(obj) { diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue index 1832859..19c4832 100644 --- a/src/views/plan/workorder/printID.vue +++ b/src/views/plan/workorder/printID.vue @@ -1,15 +1,18 @@ +