质量模块修改

dev-scheduling
jinna 3 months ago
parent 3e90f9eeef
commit dde32c460d
  1. 2
      src/views/periodicTesting/components/addProjectCycleDialog.vue
  2. 13
      src/views/periodicTesting/projectCycle.vue
  3. 5
      src/views/periodicTesting/testProject.vue
  4. 10
      src/views/processManagement/platingTypeInfo.vue

@ -461,6 +461,8 @@ export default {
addMonth() { addMonth() {
let value = this.projectForm.monthValue + '日'; let value = this.projectForm.monthValue + '日';
if (this.monthTags.find(item => item == value)) return; if (this.monthTags.find(item => item == value)) return;
if(this.projectForm.monthValue == '' || !this.projectForm.monthValue) return
console.log('this.projectForm.monthValue=========',this.projectForm.monthValue)
this.monthTags.push(this.projectForm.monthValue + '日') this.monthTags.push(this.projectForm.monthValue + '日')
}, },
// //

@ -374,6 +374,7 @@ export default {
label: '试验周期', label: '试验周期',
prop: 'jobTypes', prop: 'jobTypes',
type: 'select', type: 'select',
hide:true,
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
@ -530,13 +531,19 @@ export default {
}, },
// //
handleExport(){ handleExport(){
this.$confirm('是否导出周期性试验任务数据?', '提示', { let param = {
...this.query,
jobType:this.query && this.query.jobTypes && this.query.jobTypes
}
const { jobTypes, ...validData } = param;
this.$confirm('是否导出试验项目周期数据?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
NProgress.start(); NProgress.start();
exportExcel(this.query).then(res =>{ exportExcel(validData).then(res =>{
downloadXls(res.data, `试验周期表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`); downloadXls(res.data, `试验周期表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`);
NProgress.done(); NProgress.done();
}) })
@ -726,7 +733,7 @@ export default {
this.loading = true; this.loading = true;
let param = { let param = {
...this.query, ...this.query,
jobType:this.query.jobTypes jobType:this.query && this.query.jobTypes && this.query.jobTypes
} }
const { jobTypes, ...validData } = param; const { jobTypes, ...validData } = param;

@ -118,15 +118,16 @@ export default {
dialogWidth: 600, dialogWidth: 600,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
filterBtn: true, filterBtn: false,
searchShowBtn: false, searchShowBtn: false,
excelBtn: true, excelBtn: false,
showOverflowTooltip: true, showOverflowTooltip: true,
align: 'center', align: 'center',
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'left',
menuWidth:150,
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
column: [ column: [

@ -159,12 +159,12 @@ export default {
prop: "bcId", prop: "bcId",
sortable: true, sortable: true,
search: true, search: true,
width: 120, width: 200,
type: "select", type: "select",
filterable: true, filterable: true,
props: { props: {
label: "code", label: "name",
value: "id", value: "id",
}, },
dicUrl: "/blade-desk/BA/BasicClazz/listForSelectPlatingAssort", dicUrl: "/blade-desk/BA/BasicClazz/listForSelectPlatingAssort",
@ -469,7 +469,7 @@ export default {
this.form.flagCycleTest = 0 this.form.flagCycleTest = 0
} }
if (["edit", "view"].includes(type)) { if (["edit", "view"].includes(type)) {
this.form.bcId = this.form.bcId + ''
} }
done(); done();
}, },
@ -501,6 +501,10 @@ export default {
size:this.page.pageSize, size:this.page.pageSize,
...this.query ...this.query
}).then(res =>{ }).then(res =>{
res.data.data.records.map(item =>{
item.bcId = item.bcId + ''
item.subClass = item.subClass + ''
})
this.data = res.data.data.records this.data = res.data.data.records
this.page.total = res.data.data.total this.page.total = res.data.data.total
this.loading = false; this.loading = false;

Loading…
Cancel
Save