diff --git a/src/api/productionTesting/InspectionTemplate.js b/src/api/productionTesting/InspectionTemplate.js index 872fe89..1db3e0d 100644 --- a/src/api/productionTesting/InspectionTemplate.js +++ b/src/api/productionTesting/InspectionTemplate.js @@ -18,6 +18,14 @@ export const addTemplate = (data) =>{ }) } +export const editTemplate = (data) =>{ + return request({ + url:'/api/blade-desk/QA/InspectionTemplate/update', + method:"post", + data + }) +} + // 标准下拉 export const getStandard = (params) =>{ return request({ diff --git a/src/api/qualityManagement/productionTesting/prPlanTestRec.js b/src/api/qualityManagement/productionTesting/prPlanTestRec.js new file mode 100644 index 0000000..bbe0a19 --- /dev/null +++ b/src/api/qualityManagement/productionTesting/prPlanTestRec.js @@ -0,0 +1,19 @@ +import request from '@/axios'; + +// 获取列表 +export const getList = (params) =>{ + return request({ + url:'/api/blade-desk/QA/PlanTest/list', + method:'get', + params + }) +} + +// 详情 +export const getDetail = (params) =>{ + return request({ + url:'/api/blade-desk/QA/PlanTest/detail', + method:'get', + params + }) +} \ No newline at end of file diff --git a/src/api/qualityManagement/qualityObjective.js b/src/api/qualityManagement/qualityObjective.js index 83023cd..ccfc50d 100644 --- a/src/api/qualityManagement/qualityObjective.js +++ b/src/api/qualityManagement/qualityObjective.js @@ -106,4 +106,13 @@ export const deleteYear = (params) =>{ method:'post', params }) +} + +// 根据作业中心获取班组 +export const getTeam = (params) =>{ + return request({ + url:'/api/blade-desk/BA/TeamSet/listForSelectByWcId', + method:"get", + params + }) } \ No newline at end of file diff --git a/src/views/periodicTesting/components/addProjectCycleDialog.vue b/src/views/periodicTesting/components/addProjectCycleDialog.vue index dd84893..81c4add 100644 --- a/src/views/periodicTesting/components/addProjectCycleDialog.vue +++ b/src/views/periodicTesting/components/addProjectCycleDialog.vue @@ -42,10 +42,11 @@ - - + + + @@ -72,8 +73,8 @@ - - + + @@ -85,7 +86,7 @@ v-model="projectForm.testDuration" controls-position="right" @change="handleChange" - :min="1" + :min="0" > @@ -97,7 +98,7 @@ v-model="projectForm.genBefore" controls-position="right" @change="handleChange" - :min="1" + :min="0" > @@ -110,6 +111,7 @@ controls-position="right" @change="handleChange" :min="projectForm.testDuration" + :max="Number(projectForm.testDuration) + Number(projectForm.genBefore)" > @@ -312,8 +314,10 @@ export default { projectRules: { cycleTestItemId: [{ required: true, message: '请输入项目名称', trigger: 'blur' }], testType: [{ required: true, message: '请选择试验件', trigger: 'blur' }], - processUserId: [{ required: true, message: '请选择工艺员', trigger: 'blur' }], + processUserIds: [{ required: true, message: '请选择工艺员', trigger: 'blur' }], remind: [{ required: true, message: '请选择超期提醒', trigger: 'blur' }], + genBefore: [{ required: true, message: '请选择提前下发', trigger: 'blur' }], + testDuration: [{ required: true, message: '请选择试验时长', trigger: 'blur' }], jobType: [{ required: true, message: '请选择试验周期', trigger: 'blur' }], testMat:[{required:true,message:'请输入试验件材料',trigger:'blur'}], minDoTestCount:[{required:true,message:'请输入最小试验数量',trigger:'blur'}], @@ -345,7 +349,8 @@ export default { this.projectForm = { ...res.data.data, isPutOff:res.data.data.isPutOff == 1 ? true : false, - testType:res.data.data.testType != '' ? res.data.data.testType + '' : '' + testType:res.data.data.testType != '' ? res.data.data.testType + '' : '', + processUserIds:res.data.data.processUserId } if(this.projectForm.jobType == 1){ this.projectForm = { @@ -497,11 +502,10 @@ export default { } let params = { testType:this.projectForm.testType, - plateId:this.projectForm.plateId, + plateName:this.projectForm.plateName, cycleTestItemId:this.projectForm.cycleTestItemId, cycleTestItemCondition:this.projectForm.cycleTestItemCondition, cycleTestItemStandard:this.projectForm.cycleTestItemStandard, - processUserId:this.projectForm.processUserId ? this.projectForm.processUserId : '', testDuration:this.projectForm.testDuration ? this.projectForm.testDuration : '', genBefore:this.projectForm.genBefore ? this.projectForm.genBefore : '', remind:this.projectForm.remind, @@ -514,9 +518,10 @@ export default { testMat:this.projectForm.testMat, } - console.log('params==============',params) console.log('title--------------',this.title) if(this.title == '新增'){ + params.processUserIds = this.projectForm.processUserIds.length != 0 ? this.projectForm.processUserIds.join(',') : '' + console.log('params==============',params) add(params).then(res =>{ if(res.data.code == 200){ this.$message.success('新增成功') @@ -524,6 +529,8 @@ export default { } }) }else{ + params.processUserId = this.projectForm.processUserIds ? this.projectForm.processUserIds : '' + console.log('params==============',params) params.id = this.projectForm.id update(params).then(res =>{ if(res.data.code == 200){ diff --git a/src/views/periodicTesting/components/viewDialog.vue b/src/views/periodicTesting/components/viewDialog.vue index 826e51f..9ab6bc1 100644 --- a/src/views/periodicTesting/components/viewDialog.vue +++ b/src/views/periodicTesting/components/viewDialog.vue @@ -48,8 +48,8 @@ -
试验结果
-
+
试验结果
+
试验结果: diff --git a/src/views/periodicTesting/projectCycle.vue b/src/views/periodicTesting/projectCycle.vue index bd42b61..826f084 100644 --- a/src/views/periodicTesting/projectCycle.vue +++ b/src/views/periodicTesting/projectCycle.vue @@ -55,7 +55,7 @@ > - + - + @@ -54,7 +54,7 @@ -
+
插入一行 删除选择行 @@ -110,7 +110,7 @@