diff --git a/src/api/quality/income.js b/src/api/quality/income.js index 0527800..50a717a 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -162,3 +162,11 @@ export function getWorkOrder(query) { params: query }); } +// 查询入库订单列表 +export function getProductWorkOrder(query) { + return request({ + url: '/quality/qcIncome/getProductWorkOrder', + method: 'get', + params: query + }); + } \ No newline at end of file diff --git a/src/api/quality/qcProCheck.js b/src/api/quality/qcProCheck.js new file mode 100644 index 0000000..5b5556c --- /dev/null +++ b/src/api/quality/qcProCheck.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function listCheck(query) { + return request({ + url: '/quality/qcProCheck/list', + method: 'get', + params: query + }); +} diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index a396547..9dfa09c 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -643,7 +643,8 @@ export default { attr3: null, attr4: null, workorderCode: null, - parentOrder:null + parentOrder:null, + uploadStatus:"0" }, // 表单参数 form: { @@ -940,15 +941,16 @@ export default { }, /** 报工详情按钮操作 */ handleReportHz(row) { + this.reset(); - let sr = this.selectRow[0]; + let sr = row; if(sr.uploadStatus =='sap报工成功'){ this.optType = 'view' }else{ this.optType = '' } - + this.queryParams.workorderCode = sr.workorderCode; //查询母工单报工记录列表 this.queryParams.parentOrder = '0'; @@ -964,7 +966,7 @@ export default { this.sOrderTableList = response; this.openReport = true; this.titleReport = "工单报工详情"; - + this.queryParams.workorderCode = ''; }); }, handleEdit(index, row) { @@ -993,7 +995,7 @@ export default { /** 报工损耗按钮操作 */ handleConsumeHz(row) { this.reset(); - let sr = this.selectRow[0]; + let sr = row; if(sr.uploadStatus =='sap报工成功'){ this.optType = 'view' @@ -1016,6 +1018,8 @@ export default { this.sConsumeTableList = response; this.openConsume = true; this.titleConsume = "工单报工物料损耗详情"; + + this.queryParams.workorderCode = ''; }); }, // 多选框选中数据 diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index 0912b3f..1f8051c 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -130,7 +130,7 @@ > - diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue index 26966c0..e93b670 100644 --- a/src/views/plan/whiteOrder/index.vue +++ b/src/views/plan/whiteOrder/index.vue @@ -121,8 +121,8 @@ > - - + + diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index c03407c..36392d1 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -32,10 +32,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -181,18 +181,18 @@ - + + + + - - + + - - - - - + - + diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue index e596450..f32b916 100644 --- a/src/views/quality/incomeReport/index.vue +++ b/src/views/quality/incomeReport/index.vue @@ -83,7 +83,7 @@ - + @@ -119,7 +119,7 @@ @pagination="getList" /> - + @@ -143,18 +143,18 @@ - + - + - + @@ -171,14 +171,14 @@ - + - + @@ -201,6 +201,25 @@ + + + + + + + + + + + + + + + {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + @@ -209,11 +228,11 @@ - + @@ -225,14 +244,15 @@ - - - + + + + - - + + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 91180be..2cba9c8 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -83,7 +83,7 @@ - + diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue index 2b0b0db..bdea3a6 100644 --- a/src/views/quality/productReport/index.vue +++ b/src/views/quality/productReport/index.vue @@ -83,7 +83,7 @@ - + @@ -119,7 +119,7 @@ @pagination="getList" /> - + @@ -147,19 +147,19 @@ - - + + - + - + @@ -178,7 +178,7 @@ - + @@ -203,10 +203,13 @@ - - - {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - + + + + + + + @@ -214,6 +217,22 @@ + + + + + + {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + + + {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + @@ -225,14 +244,15 @@ - - - + + + + - - + + diff --git a/src/views/quality/qcProCheck/index.vue b/src/views/quality/qcProCheck/index.vue new file mode 100644 index 0000000..d68a724 --- /dev/null +++ b/src/views/quality/qcProCheck/index.vue @@ -0,0 +1,188 @@ + + + diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index 933c573..a6b9cc8 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -397,7 +397,7 @@ import { listWarehousing, getWarehousing, delWarehousing, addWarehousing, updateWarehousing } from "@/api/quality/warehousing"; import { getBatchList} from "@/api/quality/qcProduce"; import { getCheckTypes } from "@/api/quality/qcProduce"; -import ItemSelectWorkOrder from "./selectWorkOrder.vue"; +import ItemSelectWorkOrder from "./selectProductWorkOrder.vue"; import ItemSelectMaterial from "../qcIncome/selectMaterial.vue"; import ItemSelectLoc from "./selectLoc.vue"; import ItemSelectUser from "../qcIncome/selectUser.vue"; diff --git a/src/views/quality/qcWarehousing/selectWorkOrder.vue b/src/views/quality/qcWarehousing/selectProductWorkOrder.vue similarity index 97% rename from src/views/quality/qcWarehousing/selectWorkOrder.vue rename to src/views/quality/qcWarehousing/selectProductWorkOrder.vue index aa571a4..1a24a24 100644 --- a/src/views/quality/qcWarehousing/selectWorkOrder.vue +++ b/src/views/quality/qcWarehousing/selectProductWorkOrder.vue @@ -56,7 +56,7 @@