From a90248016985f67c96c8215160e0e2ba96cd38ed Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 4 Dec 2024 14:18:58 +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/views/dashboard/index.vue         | 202 +++++++++++++-------------
 src/views/lease/component/imports.vue |   2 +-
 src/views/lease/index.vue             |   6 +-
 3 files changed, 109 insertions(+), 101 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8ecc366..ac3377d 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,107 +2,113 @@
   <div style="padding: 20px;">
     <el-row :gutter="20">
       <el-col :span="24">
-        <Card style="margin-bottom: 20px" :padding="20">
-          <div class="card-title">
-            <div class="title-icon">
-              <i class="el-icon-s-claim"></i>
-            </div>
-            <p>合同待办</p>
-
-            <div
-              class="lease-status-switch"
-              :data-status="radio"
-            >
-              <div
-                v-for="(item, index) in status"
-                :data-status="index"
-                :class="{ 'active-switch': radio === index }"
-                @click="radioPick(index)"
-              >
-                <el-badge :value="statusTotal[index]" :max="99">
-                  {{ item }}
-                </el-badge>
+        <Card style="margin-bottom: 20px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <div class="card-title">
+                <div class="title-icon">
+                  <i class="el-icon-s-claim"></i>
+                </div>
+                <p>合同待办</p>
+
+                <div
+                  class="lease-status-switch"
+                  :data-status="radio"
+                >
+                  <div
+                    v-for="(item, index) in status"
+                    :data-status="index"
+                    :class="{ 'active-switch': radio === index }"
+                    @click="radioPick(index)"
+                  >
+                    <el-badge :value="statusTotal[index]" :max="99">
+                      {{ item }}
+                    </el-badge>
+                  </div>
+                </div>
+
+                <div class="lease-legend">
+                  <div>土地</div>
+                  <div>房产</div>
+                </div>
+
+                <div class="more" @click="$router.push('/lease')">
+                  <Icon type="md-add" />
+                </div>
               </div>
-            </div>
-
-            <div class="lease-legend">
-              <div>土地</div>
-              <div>房产</div>
-            </div>
-
-            <div class="more" @click="$router.push('/lease')">
-              <Icon type="md-add" />
-            </div>
-          </div>
-
-          <div class="card-content">
-            <Table
-              :loading="leaseTableLoading"
-              size="small"
-              stripe
-              highlight-row
-              :height="300"
-              :data="leases"
-              :columns="leaseTable"
-            ></Table>
-            <div class="page">
-              <Page
-                style="margin-top: 14px; display: flex; justify-content: flex-end"
-                size="small"
-                :current.sync="leaseSelect.page"
-                :total="leaseTotal"
-                show-elevator
-                show-total
-                :page-size="leaseSelect.page_size"
-                @on-change="getLeases"
-              ></Page>
-            </div>
-          </div>
-          <div class="card-title" style="margin-top: 20px;">
-            <div class="title-icon">
-              <i class="el-icon-s-claim"></i>
-            </div>
-            <p>收租待办</p>
 
-            <div
-              class="lease-status-switch"
-              :data-status="radio1"
-            >
-              <div
-                v-for="(item, index) in status"
-                :data-status="index"
-                :class="{ 'active-switch': radio1 === index }"
-                @click="radio1Pick(index)"
-              >
-                <el-badge :value="statusTotal1[index]" :max="99">
-                  {{ item }}
-                </el-badge>
+              <div class="card-content">
+                <Table
+                  :loading="leaseTableLoading"
+                  size="small"
+                  stripe
+                  highlight-row
+                  :height="300"
+                  :data="leases"
+                  :columns="leaseTable"
+                ></Table>
+                <div class="page">
+                  <Page
+                    style="margin-top: 14px; display: flex; justify-content: flex-end"
+                    size="small"
+                    :current.sync="leaseSelect.page"
+                    :total="leaseTotal"
+                    show-elevator
+                    show-total
+                    :page-size="leaseSelect.page_size"
+                    @on-change="getLeases"
+                  ></Page>
+                </div>
               </div>
