From 7202d29ba116dcc862cfb6fbd0377afddb03bcee Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 17:56:17 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/metering/metering-form.vue | 67 ++++++++++++---------------------
1 files changed, 24 insertions(+), 43 deletions(-)
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 66db943..12aba68 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -24,44 +24,23 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏍″噯鏃堕棿" prop="createTime">
- <el-date-picker
- v-model="dataForm.createTime"
- align="right"
- type="date"
- placeholder="鏍″噯鏃堕棿"
- :picker-options="pickerOptions">
+ <el-date-picker
+ v-model="dataForm.createTime"
+ type="datetime"
+ placeholder="鏍″噯鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒版湡鏃堕棿" prop="updateTime">
+ <el-date-picker
+ v-model="dataForm.updateTime"
+ type="datetime"
+ placeholder="鏍″噯鍒版湡鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鏍″噯鍒版湡鏃堕棿" prop="updateTime">
- <el-date-picker
- v-model="dataForm.updateTime"
- align="right"
- type="date"
- placeholder="鏍″噯鍒版湡鏃堕棿"
- :picker-options="pickerOptions">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="12">
- <el-form-item label="绫诲瀷" prop="type">
- <el-select
- v-model="dataForm.type"
- filterable
- placeholder="璇烽�夋嫨"
- style="width:100%"
- >
- <el-option
- v-for="item in workshopList"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col> -->
+
<el-col :span="12">
<el-form-item label="璐ｄ换浜�" prop="createUser">
<el-input
@@ -168,13 +147,10 @@
export default {
data() {
return {
-
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
- }
- },
-
+ },},
// options: regionData,
visible: false,
dataForm: {
@@ -191,17 +167,22 @@
manufactureDate: '',
installDate: '',
// state: '',
+ verification:'',
+ inspectionUnit:'',
specifications:'',
responsibleDepartment:'',
- // createUser:'',
+ classification:'',
+ createUser:'',
status:'',
-
-
+ updateTime:'',
+ createTime:'',
description: '',
value1: '',
+ certificate:'',
+ fixedPointPosition:'',
code: null,
// type: null,
- // status: null,
+ status: null,
supplier: null
},
dataRule: {
--
Gitblit v1.9.3