diff --git a/src/api/productionSchedulingPlan/basic.js b/src/api/productionSchedulingPlan/basic.js index b4a336d..ca7b525 100644 --- a/src/api/productionSchedulingPlan/basic.js +++ b/src/api/productionSchedulingPlan/basic.js @@ -332,4 +332,51 @@ export const getDetailOutsourceProcess = params => { method: 'get', params: params, }); +}; + +// 烧结温度曲线 增删改查 +export const getListSintTempCurve = (current, size, params) => { + return request({ + url: '/blade-scheduling/sintTempCurve/page', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; +export const removeSintTempCurve = ids => { + return request({ + url: '/blade-scheduling/sintTempCurve/remove', + method: 'post', + params: { + ids, + }, + }); +}; + +export const addSintTempCurve = row => { + return request({ + url: '/blade-scheduling/sintTempCurve/save', + method: 'post', + data: row, + }); +}; + +export const updateSintTempCurve = row => { + return request({ + url: '/blade-scheduling/sintTempCurve/update', + method: 'post', + data: row, + }); +}; + + +export const getDetailSintTempCurve = params => { + return request({ + url: '/blade-scheduling/outsourceProcess/detail', + method: 'get', + params: params, + }); }; \ No newline at end of file diff --git a/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js b/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js index e3cb7c1..b4db94b 100644 --- a/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js +++ b/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js @@ -12,7 +12,7 @@ export const getList = (params) => { // 新增 export const addRecords = (data) =>{ return request({ - url:'/api/blade-desk/QA/ProReTemplate/save', + url:'/api/blade-desk/QA/ProReTemplate/saveBat', method:'post', data }) @@ -34,4 +34,66 @@ export const deleteRecords = (params) =>{ method:"post", params }) +} + +// 电子档案详情 +export const getWordDetail = (params) =>{ + return request({ + url:'/api/blade-desk/QA/ProReTemplate/detail', + method:'get', + params + }) +} + +// 复制 +export const copyData = (params) =>{ + return request({ + url:'/api/blade-desk/QA/ProReTemplate/copy', + method:'get', + params + }) +} + +// 获取作业中心下拉 +export const getWorkList = (params) =>{ + return request({ + url:'/api/blade-desk/BA/WorkCenter/listForSelect', + method:'get', + params + }) +} + +// 获取工序下拉数据 +export const getProcessList = (params) =>{ + return request({ + url:'/api/blade-desk/dsProcess/list', + method:'get', + params + }) +} + +// 维护电子档案 +export const editTable = (data) =>{ + return request({ + url:'/api/blade-desk/QA/ProReTemplate/updateDetail', + method:'post', + data + }) +} + +// 删除电子档案数据 +export const deleteTable = (params) =>{ + return request({ + url:'/api/blade-desk/QA/ProReTemplate/removeFromDetail', + method:'get', + params + }) +} + +// 获取过程记录模板-审批状态字典 +export const getApprovalStatus = (params) =>{ + return request({ + url:'/api/blade-system/dict/dictionary?code=ProReTemplate-ApprovalStatus', + method:'get' + }) } \ No newline at end of file diff --git a/src/error.js b/src/error.js index d2b5611..4f2f850 100644 --- a/src/error.js +++ b/src/error.js @@ -9,7 +9,7 @@ export default { stack: err.stack, info, }); - if (process.env.NODE_ENV === 'development') { + // if (process.env.NODE_ENV === 'development') { console.group('>>>>>> 错误信息 >>>>>>'); console.log(info); console.groupEnd(); @@ -19,7 +19,7 @@ export default { console.group('>>>>>> Error >>>>>>'); console.log(err); console.groupEnd(); - } + // } }; }, }; diff --git a/src/router/page/index.js b/src/router/page/index.js index 9b9d33a..96837bd 100644 --- a/src/router/page/index.js +++ b/src/router/page/index.js @@ -72,7 +72,7 @@ export default [ }, { path: '/SCHEDULING_DASHBOARD', - component: () => import(/* webpackChunkName: "page" */ '@/views/productionSchedulingPlan/schedulingDashboard/index.vue'), + component: () => import(/* webpackChunkName: "page" */ '@/views/productionSchedulingPlan/schedulingDashboard/container.vue'), name: '排产看板', meta: { keepAlive: true, diff --git a/src/views/periodicTesting/components/addTestProjectDialog.vue b/src/views/periodicTesting/components/addTestProjectDialog.vue index cffc7b1..997cfd0 100644 --- a/src/views/periodicTesting/components/addTestProjectDialog.vue +++ b/src/views/periodicTesting/components/addTestProjectDialog.vue @@ -146,6 +146,10 @@ export default { standardAttachId:this.ruleForm.standardValue == 6 ? this.fileList.length != 0 ? this.fileList.map(item => item.attachId).join(',') : '' : '', cycleTestStandardName:this.ruleForm.standardValue == 6 ? this.ruleForm.cycleTestStandardName : '' } + if(this.ruleForm.standardValue == 6 && params.standardAttachId != '' && params.cycleTestStandardName == ''){ + this.$message.error('请填写标准名称') + return + } update(params).then(res => { // 获取新增数据的相关字段 this.$message({ @@ -164,6 +168,11 @@ export default { standardAttachId:this.ruleForm.standardValue == 6 ? this.fileList.length != 0 ? this.fileList.map(item => item.attachId).join(',') : '' : '', cycleTestStandardName:this.ruleForm.standardValue == 6 ? this.ruleForm.cycleTestStandardName : '' } + console.log('params---------------',params) + if(this.ruleForm.standardValue == 6 && params.standardAttachId != '' && params.cycleTestStandardName == ''){ + this.$message.error('请填写标准名称') + return + } add(params).then( res => { // 获取新增数据的相关字段 @@ -179,6 +188,9 @@ export default { } ); } + if(this.title == '详情'){ + this.closeDialog() + } } }); }, diff --git a/src/views/periodicTesting/projectCycle.vue b/src/views/periodicTesting/projectCycle.vue index 90a1264..10ccb6f 100644 --- a/src/views/periodicTesting/projectCycle.vue +++ b/src/views/periodicTesting/projectCycle.vue @@ -272,6 +272,30 @@ export default { gridBtn: false, searchMenuPosition: 'right', column: [ + { + label: '试验项目', + prop: 'cycleTestItemName', + search: false, + type: 'select', + sortable: true, + filter: true, + width: 200, + }, + { + label: '试验条件', + prop: 'cycleTestItemCondition', + search: false, + sortable: true, + filter: true, + width: 200, + }, + { + label: '试验标准', + prop: 'cycleTestStandardName', + search: false, + sortable: true, + width: 200, + }, { label: '镀种', prop: 'plateName', @@ -319,30 +343,7 @@ export default { return res.data }, }, - { - label: '试验项目', - prop: 'cycleTestItemName', - search: false, - type: 'select', - sortable: true, - filter: true, - width: 200, - }, - { - label: '试验条件', - prop: 'cycleTestItemCondition', - search: false, - sortable: true, - filter: true, - width: 200, - }, - { - label: '试验标准', - prop: 'cycleTestStandardName', - search: false, - sortable: true, - width: 200, - }, + { label: '工艺员', diff --git a/src/views/periodicTesting/testTask.vue b/src/views/periodicTesting/testTask.vue index 9cad611..10c4947 100644 --- a/src/views/periodicTesting/testTask.vue +++ b/src/views/periodicTesting/testTask.vue @@ -19,7 +19,7 @@ @on-load="onLoad" >