From b2ec7b35247273c77768115635955991a449e942 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 06 九月 2023 18:04:16 +0800
Subject: [PATCH] 设备台账字段增加查询条件增加
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 5f15ffd..82ac48a 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,6 +122,8 @@
></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;"
@@ -179,6 +183,42 @@
</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_factory_model,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="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="璧勪骇鍒堕�犲晢"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -194,6 +234,8 @@
/>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-divider
orientation="center"
style="font-size: large;font-style: italic;color: #66aeed;"
@@ -249,6 +291,8 @@
/>
</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 +326,7 @@
/>
</a-form-model-item>
</a-col>
+
<a-col :span="6">
<a-form-model-item
label="楠屾敹鏃ユ湡"
@@ -311,6 +356,8 @@
></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="宸ュ尯"
@@ -339,6 +386,7 @@
></a-input>
</a-form-model-item>
</a-col>
+
<a-col :span="6">
<a-form-model-item
label="閲嶉噺璁￠噺鍗曚綅"
@@ -367,6 +415,8 @@
></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="鍔熻兘浣嶇疆"
@@ -395,6 +445,7 @@
></a-input>
</a-form-model-item>
</a-col>
+
<a-col :span="6">
<a-form-model-item
label="璧勪骇鏉ユ簮鍥藉"
@@ -479,6 +530,8 @@
></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="绯荤粺"
@@ -540,6 +593,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 +667,8 @@
/>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item
label="鏁呴殰棰戠巼"
@@ -665,6 +722,8 @@
/>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-divider
orientation="center"
style="font-size: large;font-style: italic;color: #66aeed;"
@@ -739,6 +798,32 @@
:read-only="true"
v-model="model.processParametersTemplateId_dictText"
/>
+ </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="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>
@@ -847,6 +932,18 @@
technologyStatus:[
{ required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
],
+ workCenterId:[
+ { required: true, message: '璇烽�夋嫨璁惧浜х嚎!' },
+ ],
+ factoryModelId:[
+ { required: true, message: '璇烽�夋嫨璁惧杞﹂棿!' },
+ ],
+ warrantyStart:[
+ { required: true, message: '璇烽�夋嫨寮�濮嬫棩鏈�!' },
+ ],
+ warrantyEnd:[
+ { required: true, message: '璇烽�夋嫨缁撴潫鏃ユ湡!' },
+ ]
},
url: {
add: "/eam/equipment/add",
--
Gitblit v1.9.3