From 823508ff9738e37f005d082e6bac657edf659537 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Tue, 18 Jun 2024 14:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/birthDJ/index.vue  |  2 +-
 dangan-ui/src/views/dangan/czrkdj/index.vue   |  2 +-
 .../src/views/dangan/pictureRecard/index.vue  |  5 +-
 dangan-ui/src/views/dangan/qyz/index.vue      |  2 +-
 .../src/views/dangan/retrieval/index.vue      | 66 ++++---------------
 dangan-ui/src/views/dangan/ytzm/index.vue     |  2 +-
 dangan-ui/src/views/dangan/zqz/index.vue      |  2 +-
 7 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/dangan-ui/src/views/dangan/birthDJ/index.vue b/dangan-ui/src/views/dangan/birthDJ/index.vue
index 5a0907c..7f50a9e 100644
--- a/dangan-ui/src/views/dangan/birthDJ/index.vue
+++ b/dangan-ui/src/views/dangan/birthDJ/index.vue
@@ -1108,7 +1108,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .el-carousel__item{
   background-color: #b5c2d2;
 }
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index bbd8ef2..b927813 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -1428,7 +1428,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .el-carousel__item{
   background-color: #b5c2d2;
 }
diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index 050b852..64ecaf0 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
 
-    <el-tabs tab-position="left" v-model="queryParams.ywType" style="width: 300px;" @tab-click="handleQuery">
+    <el-tabs tab-position="left" v-model="queryParams.ywType" style="width: 350px;" @tab-click="handleQuery">
       <el-tab-pane v-for="dict in dict.type.yw_type" :label="dict.label" :name="dict.value"></el-tab-pane>
     </el-tabs>
 
@@ -309,7 +309,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .app-container{
   display: flex;
 }
@@ -318,6 +318,7 @@ export default {
   position: absolute;
   top:0;
   left:0;
+  z-index: 10;
   width: 100%;
   height: 100%;
   background: rgba(255,255,255,0.8);
diff --git a/dangan-ui/src/views/dangan/qyz/index.vue b/dangan-ui/src/views/dangan/qyz/index.vue
index 11f7436..12c8add 100644
--- a/dangan-ui/src/views/dangan/qyz/index.vue
+++ b/dangan-ui/src/views/dangan/qyz/index.vue
@@ -1134,7 +1134,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .el-carousel__item{
   background-color: #b5c2d2;
 }
diff --git a/dangan-ui/src/views/dangan/retrieval/index.vue b/dangan-ui/src/views/dangan/retrieval/index.vue
index d4b6540..bf63148 100644
--- a/dangan-ui/src/views/dangan/retrieval/index.vue
+++ b/dangan-ui/src/views/dangan/retrieval/index.vue
@@ -21,11 +21,7 @@
         <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
         <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
         <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
         <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -218,11 +214,7 @@
         <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
         <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
         <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
         <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -415,11 +407,7 @@
         <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
         <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
         <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
         <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -612,11 +600,7 @@
         <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
         <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
         <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
         <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -937,11 +921,7 @@
         <el-table-column label="工作单位男" align="center" prop="mUnit" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号男" align="center" prop="mCardId" min-width="100" show-overflow-tooltip/>
         <el-table-column label="生育证号" align="center" prop="syzh" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="医院地址" align="center" prop="hospital" min-width="100" show-overflow-tooltip/>
         <el-table-column label="婴儿性别" align="center" prop="babySex" min-width="100" show-overflow-tooltip/>
         <el-table-column label="意见" align="center" prop="suggest" min-width="100" show-overflow-tooltip/>
@@ -1176,49 +1156,29 @@
         <el-table-column label="与申请人关系1" align="center" prop="relation1" min-width="120" show-overflow-tooltip/>
         <el-table-column label="姓名1" align="center" prop="name1" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别1" align="center" prop="sex1" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期1" align="center" prop="birthDate1" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthDate1, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期1" align="center" prop="birthDate1" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号1" align="center" prop="cardId1" min-width="100" show-overflow-tooltip/>
         <el-table-column label="与申请人关系2" align="center" prop="relation2" min-width="120" show-overflow-tooltip/>
         <el-table-column label="姓名2" align="center" prop="name2" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别2" align="center" prop="sex2" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期2" align="center" prop="birthDate2" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthDate2, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期2" align="center" prop="birthDate2" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号2" align="center" prop="cardId2" min-width="100" show-overflow-tooltip/>
         <el-table-column label="与申请人关系3" align="center" prop="relation3" min-width="120" show-overflow-tooltip/>
         <el-table-column label="姓名3" align="center" prop="name3" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别3" align="center" prop="sex3" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期3" align="center" prop="birthDate3" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthDate3, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期3" align="center" prop="birthDate3" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号3" align="center" prop="cardId3" min-width="100" show-overflow-tooltip/>
         <el-table-column label="与申请人关系4" align="center" prop="relation4" min-width="120" show-overflow-tooltip/>
         <el-table-column label="姓名4" align="center" prop="name4" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别4" align="center" prop="sex4" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期4" align="center" prop="birthDate4" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthDate4, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期4" align="center" prop="birthDate4" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号4" align="center" prop="cardId4" min-width="100" show-overflow-tooltip/>
         <el-table-column label="发往单位" align="center" prop="fwdw" min-width="100" show-overflow-tooltip/>
         <el-table-column label="迁入地址" align="center" prop="qrAddress" min-width="100" show-overflow-tooltip/>
         <el-table-column label="准迁原因" align="center" prop="zqReason" min-width="100" show-overflow-tooltip/>
         <el-table-column label="批准机关" align="center" prop="pzjg" min-width="100" show-overflow-tooltip/>
         <el-table-column label="承办人" align="center" prop="cbr" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="签发日期" align="center" prop="qfDate" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.qfDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="签发日期" align="center" prop="qfDate" min-width="100" show-overflow-tooltip/>
         <el-table-column label="识别图片" align="center" prop="pictures">
           <template slot-scope="scope">
             <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -1388,11 +1348,7 @@
         <el-table-column label="机关1" align="center" prop="jg1" min-width="100" show-overflow-tooltip/>
         <el-table-column label="机关2" align="center" prop="jg2" min-width="100" show-overflow-tooltip/>
         <el-table-column label="承办人" align="center" prop="cbr" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="承办日期" align="center" prop="cbDate" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.cbDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="承办日期" align="center" prop="cbDate"  min-width="100" show-overflow-tooltip/>
         <el-table-column label="识别图片" align="center" prop="pictures">
           <template slot-scope="scope">
             <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
diff --git a/dangan-ui/src/views/dangan/ytzm/index.vue b/dangan-ui/src/views/dangan/ytzm/index.vue
index 4c2f7a0..52aac91 100644
--- a/dangan-ui/src/views/dangan/ytzm/index.vue
+++ b/dangan-ui/src/views/dangan/ytzm/index.vue
@@ -1023,7 +1023,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .el-carousel__item{
   background-color: #b5c2d2;
 }
diff --git a/dangan-ui/src/views/dangan/zqz/index.vue b/dangan-ui/src/views/dangan/zqz/index.vue
index 30ba8de..4c2d4f1 100644
--- a/dangan-ui/src/views/dangan/zqz/index.vue
+++ b/dangan-ui/src/views/dangan/zqz/index.vue
@@ -1294,7 +1294,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .el-carousel__item{
   background-color: #b5c2d2;
 }