diff --git a/src/assets/css/base.css b/src/assets/css/base.css index 2b6f775..dd11f29 100644 --- a/src/assets/css/base.css +++ b/src/assets/css/base.css @@ -595,4 +595,7 @@ li { } .el-select-v2__wrapper.is-focused{ border-color:#CCCCCC; +} +.el-input.is-disabled .el-input__inner { + color: #818A92; } \ No newline at end of file diff --git a/src/components/queryComponent/index.vue b/src/components/queryComponent/index.vue index 23b2ece..ffca081 100644 --- a/src/components/queryComponent/index.vue +++ b/src/components/queryComponent/index.vue @@ -140,26 +140,24 @@ export default { type: "warning", }) .then(() => { - return put('/admin/ap/custdemandverhead/issueglobalallversion') - }) - .then(() => { - // this.msgSuccess("全局发布成功"); - ElMessage({ - showClose: true, - message: '全局发布成功', - type: 'success', - duration: 0 + put('/admin/ap/custdemandverhead/issueglobalallversion').then(() => { + ElMessage({ + showClose: true, + message: '全局发布成功', + type: 'success', + duration: 0 + }) + this.$emit('batchReleaseEmit', true) }) - this.$emit('batchReleaseEmit', true) + .catch(({msg}) => { + ElMessage({ + showClose: true, + message: msg, + type: 'error', + duration: 0 + }) + }); }) - .catch(({msg}) => { - ElMessage({ - showClose: true, - message: msg, - type: 'error', - duration: 0 - }) - }); }, // 全局反发布 contraryReleaseAll() { @@ -169,19 +167,23 @@ export default { type: "warning", }) .then(() => { - return put('/admin/ap/custdemandverhead/removeissueglobalallversion') - }) - .then(() => { - // this.msgSuccess("全局反发布成功"); - ElMessage({ - showClose: true, - message: '全局反发布成功', - type: 'success', - duration: 0 - }) - this.$emit('batchReleaseEmit', true) + put('/admin/ap/custdemandverhead/removeissueglobalallversion').then(() => { + ElMessage({ + showClose: true, + message: '全局反发布成功', + type: 'success', + duration: 0 + }) + this.$emit('batchReleaseEmit', true) + }).catch(({msg}) => { + ElMessage({ + showClose: true, + message: msg, + type: 'error', + duration: 0 + }) + }); }) - .catch(() => { }); }, // 上传 handleUpload() { diff --git a/src/server/productionPlanning/customerForecastDemandReview.js b/src/server/productionPlanning/customerForecastDemandReview.js index 4f62c85..6ef531b 100644 --- a/src/server/productionPlanning/customerForecastDemandReview.js +++ b/src/server/productionPlanning/customerForecastDemandReview.js @@ -48,7 +48,7 @@ export const reloadData = (params) => postForm('/admin/ap/balance/refreshdata',p // 刷新数据 export const refreshData = (data) => postForm('/admin/ap/balance/refreshcustomerarticledemand',data) -export const publicData = (data) => post('admin/ap/balance/publishmpsplan',data) +export const publicData = (data) => post('/admin/ap/balance/publishmpsplan',data) // 客户主要资源查询 export const searchResource = (artId) => get(`/admin/ap/articleresource/search/${artId}`); diff --git a/src/server/request.js b/src/server/request.js index 12c79b3..aad1a13 100644 --- a/src/server/request.js +++ b/src/server/request.js @@ -19,7 +19,6 @@ service.interceptors.request.use( return Promise.reject(error); } ); - service.interceptors.response.use( (response) => { const code = response.data.code; @@ -27,8 +26,14 @@ service.interceptors.response.use( switchValue = true; return response.data; } + return response.data; }, (error) => { + if (error.response.config.url == '/admin/ap/custdemandverhead/removeissueglobalallversion' || + error.response.config.url == '/admin/ap/custdemandverhead/issueglobalallversion' || + error.response.config.url == '/admin/ap/balance/publishmpsplan') { + return Promise.reject(error.response.data); + } if ( error.response && error.response.data && diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue index 9d230f4..9197248 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue @@ -74,6 +74,7 @@