From 6c7ca8b4290cd6afecb680c39be00fc2480a2dca Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 21 九月 2023 14:30:58 +0800
Subject: [PATCH] 现场问题修改
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 264 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 210 insertions(+), 54 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 5f15ffd..c2d6c38 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -79,6 +79,8 @@
></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="瑙勬牸"
@@ -120,28 +122,13 @@
></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"
- prop="manageId"
- >
- <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"
- />
- </a-form-model-item>
- </a-col>
+
<a-col :span="6">
<a-form-model-item
label="浣跨敤閮ㄩ棬"
@@ -162,6 +149,41 @@
</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-col :span="6">
+ <a-form-model-item
+ label="缁翠慨閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="manageId"
+ >
+ <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"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
label="缁翠慨鐝粍"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -177,6 +199,26 @@
/>
</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"
+ dictCode="mom_base_work_center,name,id,del_flag!='1'"
+ v-model="model.workCenterId"
+ />
+ </a-form-model-item>
+ </a-col> -->
<a-col :span="6">
<a-form-model-item
label="璧勪骇鍒堕�犲晢"
@@ -194,27 +236,12 @@
/>
</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"
- 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-col :span="6">
<a-form-model-item
label="璁惧鐘舵��"
@@ -249,6 +276,63 @@
/>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="璧勪骇鐘舵��"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="propertyStatus"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇疯緭鍏ヨ祫浜х姸鎬�"
+ :triggerChange="true"
+ dictCode="property_status"
+ v-model="model.propertyStatus"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row v-if="model.propertyStatus=='warranty'">
+ <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"
+ prop="warrantyStart"
+ >
+ <j-date
+ :disabled="formDisabled"
+ style="width: 100%;"
+ placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
+ class="query-group-cust"
+ v-model="model.warrantyStart"
+ ></j-date>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="璐ㄤ繚缁撴潫鏃ユ湡"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="warrantyEnd"
+ >
+ <j-date
+ :disabled="formDisabled"
+ style="width: 100%;"
+ placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
+ class="query-group-cust"
+ v-model="model.warrantyEnd"
+ ></j-date>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
<a-divider
orientation="center"
style="font-size: large;font-style: italic;color: #66aeed;"
@@ -282,6 +366,7 @@
/>
</a-form-model-item>
</a-col>
+
<a-col :span="6">
<a-form-model-item
label="楠屾敹鏃ユ湡"
@@ -311,7 +396,9 @@
></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="6">
+ </a-row>
+ <a-row>
+ <!-- <a-col :span="6">
<a-form-model-item
label="宸ュ尯"
:labelCol="labelCol"
@@ -324,7 +411,7 @@
:disabled="formDisabled"
></a-input>
</a-form-model-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-model-item
label="閲嶉噺"
@@ -339,6 +426,7 @@
></a-input>
</a-form-model-item>
</a-col>
+
<a-col :span="6">
<a-form-model-item
label="閲嶉噺璁￠噺鍗曚綅"
@@ -367,6 +455,8 @@
></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="鍔熻兘浣嶇疆"
@@ -395,6 +485,7 @@
></a-input>
</a-form-model-item>
</a-col>
+
<a-col :span="6">
<a-form-model-item
label="璧勪骇鏉ユ簮鍥藉"
@@ -479,6 +570,8 @@
></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="绯荤粺"
@@ -540,6 +633,8 @@
orientation="center"
style="font-size: large;font-style: italic;color: #66aeed;"
>ABC鏍囪瘑</a-divider>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="骞冲潎浣跨敤鐜�"
@@ -612,6 +707,8 @@
/>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="鏁呴殰棰戠巼"
@@ -661,10 +758,33 @@
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>
+ </a-row>
+ <a-row>
<a-divider
orientation="center"
style="font-size: large;font-style: italic;color: #66aeed;"
@@ -823,29 +943,44 @@
equipmentCategoryId: [
{ required: true, message: '璇烽�夊垯璁惧绫诲埆!' },
],
- specification:[
- { required: true, message: '璇烽�夊垯璁惧瑙勬牸!' },
+ specification: [
+ { required: true, message: '璇烽�夊垯璁惧瑙勬牸!' },
],
- model:[
- { required: true, message: '璇烽�夊垯璁惧鍨嬪彿!' },
+ model: [
+ { required: true, message: '璇烽�夊垯璁惧鍨嬪彿!' },
],
- equipmentImportanceId:[
- { required: true, message: '璇烽�夊垯璁惧ABC鏍囪瘑!' },
+ equipmentImportanceId: [
+ { required: true, message: '璇烽�夊垯璁惧ABC鏍囪瘑!' },
],
- manageId:[
- { required: true, message: '璇烽�夋嫨缁存姢閮ㄩ棬!' },
+ manageId: [
+ { required: true, message: '璇烽�夋嫨缁存姢閮ㄩ棬!' },
],
- useId:[
- { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬閮ㄩ棬!' },
+ useId: [
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬閮ㄩ棬!' },
],
- specificEquipment:[
- { required: true, message: '璇烽�夋嫨鍏抽敭璁惧鏍囪瘑!' },
+ specificEquipment: [
+ { required: true, message: '璇烽�夋嫨鍏抽敭璁惧鏍囪瘑!' },
],
- equipmentStatus:[
- { required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
+ equipmentStatus: [
+ { required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
],
- technologyStatus:[
- { required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
+ technologyStatus: [
+ { required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
+ ],
+ workCenterId: [
+ { required: true, message: '璇烽�夋嫨璁惧浜х嚎!' },
+ ],
+ factoryModelId: [
+ { required: true, message: '璇烽�夋嫨璁惧杞﹂棿!' },
+ ],
+ warrantyStart: [
+ { required: true, message: '璇烽�夋嫨寮�濮嬫棩鏈�!' },
+ ],
+ warrantyEnd: [
+ { required: true, message: '璇烽�夋嫨缁撴潫鏃ユ湡!' },
+ ],
+ propertyStatus: [
+ { required: true, message: '璇烽�夋嫨璧勪骇鐘舵��!' },
],
},
url: {
@@ -854,6 +989,7 @@
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
},
treeData: [],
+ needSpecific: false,
}
},
@@ -864,6 +1000,7 @@
},
methods: {
add() {
+ this
this.edit(this.modelDefault);
},
edit(record) {
@@ -1021,7 +1158,7 @@
sendPrecisionParametersTemplateRecord(data) {
let record = data.record;
this.model.precisionParametersTemplateId = record.id
- this.model.precisionParametersTemplateId_dictText= record.name
+ this.model.precisionParametersTemplateId_dictText = record.name
this.model = Object.assign({}, this.model);
},
standardResultCompute() {
@@ -1044,6 +1181,25 @@
}
this.model = Object.assign({}, this.model);
+ },
+ changeNeedSpecific(val) {
+ if (val == 'A') {
+ this.needSpecific = true;
+ } else {
+ let that = this;
+ this.$confirm({
+ title: '鎻愮ず',
+ content: '闈濧绫昏澶囷紝鏄惁瑕佹坊鍔犲叧閿澶囨爣璇嗭紒',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ that.needSpecific = true;
+ },
+ onCancel() {
+ that.needSpecific = false;
+ }
+ })
+ }
}
},
computed: {
--
Gitblit v1.9.3