From 26c4f7ae79ad5ad2300876b94f96f19e4f93d53a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 18 十二月 2023 16:02:12 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/basic/location/location-form.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index 11c4657..26c0b1c 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -134,10 +134,23 @@
<el-row>
<el-col :span="12">
+ <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
+ <el-date-picker
+ readonly
+ style="width: 100%"
+ v-model="moment"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
<el-form-item
label="IFS搴撲綅"
prop="ifsLocationDesc"
- >
+ > -->
<!-- <el-select
v-model="dataForm.ifsLocation"
filterable
@@ -152,13 +165,13 @@
>
</el-option>
</el-select> -->
- <el-cascader
+ <!-- <el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
style="width:100%" filterable
></el-cascader>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="搴撲綅鐘舵��" prop="locStatus">
<el-switch
@@ -169,7 +182,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="12">
<el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
<el-date-picker
@@ -184,7 +197,7 @@
</el-form-item>
</el-col>
<el-col :span="12"> </el-col>
- </el-row>
+ </el-row> -->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
--
Gitblit v1.9.3