diff --git a/src/api/abnormal.js b/src/api/abnormal.js new file mode 100644 index 0000000..02add47 --- /dev/null +++ b/src/api/abnormal.js @@ -0,0 +1,9 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const getAbnormalCodeList = data => createAPI(`abnormal/getAbnormalCodeList`,'post',data) +export const getShopOrderData = data => createAPI(`abnormal/getShopOrderData`,'post',data) +export const getAbnormalFeedBackList = data => createAPI(`abnormal/getAbnormalFeedBackList`,'post',data) + +export const saveAbnormalData= data => createAPI(`abnormal/saveAbnormalData`,'post',data) + +export const saveAbnormalDetail= data => createAPI(`abnormal/saveAbnormalDetail`,'post',data) diff --git a/src/api/production.js b/src/api/production.js index 299e8d4..6261948 100644 --- a/src/api/production.js +++ b/src/api/production.js @@ -68,3 +68,5 @@ export const getPartNoOnHand= data => createAPI(`dailyPlan/getPartNoOnHand`, 'po export const getHunLianPrintData= data => createAPI(`dailyPlan/getHunLianPrintData`, 'post', data); + +export const getAllDepartment= data => createAPI(`dailyPlan/getAllDepartment`, 'post', data); diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue new file mode 100644 index 0000000..9b426af --- /dev/null +++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue @@ -0,0 +1,395 @@ + + + + + diff --git a/src/views/modules/board/SORoutingBoardForBaoZhuang.vue b/src/views/modules/board/SORoutingBoardForBaoZhuang.vue index 7fdb1cf..cc35fc1 100644 --- a/src/views/modules/board/SORoutingBoardForBaoZhuang.vue +++ b/src/views/modules/board/SORoutingBoardForBaoZhuang.vue @@ -34,16 +34,16 @@ prop="itemNo" header-align="center" align="left" - min-width="30" + min-width="25" style="font-size: 20px" - label="工序编号"> + label="工序号"> + min-width="30" + label="包装袋"> "); - LODOP.ADD_PRINT_IMAGE(185,425,99,55, ""); + // LODOP.ADD_PRINT_IMAGE(185,425,99,50, ""); + LODOP.ADD_PRINT_IMAGE(185,425,99,50, ""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); } if(printData.code=='CODE128') { @@ -159,7 +160,7 @@ export function printOutBoxLabel(printList) { LODOP.ADD_PRINT_BARCODE(248,376,169,46,"Code39",printData.customerPONo); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); } - LODOP.ADD_PRINT_TEXT(307,64,120,25,printData.partSpec); + LODOP.ADD_PRINT_TEXT(307,64,170,25,printData.partSpec); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); @@ -167,9 +168,9 @@ export function printOutBoxLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(307,436,121,25,printData.customerPONo); + LODOP.ADD_PRINT_TEXT(308,437,121,25,printData.customerPONo); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); - LODOP.SET_PRINT_STYLEA(0,"FontSize",12); + LODOP.SET_PRINT_STYLEA(0,"FontSize",11); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(333,11,540,20,"Manufactured by "+ printData.siteName); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue index a0c84ca..7e2b306 100644 --- a/src/views/modules/production/inspect.vue +++ b/src/views/modules/production/inspect.vue @@ -12,6 +12,7 @@ + diff --git a/src/views/modules/production/operator.vue b/src/views/modules/production/operator.vue index 2bf1764..95cb958 100644 --- a/src/views/modules/production/operator.vue +++ b/src/views/modules/production/operator.vue @@ -10,6 +10,18 @@ + + + + + + + @@ -175,7 +187,8 @@ getWorkCenterData, getWorkCenterOperatorData, addSkill, - deleteSkill + deleteSkill, + getAllDepartment, } from "@/api/production.js" export default { @@ -199,6 +212,7 @@ dataListLoading:false, // 导出 end height:200, + departmentList:[], tableData:[], date1:'', searchData:{ @@ -206,6 +220,7 @@ operatorName:'', status:'all', site:'', + department:'', }, operatorData:{ operatorID:'', @@ -225,6 +240,11 @@ }) }, methods: { + searchDepartment(){ + getAllDepartment().then(({data}) => { + this.departmentList = data.rows; + }) + }, search(){ getOperatorData(this.searchData).then(({data}) => { this.tableData = data.rows; @@ -329,6 +349,7 @@ }, }, created() { + this.searchDepartment(); } }