|
|
|
|
@ -29,6 +29,7 @@ |
|
|
|
|
|
|
|
|
|
<el-button type="success" @click="handleUser">人员设置</el-button> |
|
|
|
|
<el-button type="primary" @click="handleCycle">批量设置周期</el-button> |
|
|
|
|
<el-button type="warning" @click="handleExport" plain>导出</el-button> |
|
|
|
|
</template> |
|
|
|
|
<template #menu-right> |
|
|
|
|
<el-button type="primary" @click="handleImport">导入</el-button> |
|
|
|
|
@ -184,7 +185,10 @@ |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { getList, remove,issueTask,getUserList,setUser,setCycleBat } from '@/api/qualityManagement/periodicTesting/projectCycle.js'; |
|
|
|
|
import NProgress from 'nprogress'; |
|
|
|
|
import 'nprogress/nprogress.css'; |
|
|
|
|
import { downloadXls } from '@/utils/util'; |
|
|
|
|
import { getList, remove,issueTask,getUserList,setUser,setCycleBat,exportExcel } from '@/api/qualityManagement/periodicTesting/projectCycle.js'; |
|
|
|
|
import addProjectCycleDialog from './components/addProjectCycleDialog.vue' |
|
|
|
|
import {dateFormat} from '@/utils/date' |
|
|
|
|
import basicImport from '@/components/basic-import/main.vue' |
|
|
|
|
@ -234,11 +238,13 @@ export default { |
|
|
|
|
cycleYearTags:[], |
|
|
|
|
option: { |
|
|
|
|
tip: false, |
|
|
|
|
align: 'center', |
|
|
|
|
size: 'medium', |
|
|
|
|
height: 'auto', |
|
|
|
|
calcHeight: 32, |
|
|
|
|
columnSort: true, |
|
|
|
|
searchShow: true, |
|
|
|
|
searchMenuSpan: 18, |
|
|
|
|
searchMenuSpan: 6, |
|
|
|
|
searchIcon: true, |
|
|
|
|
searchIndex: 3, |
|
|
|
|
tree: false, |
|
|
|
|
@ -260,14 +266,14 @@ export default { |
|
|
|
|
dialogWidth: 600, |
|
|
|
|
dialogClickModal: false, |
|
|
|
|
searchEnter: true, |
|
|
|
|
filterBtn: true, |
|
|
|
|
// filterBtn: true, |
|
|
|
|
searchShowBtn: false, |
|
|
|
|
excelBtn: true, |
|
|
|
|
// excelBtn: true, |
|
|
|
|
showOverflowTooltip: true, |
|
|
|
|
align: 'center', |
|
|
|
|
searchLabelPosition: 'left', |
|
|
|
|
searchGutter: 24, |
|
|
|
|
searchSpan: 6, |
|
|
|
|
searchGutter:24, |
|
|
|
|
searchSpan:6, |
|
|
|
|
menuAlign: 'left', |
|
|
|
|
gridBtn: false, |
|
|
|
|
searchMenuPosition: 'right', |
|
|
|
|
@ -280,6 +286,21 @@ export default { |
|
|
|
|
filter: true, |
|
|
|
|
width: 150, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '镀种', |
|
|
|
|
prop: 'plateId', |
|
|
|
|
type: 'select', |
|
|
|
|
hide: true, |
|
|
|
|
search: true, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
width: 150, |
|
|
|
|
dicUrl:"/api/blade-desk/BA/Plating/listForSelectCycleTest", |
|
|
|
|
props:{ |
|
|
|
|
label:'plating', |
|
|
|
|
value:'id' |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验项目', |
|
|
|
|
prop: 'cycleTestItemName', |
|
|
|
|
@ -287,12 +308,13 @@ export default { |
|
|
|
|
type: 'select', |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
|
|
|
|
|
width: 200, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验条件', |
|
|
|
|
prop: 'cycleTestItemCondition', |
|
|
|
|
search: false, |
|
|
|
|
search: true, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
width: 200, |
|
|
|
|
@ -300,17 +322,23 @@ export default { |
|
|
|
|
{ |
|
|
|
|
label: '试验标准', |
|
|
|
|
prop: 'cycleTestStandardName', |
|
|
|
|
search: false, |
|
|
|
|
search: true, |
|
|
|
|
sortable: true, |
|
|
|
|
width: 200, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验件', |
|
|
|
|
prop: 'testTypeName', |
|
|
|
|
search: false, |
|
|
|
|
prop: 'testType', |
|
|
|
|
search: true, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
width: 120, |
|
|
|
|
type: 'select', |
|
|
|
|
dicUrl:"/blade-system/dict/dictionary?code=testPiece", |
|
|
|
|
props:{ |
|
|
|
|
label: 'dictValue', |
|
|
|
|
value: 'dictKey' |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验件材料', |
|
|
|
|
@ -322,11 +350,17 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '工艺员', |
|
|
|
|
prop: 'processUserName', |
|
|
|
|
search: false, |
|
|
|
|
prop: 'processUserId', |
|
|
|
|
search: true, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
width: 160, |
|
|
|
|
type: 'select', |
|
|
|
|
dicUrl:'/blade-system/user/list-process-engineer', |
|
|
|
|
props:{ |
|
|
|
|
label:"name", |
|
|
|
|
value:"id" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验周期', |
|
|
|
|
@ -336,6 +370,20 @@ export default { |
|
|
|
|
filter: true, |
|
|
|
|
width: 120, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验周期', |
|
|
|
|
prop: 'jobTypes', |
|
|
|
|
type: 'select', |
|
|
|
|
search: true, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
width: 120, |
|
|
|
|
dicData:[ |
|
|
|
|
{ label:"周",value:1 }, |
|
|
|
|
{ label:"月",value:2 }, |
|
|
|
|
{ label:"年",value:3 }, |
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '最小试验数量', |
|
|
|
|
prop: 'minDoTestCount', |
|
|
|
|
@ -348,6 +396,7 @@ export default { |
|
|
|
|
label: '试验项目', |
|
|
|
|
prop: 'cycleTestItemId', |
|
|
|
|
search: true, |
|
|
|
|
searchOrder: 1, |
|
|
|
|
hide:true, |
|
|
|
|
type: 'select', |
|
|
|
|
sortable: true, |
|
|
|
|
@ -479,6 +528,20 @@ export default { |
|
|
|
|
this.cycleDialog = true |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 导出 |
|
|
|
|
handleExport(){ |
|
|
|
|
this.$confirm('是否导出周期性试验任务数据?', '提示', { |
|
|
|
|
confirmButtonText: '确定', |
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
type: 'warning', |
|
|
|
|
}).then(() => { |
|
|
|
|
NProgress.start(); |
|
|
|
|
exportExcel(this.query).then(res =>{ |
|
|
|
|
downloadXls(res.data, `试验周期表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`); |
|
|
|
|
NProgress.done(); |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
// 点击删除按钮 |
|
|
|
|
handleDelete(row) { |
|
|
|
|
this.$confirm('确定删除此条数据?', { |
|
|
|
|
@ -661,8 +724,19 @@ export default { |
|
|
|
|
}, |
|
|
|
|
onLoad(page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
let param = { |
|
|
|
|
...this.query, |
|
|
|
|
jobType:this.query.jobTypes |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const { jobTypes, ...validData } = param; |
|
|
|
|
console.log('validData----------',validData) |
|
|
|
|
|
|
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
getList({ |
|
|
|
|
current:this.page.currentPage, |
|
|
|
|
size:this.page.pageSize, |
|
|
|
|
...validData |
|
|
|
|
}).then(res => { |
|
|
|
|
this.data = res.data.data.records; |
|
|
|
|
|
|
|
|
|
this.loading = false; |
|
|
|
|
|
jinna
3 months ago