-            </div>
-          </div>
-          <div class="card-content">
-            <Table
-              :loading="payTableLoading"
-              size="small"
-              stripe
-              highlight-row
-              :height="300"
-              :data="pays"
-              :columns="payTable"
-            ></Table>
-            <div class="page">
-              <Page
-                style="margin-top: 14px; display: flex; justify-content: flex-end"
-                size="small"
-                :current.sync="paySelect.page"
-                :total="payTotal"
-                show-elevator
-                show-total
-                :page-size="paySelect.page_size"
-                @on-change="getLeasePay"
-              ></Page>
-            </div>
-          </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="card-title">
+                <div class="title-icon">
+                  <i class="el-icon-s-claim"></i>
+                </div>
+                <p>收租待办</p>
+
+                <div
+                  class="lease-status-switch"
+                  :data-status="radio1"
+                >
+                  <div
+                    v-for="(item, index) in status"
+                    :data-status="index"
+                    :class="{ 'active-switch': radio1 === index }"
+                    @click="radio1Pick(index)"
+                  >
+                    <el-badge :value="statusTotal1[index]" :max="99">
+                      {{ item }}
+                    </el-badge>
+                  </div>
+                </div>
+              </div>
+              <div class="card-content">
+                <Table
+                  :loading="payTableLoading"
+                  size="small"
+                  stripe
+                  highlight-row
+                  :height="300"
+                  :data="pays"
+                  :columns="payTable"
+                ></Table>
+                <div class="page">
+                  <Page
+                    style="margin-top: 14px; display: flex; justify-content: flex-end"
+                    size="small"
+                    :current.sync="paySelect.page"
+                    :total="payTotal"
+                    show-elevator
+                    show-total
+                    :page-size="paySelect.page_size"
+                    @on-change="getLeasePay"
+                  ></Page>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
         </Card>
       </el-col>
 
diff --git a/src/views/lease/component/imports.vue b/src/views/lease/component/imports.vue
index 8ac7604..9149c9e 100644
--- a/src/views/lease/component/imports.vue
+++ b/src/views/lease/component/imports.vue
@@ -174,7 +174,7 @@ export default {
         const workbook = XLSX.read(data, { type: 'array', cellDates: true, defval: "" });
 
         const worksheet = workbook.Sheets[workbook.SheetNames[0]];
-        const merges = Array.from(new Set(worksheet['!merges'].map(i => JSON.stringify({ rs: i.s.r-2 , re: i.e.r-2 })))).map(JSON.parse)
+        const merges = Array.from(new Set(worksheet['!merges']?.map(i => JSON.stringify({ rs: i.s.r-2 , re: i.e.r-2 })))).map(JSON.parse)
         const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: "" });
         const headers = jsonData.splice(0, 1)[0]
         const list = jsonData.slice(1)
diff --git a/src/views/lease/index.vue b/src/views/lease/index.vue
index 5a5d491..f56fc4d 100644
--- a/src/views/lease/index.vue
+++ b/src/views/lease/index.vue
@@ -666,12 +666,12 @@ export default {
       this.table.unshift( {
         label: "资产",
         prop: 'assets',
-        width: 300,
+        width: 320,
         align: 'left',
         customFn: row => {
           let tags = row.id_leases_to_assets_lease_id_relation?.slice(0,1)?.map(i => {
             let asset = i.house_id ? row.houses.find(j => j.id === i.house_id) : row.land.find(j => j.id === i.land_id)
-            return (<Tag color="success" style="background: rgb(65, 100, 227) !important;">{(i.land_id ? '【土地】' : '【房产】')+(asset?.name || i.name || " ")}</Tag>)
+            return (<Tag color="success" style="background: rgb(65, 100, 227) !important;">{(i.land_id ? '【土地】' : '【房产】')+(asset?.name || i.name || " ")}-{ i.xiangxiweizhi }</Tag>)
 
           })
           return (
@@ -679,10 +679,12 @@ export default {
               {
                 tags.slice(0, 1)
               }
+              <br></br>
               <el-popover title="资产" width={600}>
                 <el-link slot="reference"
                          type="primary"
                          style={{
+                           "font-size": "13px",
                            "word-break": "keep-all",
                            display: tags.length > 0 ? "inline" : "none",
                          }}>更多</el-link>