统计

src/styles/index.scss

@@ -180,9 +180,13 @@ top: 41px !important;
   line-height: 32px !important;
 }
 
+.ivu-table-fixed.ivu-table-fixed-shadow {
+  height: calc(100% - 8px);
+  scrollbar-width: 8px;
+}
 ::-webkit-scrollbar {
-  width: 6px;
+  width: 8px;
-  height: 6px;
+  height: 8px;
 }
 
 ::-webkit-scrollbar-thumb {

src/views/dashboard/index.vue

@@ -39,6 +39,7 @@
 
               <div class="card-content">
                 <Table
+                  border
                   :loading="leaseTableLoading"
                   size="small"
                   stripe
@@ -46,6 +47,7 @@
                   :height="300"
                   :data="leases"
                   :columns="leaseTable"
+                  @on-row-dblclick="leaseRowDbclick"
                 ></Table>
                 <div class="page">
                   <Page
@@ -86,6 +88,7 @@
               </div>
               <div class="card-content">
                 <Table
+                  border
                   :loading="payTableLoading"
                   size="small"
                   stripe
@@ -93,6 +96,7 @@
                   :height="300"
                   :data="pays"
                   :columns="payTable"
+                  @on-row-dblclick="leasePlanDbclick"
                 ></Table>
                 <div class="page">
                   <Page
@@ -450,38 +454,121 @@ export default {
           fixed: "left",
           align: "left",
           render: (h, { row }) => {
-            let tags = [
+            let tags = row.id_leases_to_assets_lease_id_relation?.map(item => {
-              ...row?.land?.map((i) =>
+              if (item.land_id) {
-                h(
+                let land = row.land?.find(j => j.id === item.land_id)
-                  "Tag",
+                return h('el-popover',{
-                  {
+                  props: {
-                    props: {
+                    width: 200
-                      type: "dot",
+                  }
-                      color: "#3fa45a",
+                },[
+                  h(
+                    "Tag",
+                    {
+                      slot: 'reference',
+                      props: {
+                        type: "dot",
+                        color: "#3fa45a",
+                      },
+                      style: {
+                        background: "#e5f4ea !important",
+                      },
                     },
-                    style: {
+                    land.name
-                      background: "#e5f4ea !important",
+                  ),
+                  h("div",{
+                    slot: 'default'
+                  }, (land.name||'无') + '-' + (item.xiangxiweizhi||'无') + '-' + (item.chuzumianji||'0'))
+                ])
+              } else if (item.house_id) {
+                let house = row.houses?.find(j => j.id === item.house_id)
+                return h("el-popover",{
+                  props: {
+                    width: 200,
+                    trigger: "hover"
+                  }
+                },[
+                  h(
+                    "Tag",
+                    {
+                      slot: "reference",
+                      props: {
+                        type: "dot",
+                        color: "#2254e4",
+                      },
+                      style: {
+                        background: "#e8edfc !important",
+                      },
                     },
-                  },
+                    h("div",{
-                  i.name
+                      slot: 'default'
-                )
+                    },(house.name||'无') + '-' + (item.xiangxiweizhi||'无') + '-' + (item.chuzumianji||'0'))
-              ),
+                  )
-              ...row?.houses?.map((i) =>
+                ])
-                h(
+              } else {
-                  "Tag",
+                return h("el-popover",{
-                  {
+                  props: {
-                    props: {
+                    width: 200,
-                      type: "dot",
+                    trigger: "hover"
-                      color: "#2254e4",
+                  }
+                },[
+                  h(
+                    "Tag",
+                    {
+                      slot: "reference",
+                      props: {
+                        type: "dot",
+                        color: "#6c3fa4",
+                      },
+                      style: {
+                        background: "#b78cea !important",
+                      },
                     },
-                    style: {
+                    item.name || ""
-                      background: "#e8edfc !important",
+                  ),
+                  h(
+                    "div",
+                    {
+                      slot: "default"
                     },
-                  },
+                    (item.name||'无') + '-' + (item.xiangxiweizhi||'无') + '-' + (item.chuzumianji||'0')
-                  i.name
+                  ),
-                )
+                ])
-              ),
+              }
-            ];
+
+            })
+            // let tags = [
+            //   ...row?.land?.map((i) =>
+            //     h(
+            //       "Tag",
+            //       {
+            //         props: {
+            //           type: "dot",
+            //           color: "#3fa45a",
+            //         },
+            //         style: {
+            //           background: "#e5f4ea !important",
+            //         },
+            //       },
+            //       i.name
+            //     )
+            //   ),
+            //   ...row?.houses?.map((i) =>
+            //     h(
+            //       "Tag",
+            //       {
+            //         props: {
+            //           type: "dot",
+            //           color: "#2254e4",
+            //         },
+            //         style: {
+            //           background: "#e8edfc !important",
+            //         },
+            //       },
+            //       i.name
+            //     )
+            //   ),
+            // ];
             return h("div", [
               ...tags.slice(0, 1),
               h(
@@ -514,12 +601,6 @@ export default {
             ]);
           },
         },
-        {
-          title: "出租方",
-          key: "chuzufang",
-          align: "left",
-          width: 150,
-        },
         {
           title: "租赁期限",
           width: 190,
@@ -601,6 +682,17 @@ export default {
     },
   },
   methods: {
+    leaseRowDbclick(row, index) {
+      this.$router.push({
+        path: '/lease/detail/' + row.id
+      })
+    },
+    leasePlanDbclick(row, index) {
+      this.$router.push({
+        path: '/leasePlan/detail/' + row.id
+      })
+    },
+
     index,
     async loadData() {
       await getChartsHome()