diff --git a/src/api/orderManagement/allocationMessQuery.js b/src/api/orderManagement/allocationMessQuery.js index 0e54c1d..750f71f 100644 --- a/src/api/orderManagement/allocationMessQuery.js +++ b/src/api/orderManagement/allocationMessQuery.js @@ -1,13 +1,9 @@ import request from '@/axios'; //列表接口 -export const getList = (current, size, params) => { +export const getList = (params) => { return request({ - url: '/blade-desk/order/yieldOrder/pageAllocation', + url: '/blade-desk/order/yieldPlan/pageAllocation', method: 'get', - params: { - ...params, - current, - size, - }, + params }); }; diff --git a/src/api/orderManagement/planYieIdOrder.js b/src/api/orderManagement/planYieIdOrder.js index 09c6832..8e60c06 100644 --- a/src/api/orderManagement/planYieIdOrder.js +++ b/src/api/orderManagement/planYieIdOrder.js @@ -90,7 +90,11 @@ export const getProdIdentList = () => { }); }; - - - - +// 获取生产工艺路线 +export const getProcessRouting = (params) => { + return request({ + url: '/api/blade-desk/order/yieldOrder/getCraftList', + method: 'post', + params, + }); +}; \ No newline at end of file diff --git a/src/api/orderManagement/sinTerPlanOrder.js b/src/api/orderManagement/sinTerPlanOrder.js index 3a2a699..5e168ed 100644 --- a/src/api/orderManagement/sinTerPlanOrder.js +++ b/src/api/orderManagement/sinTerPlanOrder.js @@ -54,3 +54,20 @@ export const closeBatchs = ids => { params: ids, }); }; + + +// 获取工艺路线 +export const getProcessRoute = (params) => { + return request({ + url: `/api/blade-desk/order/yieldPlan/getCraftData/${params.yieldPlanId}`, + method: 'get', + }); +}; + +// 获取工序接口 +export const getProcess = (params) => { + return request({ + url: `/api/blade-desk/order/yieldPlan/getFirstProcess/${params.partCode}`, + method: 'get', + }); +}; \ No newline at end of file diff --git a/src/api/outsourcingManagement/performanceCalculate.js b/src/api/outsourcingManagement/performanceCalculate.js new file mode 100644 index 0000000..0ea1656 --- /dev/null +++ b/src/api/outsourcingManagement/performanceCalculate.js @@ -0,0 +1,29 @@ +// 外协厂家绩效计算 +import request from '@/axios'; + +// 获取列表 +export const getList = params => { + return request({ + url: '/api/blade-desk/mesOemMerits/page', + method: 'get', + params + }); +}; + +// 维护厂家绩效 +export const maintenanceData = row => { + return request({ + url: '/api/blade-desk/mesOemMerits/maintenance', + method: 'post', + data: row + }); +}; + +// 校对厂家绩效 +export const checkData = row => { + return request({ + url: '/api/blade-desk/mesOemMerits/proofread', + method: 'post', + data: row + }); +}; \ No newline at end of file diff --git a/src/api/outsourcingManagement/performanceCheck.js b/src/api/outsourcingManagement/performanceCheck.js new file mode 100644 index 0000000..aeef633 --- /dev/null +++ b/src/api/outsourcingManagement/performanceCheck.js @@ -0,0 +1,11 @@ +// 外协厂家绩效评审 +import request from '@/axios'; + +// 获取列表 +export const getList = params => { + return request({ + url: '/api/blade-desk/mesOemMerits/page', + method: 'get', + params + }); +}; \ No newline at end of file diff --git a/src/api/outsourcingManagement/performanceReview.js b/src/api/outsourcingManagement/performanceReview.js new file mode 100644 index 0000000..8d25a33 --- /dev/null +++ b/src/api/outsourcingManagement/performanceReview.js @@ -0,0 +1,11 @@ +// 外协厂家绩效审核 +import request from '@/axios'; + +// 获取列表 +export const getList = params => { + return request({ + url: '/api/blade-desk/mesOemMerits/page', + method: 'get', + params + }); +}; \ No newline at end of file diff --git a/src/api/qualityManagement/productionTesting/productionQuality.js b/src/api/qualityManagement/productionTesting/productionQuality.js index 15f077c..27d7d64 100644 --- a/src/api/qualityManagement/productionTesting/productionQuality.js +++ b/src/api/qualityManagement/productionTesting/productionQuality.js @@ -101,11 +101,11 @@ export const goQualityRecord = (data) => { }; // 合格证跳转 -export const goCertificate = (params) => { +export const goCertificate = (data) => { return request({ - url: '/api/blade-desk/QA/reviewQualification', - method: 'get', - params + url: '/api/blade-desk/QA/InspectionTask/reviewQualification', + method: 'post', + data }); }; diff --git a/src/views/oem/performanceCalculate/components/millMeritsProduce.vue b/src/views/oem/performanceCalculate/components/millMeritsProduce.vue index 119026d..89c8b66 100644 --- a/src/views/oem/performanceCalculate/components/millMeritsProduce.vue +++ b/src/views/oem/performanceCalculate/components/millMeritsProduce.vue @@ -21,17 +21,60 @@ - - + diff --git a/src/views/oem/performanceCalculate/components/millMeritsQuality.vue b/src/views/oem/performanceCalculate/components/millMeritsQuality.vue index 39da121..a84e9f9 100644 --- a/src/views/oem/performanceCalculate/components/millMeritsQuality.vue +++ b/src/views/oem/performanceCalculate/components/millMeritsQuality.vue @@ -18,6 +18,84 @@ + + + + + + + + + + + + + + + + + + + + + @@ -25,6 +103,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/oem/performanceCheck/index.vue b/src/views/oem/performanceCheck/index.vue index 8be1e09..8ebdd57 100644 --- a/src/views/oem/performanceCheck/index.vue +++ b/src/views/oem/performanceCheck/index.vue @@ -19,6 +19,7 @@