From 7c38e9cf9fd161a0e296a047e904eeaf65d96f9f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 16 四月 2024 09:25:05 +0800
Subject: [PATCH] 校验修改
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 116 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 84 insertions(+), 32 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index b3556ea..b6d611e 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -117,8 +117,6 @@
:wrapperCol="wrapperCol"
prop="useId"
>
-
-
<j-dict-select-tag
allow-clear
@@ -130,37 +128,20 @@
/>
</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">
<a-form-model-item
label="鏄惁鐢熶骇绾胯澶�"
:labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="isLineEquip"
+ :wrapperCol="wrapperCol"
+ prop="isLineEquip"
>
<j-dict-select-tag
allow-clear
placeholder="璇烽�夋嫨"
:triggerChange="true"
- :disabled="true"
+ :disabled="false"
dictCode="is_product"
v-model="model.isLineEquip"
/>
@@ -170,14 +151,14 @@
<a-form-model-item
label="鏄惁鐢熶骇绾�"
:labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="isLine"
+ :wrapperCol="wrapperCol"
+ prop="isLine"
>
<j-dict-select-tag
allow-clear
placeholder="璇烽�夋嫨"
:triggerChange="true"
- :disabled="true"
+ :disabled="false"
dictCode="is_product"
v-model="model.isLine"
/>
@@ -194,6 +175,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>
@@ -975,13 +1013,13 @@
validatorRules: {
num: [
{ required: true, message: '璇疯緭鍏ヨ澶囩紪鍙�!' },
- { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
+ // { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateNum },
],
name: [
{ required: true, message: '璇疯緭鍏ヨ澶囧悕绉�!' },
- { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
- { validator: this.validateName },
+ // { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
+ // { validator: this.validateName },
],
teamId: [
{ required: true, message: '璇烽�夋嫨璐ｄ换鐝粍!' },
@@ -1023,10 +1061,10 @@
{ required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
],
workCenterId: [
- { required: true, message: '璇烽�夋嫨璁惧浜х嚎!' },
+ { required: false, message: '璇烽�夋嫨涓績!' },
],
factoryModelId: [
- { required: true, message: '璇烽�夋嫨宸ュ尯!' },
+ { required: false, message: '璇烽�夋嫨宸ュ尯!' },
],
warrantyStart: [
{ required: true, message: '璇烽�夋嫨寮�濮嬫棩鏈�!' },
@@ -1045,6 +1083,9 @@
],
checkPeriod: [
{ required: true, message: '璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈�!' },
+ ],
+ areaId: [
+ { required: false, message: '璇烽�夋嫨宸ユ!' },
],
},
url: {
@@ -1297,7 +1338,7 @@
var nextTechnologyStatusQualificationTime = moment(acceptanceCheckDate).add(checkPeriod, 'days').format('YYYY-MM-DD');
this.model.nextTechnologyStatusQualificationTime = nextTechnologyStatusQualificationTime;
this.model = Object.assign({}, this.model);
- }else{
+ } else {
this.model.nextTechnologyStatusQualificationTime = '';
this.model = Object.assign({}, this.model);
}
@@ -1313,7 +1354,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