diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js index c6bee9c..464f883 100644 --- a/src/api/mes/reportWork.js +++ b/src/api/mes/reportWork.js @@ -191,6 +191,23 @@ export function getReportList(query) { params: query }); } + +// 查询报工详细列表 +export function getCKList(data) { + return request({ + url: '/wms/order/listCKT', + method: 'post', + params: data + }); +} +//查询报工详细列表+SAP收货状态 +export function getReportSAPList(query) { + return request({ + url: '/wms/put/getReportListSap', + method: 'get', + params: query + }); +} // 提交报工详细列表 export function submitReportPS(data) { return request({ @@ -199,7 +216,14 @@ export function submitReportPS(data) { data: data }); } - +// SAP收货 +export function submitReportPSSAP(data) { + return request({ + url: '/wms/put/addReportListSap', + method: 'post', + data: data + }); +} // 查询物料管理列表 export function getPrepareList(query) { return request({ diff --git a/src/api/quality/firstReport.js b/src/api/quality/firstReport.js deleted file mode 100644 index 03e3db1..0000000 --- a/src/api/quality/firstReport.js +++ /dev/null @@ -1,93 +0,0 @@ -import request from '@/utils/request' - -// 查询来料报告列表 -export function listIncome(query) { - return request({ - url: '/quality/qcFirstReport/list', - method: 'get', - params: query - }); -} - -// 查询来料报告详细 -export function getIncome(recordId) { - return request({ - url: '/quality/qcFirstReport/' + recordId, - method: 'get' - }); -} - -// 新增来料报告 -export function addIncome(data) { - return request({ - url: '/quality/qcFirstReport', - method: 'post', - data: data - }); -} - -// 修改来料报告 -export function updateIncome(data) { - return request({ - url: '/quality/qcFirstReport', - method: 'put', - data: data - }); -} - -// 删除来料报告 -export function delIncome(recordId) { - return request({ - url: '/quality/qcFirstReport/' + recordId, - method: 'delete' - }); -} - -// 查询BOM物料管理列表 -export function getQcListBom(query) { - return request({ - url: '/quality/qcFirstReport/getQcListBom', - method: 'get', - params: query - }); - } - -// 查询供应商管理列表 -export function getQcListSupplier(query) { - return request({ - url: '/quality/qcFirstReport/getQcListSupplier', - method: 'get', - params: query - }); - } - -// 查询人员列表 -export function getQcListUser(query) { - return request({ - url: '/quality/qcFirstReport/getQcListUser', - method: 'get', - params: query - }); - } - -//状态修改 -export function changeIncomeStatus(recordId, status) { - const data = { - recordId, - status - } - return request({ - url: '/quality/qcFirstReport/changeIncomeStatus', - method: 'put', - data: data - }) - } - -// 查询检测项列表 -export function getCkeckProjectList(query) { - return request({ - url: '/quality/qcFirstReport/getCkeckProjectList', - method: 'get', - params: query - }); - } diff --git a/src/api/quality/produceReport.js b/src/api/quality/produceReport.js index d8b4e8f..e7467de 100644 --- a/src/api/quality/produceReport.js +++ b/src/api/quality/produceReport.js @@ -43,3 +43,13 @@ export function delProduce(recordId) { }); } +export function getProduceReportXJ(orderNo) { + const data = { + orderNo + } + return request({ + url: '/quality/qcProduceReport/getProduceReportXJ', + method: 'post', + data: data + }); +} diff --git a/src/api/quality/qcSampleRule.js b/src/api/quality/qcSampleRule.js index 89782bd..8c0c9f0 100644 --- a/src/api/quality/qcSampleRule.js +++ b/src/api/quality/qcSampleRule.js @@ -42,3 +42,11 @@ export function delQcSampleRule(id) { method: 'delete' }); } + +// 根据大节点获取检验节点类型 +export function getCheckType(typeCode) { + return request({ + url: '/quality/qcSampleRule/getCheckType/' + typeCode, + method: 'get', + }) +} diff --git a/src/views/device/operation/index.vue b/src/views/device/operation/index.vue index 9fdaf91..e8ecf40 100644 --- a/src/views/device/operation/index.vue +++ b/src/views/device/operation/index.vue @@ -228,6 +228,8 @@ + + diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue index 96615e7..7213c75 100644 --- a/src/views/device/sparePartsLedger/index.vue +++ b/src/views/device/sparePartsLedger/index.vue @@ -139,17 +139,17 @@ - + - - - + + + - - + + diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue index d96ac3d..765e2e2 100644 --- a/src/views/kanban/finishproduct/BottomRightTable1.vue +++ b/src/views/kanban/finishproduct/BottomRightTable1.vue @@ -1,10 +1,11 @@ @@ -19,6 +20,7 @@ export default { }, data () { return { + borderBoxKey: 1, // 初始化一个key值 config:{ header: ['工单号', '产线名称', '产品名称', '生产数量', '单位'], data: [ @@ -37,6 +39,7 @@ export default { tableData(newVal) { console.log("newVal-",newVal) this.config.data = this.formatTableData(newVal); + this.borderBoxKey += 1; } }, methods: { @@ -100,5 +103,6 @@ export default { .dv-scroll-board { height: calc(~"100% - 0px"); } + } diff --git a/src/views/kanban/finishproduct/TopMiddleCmp.vue b/src/views/kanban/finishproduct/TopMiddleCmp.vue index 3941989..de13d20 100644 --- a/src/views/kanban/finishproduct/TopMiddleCmp.vue +++ b/src/views/kanban/finishproduct/TopMiddleCmp.vue @@ -87,15 +87,15 @@ export default { diff --git a/src/views/kanban/finishproduct/index.vue b/src/views/kanban/finishproduct/index.vue index 9ae42c8..8715499 100644 --- a/src/views/kanban/finishproduct/index.vue +++ b/src/views/kanban/finishproduct/index.vue @@ -1,32 +1,47 @@ - diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 6e04378..3d85b8f 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -71,6 +71,7 @@ v-hasPermi="['mes:reportWork:add']" >新增 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 返回 + 确 定 + 取 消 +
+ + - + - \ No newline at end of file diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 901adef..3487d87 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -1,18 +1,18 @@ @@ -110,8 +111,8 @@ @pagination="getList" /> - - + + -
- +
+ + - - - - - - - - - - - - - - + + 中山榄菊日化实业有限公司 - - - - + + 产品巡检记录表 - - - - - - - - - - - - - - - + + + 生成车间:{{form.supplierName}} + 生成线体:{{form.lineName}} + 检查日期:{{form.checkTimeStart}} + 产品名称:{{form.materialName}} + 批次号:{{form.incomeBatchNo}} + 生产类型: + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + 检查人: + 品质主管: + - - - - - {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- 确 定 取 消
@@ -255,12 +214,9 @@
- + - - - - +

中山榄菊日化实业有限公司

 @@ -271,8 +227,8 @@ - - + + {{ this.standardNo }} @@ -365,7 +321,7 @@ diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index d9997b5..19ee090 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -221,6 +221,13 @@ /> + + @@ -27,6 +28,7 @@