From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 490 +++++++++++++++++++++++++++++------------------------
1 files changed, 268 insertions(+), 222 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index c2d6c38..47d46a5 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -32,8 +32,9 @@
placeholder="璇烽�夋嫨璁惧鎵�灞炲垎绫�"
:disabled="formDisabled"
:triggerChange="true"
- dictCode="mom_eam_equipment_category,name,id"
+ :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
v-model="model.equipmentCategoryId"
+ @change="categoryChange"
/>
</a-form-model-item>
</a-col>
@@ -46,7 +47,7 @@
>
<a-input
v-model="model.num"
- placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
+ placeholder="璇疯緭鍏ョ粺涓� 缂栧彿"
:disabled="formDisabled"
></a-input>
</a-form-model-item>
@@ -111,26 +112,6 @@
</a-col>
<a-col :span="6">
<a-form-model-item
- label="璁惧鍥剧墖"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="equipmentPhoto"
- >
- <j-image-upload
- :isMultiple="false"
- v-model="model.equipmentPhoto"
- ></j-image-upload>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-divider
- orientation="center"
- style="font-size: large;font-style: italic;color: #66aeed;"
- >缁存姢鍙婁娇鐢ㄤ俊鎭�</a-divider>
-
- <a-col :span="6">
- <a-form-model-item
label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -149,7 +130,7 @@
</a-col>
<a-col :span="6">
<a-form-model-item
- label="杞﹂棿"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="factoryModelId"
@@ -157,16 +138,37 @@
<j-dict-select-tag
allow-clear
:disabled="formDisabled"
- placeholder="璇烽�夋嫨杞﹂棿"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
dictCode="mom_base_area,name,id,del_flag!='1'"
v-model="model.factoryModelId"
/>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
- label="缁翠慨閮ㄩ棬"
+ label="璁惧鍥剧墖"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="equipmentPhoto"
+ >
+ <j-image-upload
+ :isMultiple="false"
+ v-model="model.equipmentPhoto"
+ ></j-image-upload>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #f20707;"
+ >缁存姢鍙婁娇鐢ㄤ俊鎭�</a-divider>
+ <a-col :span="6">
+ <a-form-model-item
+ label="缁存姢閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="manageId"
@@ -176,7 +178,7 @@
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
:tree-data="treeData"
- placeholder="璇烽�夋嫨缁翠慨閮ㄩ棬"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
tree-default-expand-all
v-model="model.manageId"
/>
@@ -199,26 +201,169 @@
/>
</a-form-model-item>
</a-col>
-
- </a-row>
- <a-row>
- <!-- <a-col :span="6">
+ <a-col :span="6">
<a-form-model-item
- label="浜х嚎"
+ label="ABC鏍囪瘑"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- prop="workCenterId"
+ prop="equipmentImportanceId"
>
<j-dict-select-tag
allow-clear
:disabled="formDisabled"
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨ABC鏍囪瘑"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="model.workCenterId"
+ dictCode="ABC-standard-result"
+ @change="changeNeedSpecific"
+ v-model="model.equipmentImportanceId"
/>
</a-form-model-item>
- </a-col> -->
+ </a-col>
+ <a-col
+ :span="6"
+ v-if="needSpecific"
+ >
+ <a-form-model-item
+ label="鍏抽敭璁惧鏍囪瘑"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="specificEquipment"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ dictCode="specific_equipment"
+ v-model="model.specificEquipment"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="瀹夊叏閰嶇疆"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="securityConfiguration"
+ >
+ <a-input
+ v-model="model.securityConfiguration"
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ュ畨鍏ㄩ厤缃�"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鍐峰嵈绯荤粺"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="coolingSystem"
+ >
+ <j-dict-select-tag
+ allow-clear
+ v-model="model.coolingSystem"
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ュ喎鍗寸郴缁�"
+ :triggerChange="true"
+ dictCode="cooling_system"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鐏伀鍣�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="fireExtinguisher"
+ >
+ <a-input
+ v-model="model.fireExtinguisher"
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ョ伃鐏櫒"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鐏伀鍣ㄦ湁鏁堟湡"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="fireExtinguisherValidityPeriod"
+ >
+ <a-input
+ v-model="model.fireExtinguisherValidityPeriod"
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ョ伃鐏櫒鏈夋晥鏈�"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鎿嶄綔绯荤粺"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="operatingSystem"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="鏄惁鏈夋搷浣滅郴缁�"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ dictCode="operation_flag"
+ v-model="model.operatingSystem"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6" v-if="model.operatingSystem=='yes'">
+ <a-form-model-item
+ label="绯荤粺"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="system"
+ >
+ <a-input
+ v-model="model.system"
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ョ郴缁�"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="绔彛"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="port"
+ >
+ <a-input
+ v-model="model.port"
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ョ鍙�"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鍧愭爣鏁伴噺"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="coordinateNum"
+ >
+ <a-input-number
+ v-model="model.coordinateNum"
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ュ潗鏍囨暟閲�"
+ style="width: 100%"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="璧勪骇鍒堕�犲晢"
@@ -234,6 +379,39 @@
dictCode="mom_base_constructor,name,id,status!='0' and del_flag!='1'"
v-model="model.constructorId"
/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鎶�鏈姸鎬侀壌瀹氬懆鏈�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="checkPeriod"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氬懆鏈� "
+ :triggerChange="true"
+ dictCode="check_period"
+ :disabled="true"
+ v-model="model.checkPeriod"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="涓嬫鎶�鏈壌瀹氭椂闂�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="nextTechnologyStatusQualificationTime"
+ >
+ <j-date
+ :disabled="formDisabled"
+ style="width: 100%;"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ class="query-group-cust"
+ v-model="model.nextTechnologyStatusQualificationTime"
+ ></j-date>
</a-form-model-item>
</a-col>
</a-row>
@@ -455,8 +633,6 @@
></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
<a-col :span="6">
<a-form-model-item
label="鍔熻兘浣嶇疆"
@@ -471,6 +647,8 @@
></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="璧勯噾鏉ユ簮"
@@ -485,7 +663,6 @@
></a-input>
</a-form-model-item>
</a-col>
-
<a-col :span="6">
<a-form-model-item
label="璧勪骇鏉ユ簮鍥藉"
@@ -502,121 +679,6 @@
</a-col>
<a-col :span="6">
<a-form-model-item
- label="瀹夊叏閰嶇疆"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="securityConfiguration"
- >
- <a-input
- v-model="model.securityConfiguration"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ュ畨鍏ㄩ厤缃�"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
- label="鍐峰嵈绯荤粺"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="coolingSystem"
- >
- <a-input
- v-model="model.coolingSystem"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ュ喎鍗寸郴缁�"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
- label="鐏伀鍣�"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="fireExtinguisher"
- >
- <a-input
- v-model="model.fireExtinguisher"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ョ伃鐏櫒"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
- label="鐏伀鍣ㄦ湁鏁堟湡"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="fireExtinguisherValidityPeriod"
- >
- <a-input
- v-model="model.fireExtinguisherValidityPeriod"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ョ伃鐏櫒鏈夋晥鏈�"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
- label="鎿嶄綔绯荤粺"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="operatingSystem"
- >
- <a-input
- v-model="model.operatingSystem"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ユ搷浣滅郴缁�"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="6">
- <a-form-model-item
- label="绯荤粺"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="system"
- >
- <a-input
- v-model="model.system"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ョ郴缁�"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
- label="绔彛"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="port"
- >
- <a-input
- v-model="model.port"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ョ鍙�"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
- label="鍧愭爣鏁伴噺"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="coordinateNum"
- >
- <a-input-number
- v-model="model.coordinateNum"
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ュ潗鏍囨暟閲�"
- style="width: 100%"
- />
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
label="澶囨敞"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -629,12 +691,8 @@
></a-input>
</a-form-model-item>
</a-col>
- <a-divider
- orientation="center"
- style="font-size: large;font-style: italic;color: #66aeed;"
- >ABC鏍囪瘑</a-divider>
- </a-row>
- <a-row>
+ </a-row>
+ <a-row hidden>
<a-col :span="6">
<a-form-model-item
label="骞冲潎浣跨敤鐜�"
@@ -653,6 +711,8 @@
/>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row hidden>
<a-col :span="6">
<a-form-model-item
label="鍙浛鎹㈡��"
@@ -707,26 +767,6 @@
/>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
- <a-col :span="6">
- <a-form-model-item
- label="鏁呴殰棰戠巼"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="standardE"
- >
- <j-dict-select-tag
- allow-clear
- placeholder="璇烽�夋嫨鏁呴殰棰戠巼"
- :disabled="formDisabled"
- :triggerChange="true"
- dictCode="ABC-standardE"
- @change="standardResultCompute"
- v-model="model.standardE"
- />
- </a-form-model-item>
- </a-col>
<a-col :span="6">
<a-form-model-item
label="璁惧浠峰��"
@@ -742,44 +782,6 @@
dictCode="ABC-standardF"
v-model="model.standardF"
@change="standardResultCompute"
- />
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
- label="ABC鏍囪瘑"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="equipmentImportanceId"
- >
- <j-dict-select-tag
- allow-clear
- :disabled="formDisabled"
- placeholder="璇烽�夋嫨ABC鏍囪瘑"
- :triggerChange="true"
- dictCode="ABC-standard-result"
- @change="changeNeedSpecific"
- v-model="model.equipmentImportanceId"
- />
- </a-form-model-item>
- </a-col>
- <a-col
- :span="6"
- v-if="needSpecific"
- >
- <a-form-model-item
- label="鍏抽敭璁惧鏍囪瘑"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="specificEquipment"
- >
- <j-dict-select-tag
- allow-clear
- placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
- :disabled="formDisabled"
- :triggerChange="true"
- dictCode="specific_equipment"
- v-model="model.specificEquipment"
/>
</a-form-model-item>
</a-col>
@@ -869,6 +871,7 @@
></process-parameters-template-list>
<precision-parameters-template-list
ref="PrecisionParametersTemplateList"
+ :num="model.num"
@sendPrecisionParametersTemplateRecord='sendPrecisionParametersTemplateRecord'
></precision-parameters-template-list>
</a-spin>
@@ -899,6 +902,11 @@
default: false,
required: false
},
+ caytegoryParam:{
+ type:String,
+ default: '',
+ required: false
+ }
},
data() {
return {
@@ -909,11 +917,11 @@
},
labelCol: {
xs: { span: 24 },
- sm: { span: 8 },
+ sm: { span: 10 },
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 16 },
+ sm: { span: 14 },
},
confirmLoading: false,
@@ -956,7 +964,7 @@
{ required: true, message: '璇烽�夋嫨缁存姢閮ㄩ棬!' },
],
useId: [
- { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
],
specificEquipment: [
{ required: true, message: '璇烽�夋嫨鍏抽敭璁惧鏍囪瘑!' },
@@ -971,7 +979,7 @@
{ required: true, message: '璇烽�夋嫨璁惧浜х嚎!' },
],
factoryModelId: [
- { required: true, message: '璇烽�夋嫨璁惧杞﹂棿!' },
+ { required: true, message: '璇烽�夋嫨宸ュ尯!' },
],
warrantyStart: [
{ required: true, message: '璇烽�夋嫨寮�濮嬫棩鏈�!' },
@@ -982,11 +990,15 @@
propertyStatus: [
{ required: true, message: '璇烽�夋嫨璧勪骇鐘舵��!' },
],
+ system:[
+ { required: true, message: '璇疯緭鍏ョ郴缁�!' },
+ ]
},
url: {
add: "/eam/equipment/add",
edit: "/eam/equipment/edit",
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ getCategoryFlag:"/eam/equipmentCategory/queryById"
},
treeData: [],
needSpecific: false,
@@ -1006,6 +1018,9 @@
edit(record) {
console.log(this.disabled)
this.model = Object.assign({}, record);
+ if(!this.model.id){
+ this.model.equipmentStatus = '1'
+ }
this.visible = true;
},
close() {
@@ -1152,6 +1167,10 @@
},
onSearchPrecisionParametersTemplate() {
+ if(this.model.num ==''||this.model.num==undefined||this.model.num==null){
+ this.$message.warn("璇峰厛濉啓缁熶竴缂栫爜")
+ return false;
+ }
this.$refs.PrecisionParametersTemplateList.list();
this.$refs.PrecisionParametersTemplateList.title = "閫夋嫨璁惧绮惧害妯℃澘";
},
@@ -1200,6 +1219,33 @@
}
})
}
+ //鏀瑰彉鎶�鏈姸鎬侀壌瀹氬懆鏈�
+ if(this.model.equipmentCategoryId!==null&&this.model.equipmentCategoryId!=''){
+ var value = this.model.equipmentCategoryId;
+ getAction(this.url.getCategoryFlag,{id:value}).then(res=>{
+ if(res.result.equipmentCategoryUda1!=='weldingMachine'&&res.result.equipmentCategoryUda11!=='filesCarousel'&&res.result.equipmentCategoryUda1!=='tester'){
+ if(val==='A'){
+ this.model.checkPeriod=365*3+'';
+ }
+ if(val==='B'||val==='C'||val==='D'){
+ this.model.checkPeriod=365*4+'';
+ }
+ }
+ this.model = Object.assign({},this.model);
+ })
+ }
+ },
+ categoryChange(value){
+ getAction(this.url.getCategoryFlag,{id:value}).then(res=>{
+ if(res.result.equipmentCategoryUda1==='weldingMachine'){
+ this.model.checkPeriod=365*3+'';
+ }else if(res.result.equipmentCategoryUda1==='filesCarousel'){
+ this.model.checkPeriod=365*4+'';
+ }else if(res.result.equipmentCategoryUda1==='tester'){
+ this.model.checkPeriod=365*1+'';
+ }
+ this.model = Object.assign({},this.model);
+ })
}
},
computed: {
--
Gitblit v1.9.3