From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 295 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 208 insertions(+), 87 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 47d46a5..204728d 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -117,36 +117,55 @@
:wrapperCol="wrapperCol"
prop="useId"
>
- <a-tree-select
- style="width: 100%"
- :disabled="formDisabled"
- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
- :tree-data="treeData"
- placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
- tree-default-expand-all
- v-model="model.useId"
- />
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item
- label="宸ュ尯"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="factoryModelId"
- >
+
+
+
<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"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ v-model="model.useId"
/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鏄惁鐢熶骇绾胯澶�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="isLineEquip"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨"
+ :triggerChange="true"
+ :disabled="true"
+ dictCode="is_product"
+ v-model="model.isLineEquip"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鏄惁鐢熶骇绾�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="isLine"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨"
+ :triggerChange="true"
+ :disabled="true"
+ dictCode="is_product"
+ v-model="model.isLine"
+ />
+ </a-form-model-item>
+ </a-col>
<a-col :span="6">
<a-form-model-item
label="璁惧鍥剧墖"
@@ -162,6 +181,63 @@
</a-col>
</a-row>
<a-row>
+ <!-- 涓績 -->
+ <a-col :span="6">
+ <a-form-model-item
+ label="涓績"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="workCenterId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨涓績"
+ :triggerChange="true"
+ @change="workCenterChange"
+ dictCode="mom_base_area,name,id,del_flag!='1' and type='1'"
+ v-model="model.workCenterId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="宸ュ尯"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="factoryModelId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨宸ュ尯"
+ :triggerChange="true"
+ @change="factoryModelChange"
+ :dictCode="'mom_base_area,name,id,del_flag!=\'1\' and type=\'2\' and parent_id = ' +'\''+ model.workCenterId+'\''"
+ v-model="model.factoryModelId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <!-- 宸ユ -->
+ <a-col :span="6">
+ <a-form-model-item
+ label="宸ユ"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="areaId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨宸ユ"
+ :triggerChange="true"
+ :dictCode="'mom_base_area,name,id,del_flag!=\'1\' and type=\'3\' and parent_id = '+'\''+model.factoryModelId+'\''"
+ v-model="model.areaId"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
<a-divider
orientation="center"
style="font-size: large;font-style: italic;color: #f20707;"
@@ -173,13 +249,21 @@
:wrapperCol="wrapperCol"
prop="manageId"
>
- <a-tree-select
+ <!-- <a-tree-select
:disabled="formDisabled"
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
:tree-data="treeData"
placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
tree-default-expand-all
+ v-model="model.manageId"
+ /> -->
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
v-model="model.manageId"
/>
</a-form-model-item>
@@ -319,7 +403,10 @@
/>
</a-form-model-item>
</a-col>
- <a-col :span="6" v-if="model.operatingSystem=='yes'">
+ <a-col
+ :span="6"
+ v-if="model.operatingSystem=='yes'"
+ >
<a-form-model-item
label="绯荤粺"
:labelCol="labelCol"
@@ -348,12 +435,12 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item
- label="鍧愭爣鏁伴噺"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="coordinateNum"
- >
+ <a-form-model-item
+ label="鍧愭爣鏁伴噺"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="coordinateNum"
+ >
<a-input-number
v-model="model.coordinateNum"
:disabled="formDisabled"
@@ -383,30 +470,46 @@
</a-col>
<a-col :span="6">
<a-form-model-item
- label="鎶�鏈姸鎬侀壌瀹氬懆鏈�"
+ label="楠屾敹鏃ユ湡"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="acceptanceCheckDate"
+ >
+ <a-date-picker
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨楠屾敹鏃ユ湡"
+ style="width: 100%;"
+ v-model="model.acceptanceCheckDate"
+ @change="dateChange"
+ />
+ </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="璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氬懆鏈� "
+ placeholder="璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈� "
:triggerChange="true"
dictCode="check_period"
- :disabled="true"
v-model="model.checkPeriod"
+ @change="dateChange"
/>
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item
- label="涓嬫鎶�鏈壌瀹氭椂闂�"
+ label="涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="nextTechnologyStatusQualificationTime"
>
<j-date
- :disabled="formDisabled"
+ :disabled="true"
style="width: 100%;"
placeholder="璇烽�夋嫨鏃ユ湡"
class="query-group-cust"
@@ -544,22 +647,6 @@
/>
</a-form-model-item>
</a-col>
-
- <a-col :span="6">
- <a-form-model-item
- label="楠屾敹鏃ユ湡"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="acceptanceCheckDate"
- >
- <a-date-picker
- :disabled="formDisabled"
- placeholder="璇疯緭鍏ラ獙鏀舵棩鏈�"
- style="width: 100%;"
- v-model="model.acceptanceCheckDate"
- />
- </a-form-model-item>
- </a-col>
<a-col :span="6">
<a-form-model-item
label="绔嬮」鍗″彿"
@@ -691,8 +778,8 @@
></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row hidden>
+ </a-row>
+ <a-row hidden>
<a-col :span="6">
<a-form-model-item
label="骞冲潎浣跨敤鐜�"
@@ -902,8 +989,8 @@
default: false,
required: false
},
- caytegoryParam:{
- type:String,
+ caytegoryParam: {
+ type: String,
default: '',
required: false
}
@@ -976,7 +1063,7 @@
{ required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
],
workCenterId: [
- { required: true, message: '璇烽�夋嫨璁惧浜х嚎!' },
+ { required: true, message: '璇烽�夋嫨涓績!' },
],
factoryModelId: [
{ required: true, message: '璇烽�夋嫨宸ュ尯!' },
@@ -990,15 +1077,24 @@
propertyStatus: [
{ required: true, message: '璇烽�夋嫨璧勪骇鐘舵��!' },
],
- system:[
+ system: [
{ required: true, message: '璇疯緭鍏ョ郴缁�!' },
- ]
+ ],
+ acceptanceCheckDate: [
+ { required: true, message: '璇烽�夋嫨楠屾敹鏃ユ湡!' },
+ ],
+ checkPeriod: [
+ { required: true, message: '璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈�!' },
+ ],
+ areaId: [
+ { required: true, message: '璇烽�夋嫨宸ユ!' },
+ ],
},
url: {
add: "/eam/equipment/add",
edit: "/eam/equipment/edit",
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
- getCategoryFlag:"/eam/equipmentCategory/queryById"
+ getCategoryFlag: "/eam/equipmentCategory/queryById"
},
treeData: [],
needSpecific: false,
@@ -1012,14 +1108,15 @@
},
methods: {
add() {
- this
this.edit(this.modelDefault);
},
edit(record) {
console.log(this.disabled)
this.model = Object.assign({}, record);
- if(!this.model.id){
- this.model.equipmentStatus = '1'
+ if (!this.model.id) {
+ this.model.equipmentStatus = '1'
+ this.model.isLineEquip = 'no'
+ this.model.isLine = 'no'
}
this.visible = true;
},
@@ -1167,9 +1264,9 @@
},
onSearchPrecisionParametersTemplate() {
- if(this.model.num ==''||this.model.num==undefined||this.model.num==null){
- this.$message.warn("璇峰厛濉啓缁熶竴缂栫爜")
- return false;
+ 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 = "閫夋嫨璁惧绮惧害妯℃澘";
@@ -1220,33 +1317,57 @@
})
}
//鏀瑰彉鎶�鏈姸鎬侀壌瀹氬懆鏈�
- if(this.model.equipmentCategoryId!==null&&this.model.equipmentCategoryId!=''){
+ 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);
+ 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);
- })
- }
+ //璁＄畻涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂达紝涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�=楠屾敹鏃ユ湡+鎶�鏈姸鎬佹瀹氬懆鏈�
+ dateChange() {
+ var acceptanceCheckDate = this.model.acceptanceCheckDate;
+ var checkPeriod = this.model.checkPeriod;
+ if (acceptanceCheckDate !== null && acceptanceCheckDate !== '' && checkPeriod !== null && checkPeriod !== '') {
+ var nextTechnologyStatusQualificationTime = moment(acceptanceCheckDate).add(checkPeriod, 'days').format('YYYY-MM-DD');
+ this.model.nextTechnologyStatusQualificationTime = nextTechnologyStatusQualificationTime;
+ this.model = Object.assign({}, this.model);
+ }else{
+ this.model.nextTechnologyStatusQualificationTime = '';
+ 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);
+ })
+ },
+ //褰撲腑蹇冩敼鍙樻椂锛屾竻绌哄伐鍖哄拰宸ユ
+ workCenterChange() {
+ this.model.factoryModelId = '';
+ this.model.areaId = '';
+ this.model = Object.assign({}, this.model);
+ },
+ //褰撳伐鍖烘敼鍙樻椂锛屾竻绌哄伐娈�
+ factoryModelChange() {
+ this.model.areaId = '';
+ this.model = Object.assign({}, this.model);
+ },
},
computed: {
formDisabled() {
--
Gitblit v1.9.3