From 3549fed09cc87c323ca6c8a3d55c83fc495f4b7e Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 11:55:19 +0800
Subject: [PATCH] 家庭设备的打印功能已经没有问题了 家庭设备详情的时候,不可以上传文件 家谱思维导图可以打击查看信息了

---
 ruoyi-ui/src/views/collection/index.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 77dff43..0afe162 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -209,6 +209,9 @@
       <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
         <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
+      <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+        <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+      </el-table-column>
       <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
 
         <template slot-scope="scope" >
@@ -281,7 +284,9 @@
 <!--          <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
 <!--        </el-form-item>-->
         <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">
-          <el-input v-model='formDat.happenTime' type='date' clearable placeholder='閫夋嫨鏃ユ湡'></el-input>
+          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+             :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="绫诲埆" prop="type">
           <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}"  >

--
Gitblit v1.9.1