From f6f8bd8f8885500233f0c0e64a21348b1017a610 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 31 一月 2024 14:11:16 +0800
Subject: [PATCH] 设备管理页面查询区域按照车间名称查询方式由输入改为树选择
---
src/views/eam/ABC/modules/StreamForm.vue | 119 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/src/views/eam/ABC/modules/StreamForm.vue b/src/views/eam/ABC/modules/StreamForm.vue
index 7f32450..dd1e9cf 100644
--- a/src/views/eam/ABC/modules/StreamForm.vue
+++ b/src/views/eam/ABC/modules/StreamForm.vue
@@ -153,7 +153,7 @@
:loading="aBCAssessmentTable.loading"
:columns="aBCAssessmentTable.columns"
:dataSource="aBCAssessmentTable.dataSource"
- :maxHeight="300"
+ :maxHeight="1000"
:disabled="formDisabled"
:rowNumber="true"
:rowSelection="true"
@@ -224,7 +224,7 @@
title: '缁熶竴缂栫爜',
key: 'num',
type: JVXETypes.normal,
- width:"250px",
+ width:"160px",
placeholder: '璇疯緭鍏�${title}',
disabled:true,
align:'center',
@@ -234,7 +234,7 @@
title: '璁惧鍚嶇О',
key: 'name',
type: JVXETypes.normal,
- width:"250px",
+ width:"160px",
placeholder: '璇疯緭鍏�${title}',
disabled:true,
align:'center',
@@ -244,7 +244,7 @@
title: '璁惧鍨嬪彿',
key: 'model',
type: JVXETypes.normal,
- width:"250px",
+ width:"160px",
placeholder: '璇疯緭鍏�${title}',
disabled:true,
align:'center',
@@ -263,109 +263,109 @@
title: '骞冲潎浣跨敤鐜�',
key: 'standardA',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardA',
options:[],
align:'center',
- validateRules: [
- {
- required: true, // 蹇呭～
- message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
- },
- ]
+ // validateRules: [
+ // {
+ // required: true, // 蹇呭～
+ // message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ // },
+ // ]
},
{
title: '鍙浛鎹㈡��',
key: 'standardB',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardB',
options:[],
align:'center',
- validateRules: [
- {
- required: true, // 蹇呭～
- message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
- },
- ]
+ // validateRules: [
+ // {
+ // required: true, // 蹇呭～
+ // message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ // },
+ // ]
},
{
title: '鏁呴殰褰卞搷搴�',
key: 'standardC',
type: JVXETypes.select,
- width:"250px",
+ width:"230px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardC',
options:[],
align:'center',
- validateRules: [
- {
- required: true, // 蹇呭～
- message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
- },
- ]
+ // validateRules: [
+ // {
+ // required: true, // 蹇呭～
+ // message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ // },
+ // ]
},
{
title: '鐢熶骇瓒呭樊搴�',
key: 'standardD',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardD',
options:[],
align:'center',
- validateRules: [
- {
- required: true, // 蹇呭～
- message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
- },
- ]
+ // validateRules: [
+ // {
+ // required: true, // 蹇呭～
+ // message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ // },
+ // ]
},
{
title: '鏁呴殰棰戠巼',
key: 'standardE',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardE',
options:[],
align:'center',
- validateRules: [
- {
- required: true, // 蹇呭～
- message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
- },
- ]
+ // validateRules: [
+ // {
+ // required: true, // 蹇呭～
+ // message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ // },
+ // ]
},
{
title: '璁惧浠峰��',
key: 'standardF',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardF',
options:[],
align:'center',
- validateRules: [
- {
- required: true, // 蹇呭～
- message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
- },
- ]
+ // validateRules: [
+ // {
+ // required: true, // 蹇呭～
+ // message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ // },
+ // ]
},
{
title: '鏃ф爣璇�',
- key: 'equipmentImportanceId',
+ key: 'oldStandard',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
disabled:true,
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
@@ -377,7 +377,7 @@
title: '鏂版爣璇�',
key: 'finalStandard',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standard-result',
@@ -483,7 +483,7 @@
}
var standardA = this.model.standardA == null || this.model.standardA == undefined || this.model.standardA == '' ? 0 : parseInt(this.model.standardA);
var standardB = this.model.standardB == null || this.model.standardB == undefined || this.model.standardB == '' ? 0 : parseInt(this.model.standardB);
- var standardC = this.model.standardA == null || this.model.standardC == undefined || this.model.standardC == '' ? 0 : parseInt(this.model.standardC);
+ var standardC = this.model.standardC == null || this.model.standardC == undefined || this.model.standardC == '' ? 0 : parseInt(this.model.standardC);
var standardD = this.model.standardD == null || this.model.standardD == undefined || this.model.standardD == '' ? 0 : parseInt(this.model.standardD);
var standardE = this.model.standardE == null || this.model.standardE == undefined || this.model.standardE == '' ? 0 : parseInt(this.model.standardE);
var standardF = this.model.standardF == null || this.model.standardF == undefined || this.model.standardF == '' ? 0 : parseInt(this.model.standardF);
@@ -524,7 +524,14 @@
num: data[i].num,
name: data[i].name,
model:data[i].model,
- equipmentImportanceId:data[i].equipmentImportanceId,
+ standardA:data[i].standardA,
+ standardB:data[i].standardB,
+ standardC:data[i].standardC,
+ standardD:data[i].standardD,
+ standardE:data[i].standardE,
+ standardF:data[i].standardF,
+ oldStandard:data[i].equipmentImportanceId,
+ finalStandard:'D',
}
}
addRows.push(equipment)
@@ -534,12 +541,12 @@
changeDate(target){
var standardA = target.row.standardA == null || target.row.standardA == undefined || target.row.standardA == '' ? 0 : parseInt(target.row.standardA);
var standardB = target.row.standardB == null || target.row.standardB == undefined || target.row.standardB == '' ? 0 : parseInt(target.row.standardB);
- var standardC = target.row.standardA == null || target.row.standardC == undefined || target.row.standardC == '' ? 0 : parseInt(target.row.standardC);
+ var standardC = target.row.standardC == null || target.row.standardC == undefined || target.row.standardC == '' ? 0 : parseInt(target.row.standardC);
var standardD = target.row.standardD == null || target.row.standardD == undefined || target.row.standardD == '' ? 0 : parseInt(target.row.standardD);
var standardE = target.row.standardE == null || target.row.standardE == undefined || target.row.standardE == '' ? 0 : parseInt(target.row.standardE);
var standardF = target.row.standardF == null || target.row.standardF == undefined || target.row.standardF == '' ? 0 : parseInt(target.row.standardF);
var sum = standardA + standardB + standardC + standardD + standardE + standardF;
- console.log(sum)
+ console.log(target)
if (sum >= 18) {
target.row.finalStandard = 'A'
} else if (sum >= 10 && sum <= 17) {
@@ -547,11 +554,11 @@
} else {
target.row.finalStandard = 'C'
}
- },
- changeDateByRow(row){
+ },
+ changeDateByRow(row){
var standardA = row.standardA == null || row.standardA == undefined || row.standardA == '' ? 0 : parseInt(row.standardA);
var standardB = row.standardB == null || row.standardB == undefined || row.standardB == '' ? 0 : parseInt(row.standardB);
- var standardC = row.standardA == null || row.standardC == undefined || row.standardC == '' ? 0 : parseInt(row.standardC);
+ var standardC = row.standardC == null || row.standardC == undefined || row.standardC == '' ? 0 : parseInt(row.standardC);
var standardD = row.standardD == null || row.standardD == undefined || row.standardD == '' ? 0 : parseInt(row.standardD);
var standardE = row.standardE == null || row.standardE == undefined || row.standardE == '' ? 0 : parseInt(row.standardE);
var standardF = row.standardF == null || row.standardF == undefined || row.standardF == '' ? 0 : parseInt(row.standardF);
--
Gitblit v1.9.3