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 481e912..445b7e8 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -41,3 +41,33 @@ export function getXJCheckTableDetail(query) { params: query }); } + +export function getXJChartData(query) { + return request({ + url: '/quality/staticTable/getXJChartData', + method: 'get', + 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/api/wms/equipment.js b/src/api/wms/equipment.js index b746322..c596c4a 100644 --- a/src/api/wms/equipment.js +++ b/src/api/wms/equipment.js @@ -114,3 +114,21 @@ export function getAuxiliaryEquipmentList(query) { params: query }); } + +// 查询维修记录 +export function getWXRecordsList(query) { + return request({ + url: '/wms/equipment/getWXRecordsList', + method: 'get', + params: query + }); +} + +// 查询保养记录 +export function getBYRecordsList(query) { + return request({ + url: '/wms/equipment/getBYRecordsList', + method: 'get', + params: query + }); +} diff --git a/src/api/wms/put.js b/src/api/wms/put.js index f78d2cb..2912fbf 100644 --- a/src/api/wms/put.js +++ b/src/api/wms/put.js @@ -25,7 +25,14 @@ export function addPut(data) { data: data }); } - +//过账 +export function SAPPut(data) { + return request({ + url: '/wms/put/WmsProductPutByWorkOrderConfirmSAPPosting', + method: 'post', + data: data + }); +} // 修改成品生产入库 export function updatePut(data) { return request({ 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 @@ /> - + - + @keyup.enter.native="handleQuery" + > + +
@@ -1061,7 +1069,11 @@ - + @@ -1092,11 +1104,11 @@ { + this.workFaultDescOption = response.rows; + }); + }, /** 查询维修原因列表 */ getWorkReason() { this.loading = true; @@ -1841,8 +1858,7 @@ export default { }, // 查看维修记录-取消按钮 cancelQueryWriteForm() { - this.openWrite = false; - this.reset(); + this.queryWrite = false; }, // 表单重置 reset() { diff --git a/src/views/device/repairOrder/selectSpareParts.vue b/src/views/device/repairOrder/selectSpareParts.vue index 0fd786a..9aaf27e 100644 --- a/src/views/device/repairOrder/selectSpareParts.vue +++ b/src/views/device/repairOrder/selectSpareParts.vue @@ -99,6 +99,18 @@ prop="applyPeople" width="80" /> + + {{ scope.row.amount - scope.row.storageAmount }} + - - - + diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue index 36bd014..38eeec4 100644 --- a/src/views/quality/checkTypeProject/selectProject.vue +++ b/src/views/quality/checkTypeProject/selectProject.vue @@ -68,7 +68,7 @@ - + - +
- + - - - - + + + +

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

+ + + + +

白坯检验报告

+ + + - + - + + + + + + - - - - - - + - - - - - + + + + + - + + + + + + - + - + - - + - + - - - - - + - + {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - - - + {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - - - - - - - + - - - + - + + + + + + 下一步 + 下一步 + + + + + + { this.options1 = response.rows; }); + this.queryAuxiliaryEquipmentParams.equipmentCategory = '0'; listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => { + console.log("listEquipment") this.auxiliaryEquipmentLeftList = []; - this.auxiliaryEquipmentRightList = []; for (let i in response.rows) { // 将返回的列表赋值于穿梭框左边列表 this.auxiliaryEquipmentLeftList.push({ key: response.rows[i].equipmentCode, - label: response.rows[i].equipmentName, + label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark, }); } - for (let i in response.selected) { - this.auxiliaryEquipmentRightList.push(response.selected[i].key); - this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList; - } + console.log(this.auxiliaryEquipmentRightList) }); + getEquipment(equipmentId).then((response) => { + console.log("getEquipment") this.form = response.data; this.rightList = []; for (let i in response.data.selectedData) { @@ -1465,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/itemBYRecords.vue b/src/views/wms/equipment/itemBYRecords.vue new file mode 100644 index 0000000..92ad749 --- /dev/null +++ b/src/views/wms/equipment/itemBYRecords.vue @@ -0,0 +1,168 @@ + + + diff --git a/src/views/wms/equipment/itemEquipment.vue b/src/views/wms/equipment/itemEquipment.vue index 248da2a..5379335 100644 --- a/src/views/wms/equipment/itemEquipment.vue +++ b/src/views/wms/equipment/itemEquipment.vue @@ -16,6 +16,7 @@ @@ -27,6 +28,7 @@