diff --git a/src/api/orderManagement/exceptionOrder.js b/src/api/orderManagement/exceptionOrder.js index 13fd346..8eb747a 100644 --- a/src/api/orderManagement/exceptionOrder.js +++ b/src/api/orderManagement/exceptionOrder.js @@ -1,14 +1,10 @@ import request from '@/axios'; //列表接口 -export const getList = (current, size, params) => { +export const getList = (params) => { return request({ url: '/blade-desk/order/yieldOrder/pageException', method: 'get', - params: { - ...params, - current, - size, - }, + params }); }; @@ -17,23 +13,42 @@ export const closeBatchs = ids => { return request({ url: '/blade-desk/order/yieldOrder/closeBatch', method: 'post', - data: ids, + params: ids, }); }; -//批量合格校验 -export const confirmBatch = ids => { + +// 修改 +export const updateData = data => { return request({ - url: '/blade-desk/order/yieldOrder/confirmBatch', + url: '/blade-desk/order/yieldOrder/update', method: 'post', - data: ids, + data }); }; + //批量合格校验 -export const edit = ids => { +// export const confirmBatch = ids => { +// return request({ +// url: '/blade-desk/order/yieldOrder/confirmBatch', +// method: 'post', +// params: ids, +// }); +// }; +// //批量合格校验 +// export const edit = ids => { +// return request({ +// url: '/blade-desk/order/yieldOrder/update', +// method: 'post', +// data: ids, +// }); +// }; + +// 合规校验 +export const verificationData = (params) =>{ return request({ - url: '/blade-desk/order/yieldOrder/update', + url: '/blade-desk/order/yieldOrder/dataVerify', method: 'post', - data: ids, + params }); -}; +} diff --git a/src/api/orderManagement/moldPlan.js b/src/api/orderManagement/moldPlan.js index af678ad..34510cc 100644 --- a/src/api/orderManagement/moldPlan.js +++ b/src/api/orderManagement/moldPlan.js @@ -63,4 +63,38 @@ export const getListpageNearlyMonth = (current, size, params) => { size, }, }); +}; + +// 零件下拉 +export const getPartList = () =>{ + return request({ + url:'/api/blade-desk/dsPart/getPartList', + method:'get' + }) +} + +// 获取生产标识下拉 +export const getProdIdentList = () => { + return request({ + url: '/api/blade-desk/BA/ProdMark/listForSelect', + method: 'get', + }); +}; + +// 根据角色别名查询用户 +export const getUserByRoleAlias = (params) => { + return request({ + url: '/api/blade-system/user/list-all-by-role-alias', + method: 'get', + params, + }); +}; + +// 获取申报记录列表 +export const getApplyList = (params) => { + return request({ + url: '/api/blade-desk/order/moldPlan/pageApply', + method: 'get', + params + }); }; \ No newline at end of file diff --git a/src/api/productionManagement/addRequirements.js b/src/api/productionManagement/addRequirements.js index fd6a082..cae168f 100644 --- a/src/api/productionManagement/addRequirements.js +++ b/src/api/productionManagement/addRequirements.js @@ -1,14 +1,10 @@ import request from '@/axios'; //列表接口 -export const getList = (current, size, params) => { +export const getList = (params) => { return request({ url: '/blade-desk/order/plateGoodsApply/page', method: 'get', - params: { - ...params, - current, - size, - }, + params }); }; //新增 diff --git a/src/api/productionManagement/assayedContent.js b/src/api/productionManagement/assayedContent.js index bd5fd82..6f9bdb4 100644 --- a/src/api/productionManagement/assayedContent.js +++ b/src/api/productionManagement/assayedContent.js @@ -1,14 +1,10 @@ import request from '@/axios'; //列表接口 -export const getList = (current, size, params) => { +export const getList = (params) => { return request({ url: '/blade-desk/order/assayContent/page', method: 'get', - params: { - ...params, - current, - size, - }, + params }); }; //新增 diff --git a/src/api/productionManagement/coatingMaterial.js b/src/api/productionManagement/coatingMaterial.js index 011741f..01542c3 100644 --- a/src/api/productionManagement/coatingMaterial.js +++ b/src/api/productionManagement/coatingMaterial.js @@ -1,14 +1,10 @@ import request from '@/axios'; -//列表接口 -export const getList = (current, size, params) => { +//镀层物料需求申报列表接口 +export const getList = (params) => { return request({ url: '/blade-desk/order/plateGoodsRecord/page', method: 'get', - params: { - ...params, - current, - size, - }, + params, }); }; //新增 diff --git a/src/views/basicData/components/addEditDialog.vue b/src/views/basicData/components/addEditDialog.vue index 9ec332c..3b2cecf 100644 --- a/src/views/basicData/components/addEditDialog.vue +++ b/src/views/basicData/components/addEditDialog.vue @@ -263,6 +263,8 @@ export default { this.$message.success('保存成功'); this.closeDialog(true); } + }).catch(err =>{ + this.closeDialog(); }) }) }, diff --git a/src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue b/src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue index b675530..fa7052e 100644 --- a/src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue +++ b/src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue @@ -91,11 +91,11 @@ :remote-method="remoteMethodLocation" -->