diff --git a/index.html b/index.html index 66df0e6..c2f9877 100644 --- a/index.html +++ b/index.html @@ -22,6 +22,7 @@ + 电镀智能化生产管理系统 diff --git a/src/App.vue b/src/App.vue index a1ba601..0aa6bf8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -76,7 +76,7 @@ body, box-sizing: border-box; padding-top: var(--el-dialog-padding-primary); text-align: right; - z-index: 2; + z-index: 200; display: block; padding: 10px 16px; box-sizing: border-box; diff --git a/src/api/qualityManagement/productionTesting/productionDisposition.js b/src/api/qualityManagement/productionTesting/productionDisposition.js new file mode 100644 index 0000000..1668843 --- /dev/null +++ b/src/api/qualityManagement/productionTesting/productionDisposition.js @@ -0,0 +1,56 @@ +// 生产处置单 +import request from '@/axios'; + +// 获取故障分类下拉 +export const getFaultClassList = (params) => { + return request({ + url: '/api/blade-desk/QA/Ng/listForSelectGZLB', + method: 'get', + params + }); +}; + +// 获取问题大类下拉 +export const getQuestionClassList = (params) => { + return request({ + url: '/api/blade-desk/QA/Ng/listForSelectWTDL', + method: 'get', + params + }); +}; + +// 获取问题小类下拉 +export const getQuestionClassList2 = (params) => { + return request({ + url: '/api/blade-desk/QA/Ng/listForSelectWTXL', + method: 'get', + params + }); +}; + +// 生产处置单列表 +export const getProductionDispositionList = (data) => { + return request({ + url: '/api/blade-desk/QA/ReviewSheet/listInit', + method: 'post', + data + }); +}; + +// 生产处置单详细 +export const getProductionDispositionDetail = (params) => { + return request({ + url: '/api/blade-desk/QA/ReviewSheet/detail', + method: 'get', + params + }); +}; + +// 生产处置单提交 +export const createProductionDisposition = (data) => { + return request({ + url: '/api/blade-desk/QA/ReviewSheet/fill', + method: 'post', + data + }); +}; \ No newline at end of file diff --git a/src/api/qualityManagement/productionTesting/productionQuality.js b/src/api/qualityManagement/productionTesting/productionQuality.js index 7caea03..7c572d5 100644 --- a/src/api/qualityManagement/productionTesting/productionQuality.js +++ b/src/api/qualityManagement/productionTesting/productionQuality.js @@ -10,6 +10,15 @@ export const getSupplierList = (params) => { }); }; +// 手动生成质量检验 +export const createInspection = (data) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/startNew', + method: 'post', + data + }); +}; + // 获取生产质量检验 export const getInspectionList = (data) => { return request({ @@ -17,4 +26,94 @@ export const getInspectionList = (data) => { method: 'post', data }); +}; + +// 生产质量检验详情 +export const getInspectionDetail = (params) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/detail', + method: 'get', + params + }); +}; + +// 生产质量检验结果填报 +export const fillInspection = (data) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/fill', + method: 'post', + data + }); +}; + +// 获取同炉同槽列表 +export const getSameLotList = (params) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/getSameList', + method: 'get', + params + }); +}; + +// 同槽同炉结果应用 +export const applySameLot = (params) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/sameResultCopy', + method: 'get', + params + }); +}; + +// 获取硬度数据列表 +export const getHardnessList = (params) => { + return request({ + url: '/api/blade-desk/QA/IotHardness/getDataFirst', + method: 'get', + params + }); +}; + +// 刷新硬度数据 +export const refreshHardness = (params) => { + return request({ + url: '/api/blade-desk/QA/IotHardness/getDataRefresh', + method: 'get', + params + }); +}; + +// 获取测厚数据 +export const getThicknessList = (params) => { + return request({ + url: '/api/blade-desk/QA/IotThickness/getData', + method: 'get', + params + }); +}; + +// 质量记录跳转 +export const goQualityRecord = (params) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/toQaRecord', + method: 'get', + params + }); +}; + +// 合格证跳转 +export const goCertificate = (params) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/toCertificate', + method: 'get', + params + }); +}; + +// 烧结包装防护-子件 +export const getSubPackageList = (params) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/subPartList', + method: 'get', + params + }); }; \ No newline at end of file diff --git a/src/views/productionDisposition/hearingDialog.vue b/src/views/productionDisposition/hearingDialog.vue index 6095111..dc691f1 100644 --- a/src/views/productionDisposition/hearingDialog.vue +++ b/src/views/productionDisposition/hearingDialog.vue @@ -2,89 +2,96 @@
审理类型： - + erp审理 内部审理
+
+ 历史订单： + + + + +
- WO-898789988WO - 镀后检验 - 9887898 - 9088909887 - 78 - 78765688 - 物料1 + {{detailInfo.woCode}} + {{detailInfo.productionDisposition}} + {{detailInfo.cardNo}} + {{detailInfo.batchNo}} + {{detailInfo.totalNum}} + {{detailInfo.partCode}} + {{detailInfo.materialName}} - + - + - - + - + - + - + - + - + - - - - - + + + + + - + - + - + 返修 报废 - + - + - - - - - + + + + + @@ -146,62 +153,63 @@
- 插入一行 - 删除选择行 + 插入一行 + 删除选择行
- + - + - + - + - + @@ -209,8 +217,8 @@
- 插入一行 - 删除选择行 + 插入一行 + 删除选择行
*责任零件 + @@ -46,37 +49,36 @@ {{ dialogData.woCode }} - {{ dialogData.partCode }} + {{ dialogData.prodCode }} {{ - dialogData.pjYieldOrder.productType + dialogData.prodType }} {{ - dialogData.pjYieldOrder.prodIdent + dialogData.prodIdent }} {{ dialogData.batchNo }} {{ - dialogData.pjYieldOrder.partName + dialogData.prodName }} - {{ dialogData.makeQty }} + {{ dialogData.poQty }} {{ - dialogData.pjYieldOrder.poArea + dialogData.area }} - {{ dsPart.plate }} + {{ dialogData.platingInfo }} {{ - dialogData.pjYieldOrder.primaryCraft - }} - {{ dialogData.testQty }} - {{ dialogData.lossQty }} - {{ dialogData.scrapQty }} - {{ dsPart.hardness }} - - {{ - dsPart.cruxMemo + dialogData.process }} - {{ dsPart.memo }} + {{ dialogData.orderCheckQty }} + {{ dialogData.orderLossQty }} + {{ dialogData.orderScrapQty }} + {{ dialogData.hardness }} + {{dialogData.processSpec}} + {{dialogData.keyInfo}} + {{ dialogData.remark }} -

1、提醒内容1

-

2、提醒内容2

+

{{item.remindContent}}

+
@@ -102,7 +104,7 @@
获取硬度检测值 质量记录 - 合格证
@@ -128,21 +130,26 @@ :data="vxeTableData" show-overflow-tooltip :row-class-name="getRowClass" - row-key="wpiId" + row-key="id" :expand-row-keys="expandedRowKeys" @expand-change="handleExpandChange" + :default-expand-all="false" >