diff --git a/src/api/basicData/platingTypeInfo.js b/src/api/basicData/platingTypeInfo.js new file mode 100644 index 0000000..c7e5186 --- /dev/null +++ b/src/api/basicData/platingTypeInfo.js @@ -0,0 +1,39 @@ +// 镀种维护 +import request from '@/axios'; + +// 查询镀种列表 +export const getPlatingTypeList = params =>{ + return request({ + url:'/api/blade-desk/BA/Plating/list', + method:"get", + params + }) +} + +// 新增镀种 +export const createPlatingType = data =>{ + return request({ + url:'/api/blade-desk/BA/Plating/save', + method:"post", + data + }) +} + +// 修改镀种 +export const updatePlatingType = data =>{ + return request({ + url:'/api/blade-desk/BA/Plating/update', + method:"post", + data + }) +} + +// 删除镀种 +export const deletePlatingType = (params) =>{ + return request({ + url:'/api/blade-desk/BA/Plating/remove', + method:'post', + params + }) +} + diff --git a/src/api/qualityManagement/periodicTesting/projectCycle.js b/src/api/qualityManagement/periodicTesting/projectCycle.js index 65a8fb3..7f50ddf 100644 --- a/src/api/qualityManagement/periodicTesting/projectCycle.js +++ b/src/api/qualityManagement/periodicTesting/projectCycle.js @@ -65,7 +65,7 @@ export const remove = ids => { // 获取镀种列表 export const getPlateList = () => { return request({ - url:"/blade-desk/bsPlating/listForSelect", + url:"/api/blade-desk/BA/Plating/listForSelectCycleTest", method:'get', }) } diff --git a/src/api/qualityManagement/periodicTesting/testTask.js b/src/api/qualityManagement/periodicTesting/testTask.js index 32389d2..30fb5e0 100644 --- a/src/api/qualityManagement/periodicTesting/testTask.js +++ b/src/api/qualityManagement/periodicTesting/testTask.js @@ -14,6 +14,14 @@ export const getList = (current, size, params,filterType) => { }); }; +export const getTaskList = data =>{ + return request({ + url: '/api/blade-desk/QA/CycleTestTask/listSearch', + method: 'post', + data + }); +} + // 新增 export const add = row => { return request({ @@ -90,4 +98,12 @@ export const writeTask = (params) =>{ }) } - +// 导出接口 +export const exportExcel = (data) =>{ + return request({ + url:'/api/blade-desk/QA/CycleTestTask/export-excel', + method:'post', + data, + responseType: "blob", + }) +} diff --git a/src/api/tankSolutionSystem/resultsCon.js b/src/api/tankSolutionSystem/resultsCon.js index d89d720..100ebb9 100644 --- a/src/api/tankSolutionSystem/resultsCon.js +++ b/src/api/tankSolutionSystem/resultsCon.js @@ -12,7 +12,7 @@ export const getReportList = params =>{ // 生成报告列表 export const generateReport = (params) =>{ return request({ - url:"/api/blade-desk/QA/LiquidTankTaskCopy/list", + url:"/api/blade-desk/QA/LiquidTankTaskCopy/listReport", method:'get', params }) diff --git a/src/views/periodicTesting/components/addProjectCycleDialog.vue b/src/views/periodicTesting/components/addProjectCycleDialog.vue index a599f5e..ca84a43 100644 --- a/src/views/periodicTesting/components/addProjectCycleDialog.vue +++ b/src/views/periodicTesting/components/addProjectCycleDialog.vue @@ -14,6 +14,14 @@ v-show="title == '新增' || title == '编辑'" > + + + + + + + + @@ -41,14 +49,7 @@ - - - - - - + @@ -86,7 +87,7 @@ v-model="projectForm.testDuration" controls-position="right" @change="handleChange" - :min="0" + :min="1" > @@ -118,8 +119,8 @@ v-model="projectForm.remind" controls-position="right" @change="handleChange" - :min="projectForm.testDuration" - :max="Number(projectForm.testDuration) + Number(projectForm.genBefore)" + :min="projectForm.genBefore || 0" + :max="(Number(projectForm.testDuration) || 0) + (Number(projectForm.genBefore) || 0)" > @@ -318,7 +319,9 @@ export default { openShow: false, projectOption:[], pieceList:[], - projectForm: {}, + projectForm: { + projectCycle:1 + }, projectRules: { cycleTestItemId: [{ required: true, message: '请输入项目名称', trigger: 'blur' }], testType: [{ required: true, message: '请选择试验件', trigger: 'blur' }], @@ -329,6 +332,7 @@ export default { jobType: [{ required: true, message: '请选择试验周期', trigger: 'blur' }], testMat:[{required:true,message:'请输入试验件材料',trigger:'blur'}], minDoTestCount:[{required:true,message:'请输入最小试验数量',trigger:'blur'}], + plateIds:[{required:true,message:'请选择镀种',trigger:'blur'}] }, userData:[], monthTags:[], @@ -341,6 +345,7 @@ export default { if(this.row && this.row.id){ this.getRowDetail(this.row.id) } + this.projectForm.testDuration = 1 this.getPieces() this.getUsers() this.getProject() @@ -510,9 +515,10 @@ export default { return month + day; }); } + console.log('projectForm-----------',this.projectForm) let params = { testType:this.projectForm.testType, - plateName:this.projectForm.plateName, + // plateName:this.projectForm.plateName, cycleTestItemId:this.projectForm.cycleTestItemId, cycleTestItemCondition:this.projectForm.cycleTestItemCondition, cycleTestItemStandard:this.projectForm.cycleTestItemStandard, @@ -526,9 +532,10 @@ export default { isPutOff:this.projectForm.isPutOff ? 1 : 0, minDoTestCount:this.projectForm.minDoTestCount, testMat:this.projectForm.testMat, + plateIds:this.projectForm.plateIds.join(",") } - console.log('title--------------',this.title) + console.log('params--------------',params) if(this.title == '新增'){ params.processUserIds = this.projectForm.processUserIds.length != 0 ? this.projectForm.processUserIds.join(',') : '' console.log('params==============',params) diff --git a/src/views/periodicTesting/components/viewDialog.vue b/src/views/periodicTesting/components/viewDialog.vue index 315f9dc..03d6db2 100644 --- a/src/views/periodicTesting/components/viewDialog.vue +++ b/src/views/periodicTesting/components/viewDialog.vue @@ -4,65 +4,68 @@
任务信息
- + 任务编号:{{detailForm.code}} - + 试验项目:{{detailForm.cycleTestItemName}} - + 试验件:{{detailForm.testTypeName}} - + 试验标准: {{detailForm.cycleTestStandardName}} - - - + + + 试验条件:{{detailForm.cycleTestItemCondition}} - + 工艺员:{{detailForm.processUserName}} - - + 任务状态:{{detailForm.statusName}} - + + 超期原因:{{detailForm.reasonForOut}} + + + + 任务生成时间:{{detailForm.genDatetime}} - - - + 任务下发时间:{{detailForm.issueDate}} - + 任务接收时间:{{detailForm.acceptDate}} - + 任务完成时间:{{detailForm.finishDate}}
试验结果
- - + + 试验结果: {{detailForm.originalName}} - + 试验时间: {{detailForm.testDate}} - - - + + + 未试验原因:{{detailForm.reasonForNo}} diff --git a/src/views/periodicTesting/projectCycle.vue b/src/views/periodicTesting/projectCycle.vue index c5a7218..c07db95 100644 --- a/src/views/periodicTesting/projectCycle.vue +++ b/src/views/periodicTesting/projectCycle.vue @@ -256,7 +256,7 @@ export default { delBtnIcon: ' ', editBtnIcon: ' ', labelWidth: 120, - // menuWidth: 330, + menuWidth: 190, dialogWidth: 600, dialogClickModal: false, searchEnter: true, @@ -272,6 +272,14 @@ export default { gridBtn: false, searchMenuPosition: 'right', column: [ + { + label: '镀种', + prop: 'plateNames', + search: false, + sortable: true, + filter: true, + width: 150, + }, { label: '试验项目', prop: 'cycleTestItemName', @@ -296,14 +304,6 @@ export default { sortable: true, width: 200, }, - { - label: '镀种', - prop: 'plateName', - search: false, - sortable: true, - filter: true, - width: 150, - }, { label: '试验件', prop: 'testTypeName', diff --git a/src/views/periodicTesting/testTask.vue b/src/views/periodicTesting/testTask.vue index 1e22fb4..559a2e0 100644 --- a/src/views/periodicTesting/testTask.vue +++ b/src/views/periodicTesting/testTask.vue @@ -20,6 +20,7 @@ >