From bd3670cf1f3ddf4201941a1673d870cc185fe184 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 13:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/metering/metering-form.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 1d290dd..2e1ca3e 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -22,7 +22,7 @@
<el-input v-model="dataForm.name" placeholder="鍚嶇О"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="绫诲瀷" prop="type">
<el-select
v-model="dataForm.type"
@@ -39,7 +39,16 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
+ <!-- <el-col :span="12">
+ <el-form-item label="璐ｄ换浜�" prop="createUser">
+ <el-input
+ v-model="dataForm.createUser"
+ placeholder="璐ｄ换浜�"
+ ></el-input>
+ </el-form-item>
+ </el-col> -->
+
<el-col :span="12">
<el-form-item label="鍘傚" prop="supplier">
<el-input
@@ -48,11 +57,38 @@
></el-input>
</el-form-item>
</el-col>
+
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="state">
- <el-select
+ <el-form-item label="璐ｄ换閮ㄩ棬" prop="responsibleDepartment">
+ <el-input
+ v-model="dataForm.responsibleDepartment"
+ placeholder="璐ｄ换閮ㄩ棬"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-input
v-model="dataForm.status"
placeholder="鐘舵��"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸" prop="specifications">
+ <el-input
+ v-model="dataForm.specifications"
+ placeholder="瑙勬牸"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+
+
+ <!-- <el-col :span="12">
+ <el-form-item label="璁惧鐘舵��" prop="status">
+ <el-select
+ v-model="dataForm.status"
+ placeholder="璁惧鐘舵��"
filterable
style="width: 100%"
>
@@ -64,7 +100,7 @@
/>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -100,12 +136,18 @@
typeSpecification: '',
manufactureDate: '',
installDate: '',
- state: '',
+ // state: '',
+ specifications:'',
+ responsibleDepartment:'',
+ // createUser:'',
+ status:'',
+
+
description: '',
value1: '',
code: null,
- type: null,
- status: null,
+ // type: null,
+ // status: null,
supplier: null
},
dataRule: {
--
Gitblit v1.9.3