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/api/quality/qcTable.js b/src/api/quality/qcTable.js index 0d56b5e..445b7e8 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -49,3 +49,25 @@ export function getXJChartData(query) { params: query }); } + +export function getQmsRateTable(query) { + return request({ + url: '/quality/staticTable/getQmsRateTable', + method: 'get', + params: query + }); +} + +export function getCheckTypeList(typeCode) { + return request({ + url: '/quality/staticTable/getCheckTypeList/' + typeCode, + method: 'get' + }); +} + +export function getSupplierList(typeCode) { + return request({ + url: '/quality/staticTable/getSupplierList/' + typeCode, + method: 'get' + }); +} diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 8cdbc73..fc8f099 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -44,7 +44,7 @@ /> - + + + 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/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue index 4cdf526..724ecf9 100644 --- a/src/views/device/spotInspectionOrder/index.vue +++ b/src/views/device/spotInspectionOrder/index.vue @@ -44,7 +44,7 @@ /> - + + + @@ -359,8 +361,6 @@ {{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }} - - @@ -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/unitprice/index.vue b/src/views/mes/unitprice/index.vue index dba26fb..00c7e02 100644 --- a/src/views/mes/unitprice/index.vue +++ b/src/views/mes/unitprice/index.vue @@ -106,9 +106,9 @@ - + + + { + console.log("listEquipment") this.auxiliaryEquipmentLeftList = []; for (let i in response.rows) { // 将返回的列表赋值于穿梭框左边列表 @@ -1468,9 +1477,11 @@ export default { label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark, }); } + console.log(this.auxiliaryEquipmentRightList) }); getEquipment(equipmentId).then((response) => { + console.log("getEquipment") this.form = response.data; this.rightList = []; for (let i in response.data.selectedData) { @@ -1478,12 +1489,14 @@ export default { this.rightList.push(response.data.selectedData[i].spareCode); } this.auxiliaryEquipmentRightList = []; + console.log(this.auxiliaryEquipmentRightList) for (let i in response.data.selectedEquipmentData) { // 将返回的辅助设备列表赋值于穿梭框右边列表 this.auxiliaryEquipmentRightList.push( response.data.selectedEquipmentData[i].auxiliaryEquipmentCode ); } + console.log(this.auxiliaryEquipmentRightList) if (response.data.imageFiles != null) { var newFiles = []; diff --git a/src/views/wms/equipment/itemEquipment.vue b/src/views/wms/equipment/itemEquipment.vue index 74bf193..5379335 100644 --- a/src/views/wms/equipment/itemEquipment.vue +++ b/src/views/wms/equipment/itemEquipment.vue @@ -16,6 +16,7 @@ @@ -27,6 +28,7 @@