diff --git a/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js b/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js index e3cb7c1e..b4db94bd 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/views/periodicTesting/components/addTestProjectDialog.vue b/src/views/periodicTesting/components/addTestProjectDialog.vue index cffc7b18..997cfd09 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 90a12645..10ccb6f3 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 9cad611a..10c49475 100644 --- a/src/views/periodicTesting/testTask.vue +++ b/src/views/periodicTesting/testTask.vue @@ -19,7 +19,7 @@ @on-load="onLoad" >