From 86d99e38a2c44e85983d2b8adccf332902a8f2a2 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 15 三月 2024 15:00:56 +0800
Subject: [PATCH] xg
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 155 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 114 insertions(+), 41 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 2a4b56a..204728d 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -130,23 +130,6 @@
/>
</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"
- 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">
@@ -194,6 +177,63 @@
:isMultiple="false"
v-model="model.equipmentPhoto"
></j-image-upload>
+ </a-form-model-item>
+ </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>
@@ -430,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"
@@ -588,22 +644,6 @@
placeholder="璇疯緭鍏ュ嚭鍘傛棩鏈�"
style="width: 100%;"
v-model="model.leaveFactoryDate"
- />
- </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>
@@ -1023,7 +1063,7 @@
{ required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
],
workCenterId: [
- { required: true, message: '璇烽�夋嫨璁惧浜х嚎!' },
+ { required: true, message: '璇烽�夋嫨涓績!' },
],
factoryModelId: [
{ required: true, message: '璇烽�夋嫨宸ュ尯!' },
@@ -1039,7 +1079,16 @@
],
system: [
{ required: true, message: '璇疯緭鍏ョ郴缁�!' },
- ]
+ ],
+ acceptanceCheckDate: [
+ { required: true, message: '璇烽�夋嫨楠屾敹鏃ユ湡!' },
+ ],
+ checkPeriod: [
+ { required: true, message: '璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈�!' },
+ ],
+ areaId: [
+ { required: true, message: '璇烽�夋嫨宸ユ!' },
+ ],
},
url: {
add: "/eam/equipment/add",
@@ -1283,6 +1332,19 @@
})
}
},
+ //璁＄畻涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂达紝涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�=楠屾敹鏃ユ湡+鎶�鏈姸鎬佹瀹氬懆鏈�
+ 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') {
@@ -1294,7 +1356,18 @@
}
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