From 00c65348c5c00a5c9be5a897b9c6f3b6a7b564ac Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 5 Dec 2024 11:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XyTable/index.vue           | 12 +++++--
 src/views/lease/component/payList.vue      | 16 +++++++--
 src/views/statics/DepartmentStatistics.vue | 40 ++++++++++++++++++++++
 3 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 src/views/statics/DepartmentStatistics.vue

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index a1f72d6..7302ed9 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -528,8 +528,8 @@ export default {
 
             <el-popover
               placement="top-start"
-              width="608"
-              trigger="hover"
+              width="612"
+              trigger="click"
               scopedSlots={{
                 default: () => {
                   return (
@@ -538,7 +538,13 @@ export default {
                                  data={this.$props?.tableItem}
                                  props={{
                                    props: { key: 'prop', label: 'label' }
-                                 }}></el-transfer>
+                                 }}
+                                 scopedSlots={{
+                                   default: ({ option }) => {
+                                     return option.label.length > 6 ? (<el-tooltip effect="dark" content={option.label} placement="top" ><span>{option.label}</span></el-tooltip>) : (<span>{option.label}</span>)
+                                   }
+                                 }}>
+                    </el-transfer>
                   )
                   // return (
                   //   <el-checkbox-group v-model={this.checkTable}>
diff --git a/src/views/lease/component/payList.vue b/src/views/lease/component/payList.vue
index 92eebf5..8c799d7 100644
--- a/src/views/lease/component/payList.vue
+++ b/src/views/lease/component/payList.vue
@@ -266,11 +266,23 @@ export default {
         {
           prop: "weidaoweiyuanyin",
           label: "未到位原因",
-          align: "left"
+          align: "left",
+          minWidth: 180
         },
         {
           prop: "shijidaozhangriqi",
-          label: "实际到账日期"
+          label: "实际到账日期",
+          width: 180
+        },
+        {
+          prop: "zulinjieduankaishiriqi",
+          label: "请选择租赁阶段开始日期",
+          width: 200
+        },
+        {
+          prop: "zulinjieduanjieshuriqi",
+          label: "请选择租赁阶段结束日期",
+          width: 200
         },
         {
           prop: 'destroy',
diff --git a/src/views/statics/DepartmentStatistics.vue b/src/views/statics/DepartmentStatistics.vue
new file mode 100644
index 0000000..7bca3b2
--- /dev/null
+++ b/src/views/statics/DepartmentStatistics.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <!-- 查询配置 -->
+    <div>
+      <div ref="lxHeader">
+        <LxHeader
+          :icon="$route.meta.icon"
+          :text="$route.meta.title"
+        >
+          <div slot="content"></div>
+          <slot>
+            <DatePicker style="padding-left: 20px;" v-model="year" type="year" formatter="yyyy"></DatePicker>
+
+          </slot>
+
+        </LxHeader>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import LxHeader from '@/components/LxHeader/index.vue'
+
+export default {
+  components: {
+    LxHeader
+  },
+  data() {
+    return {
+      year: new Date().getFullYear().toString()
+    }
+  },
+  methods: {},
+  computed: {}
+}
+</script>
+
+<style scoped lang="scss">
+</style>