From 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 10:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/collection/collectionInfo.vue |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 4e4439f..6145d2e 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -17,9 +17,9 @@
            <el-row :span="12">
              <el-cow >
               <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="70px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
-                </el-input>
-
+                <el-date-picker v-model="formData.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                  :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+                ></el-date-picker>
               </el-form-item>
 
              </el-cow>
@@ -67,6 +67,12 @@
               <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
             </el-form-item>
              </el-cow>
+             <el-cow >
+               <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
+                 <el-input  v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
+               </el-form-item>
+             </el-cow>
+
            </el-row>
          </el-container>
           <h4 class="form-header">鐩稿叧鍥剧墖 </h4>

--
Gitblit v1.9.1