导入

src/layout/components/AppMain.vue

@@ -2,7 +2,7 @@
   <el-scrollbar wrap-class="app-main-scroll" class="main-scroll">
     <section class="app-main">
       <transition name="fade-transform" mode="out-in">
-        <keep-alive :include="['tableList','mapList']">
+        <keep-alive :include="['tableList','mapList','leaseIndex']">
           <router-view :key="key" />
         </keep-alive>
       </transition>

src/views/dashboard/index.vue

@@ -137,7 +137,7 @@
                     $refs['drawer'].show())
               "
             >
-              <span>{{ item.name || item.dikuaimingcheng }}</span>
+              <span>{{ item.chengzufang }}</span>
               <span>{{ item.shijian || item.zulinkaishiqixian }}</span>
             </div>
 
@@ -299,7 +299,7 @@ export default {
         {
           title: "资产名称",
           key: "dikuaimingcheng",
-          width: 200,
+          minWidth: 220,
           fixed: "left",
           align: "left",
           render: (h, { row }) => {
@@ -378,25 +378,10 @@ export default {
           width: 140,
           render: (h, { row }) => h('div',{ style: { 'text-align': 'right' } },row.yingshou)
         },
-        {
-          key: "zulinjieduanjieshuriqi",
-          title: "租赁阶段结束日期",
-          width: 160
-        },
-        {
-          key: "zulinjieduankaishiriqi",
-          title: "租赁阶段开始日期",
-          width: 160
-        },
-        {
-          key: "weidaoweiyuanyin",
-          title: "未到位原因",
-          minWidth: 140
-        },
         {
           key: "dept",
-          title: "分公司",
-          width: 160,
+          title: "出租方",
+          width: 200,
           render: (h, { row }) => {
             return h('div',`${row.department ? ('【' + row.department.name + '】') : ''}${row.admin ? row.admin.name : ''}`)
           }
@@ -455,7 +440,7 @@ export default {
         {
           title: "资产名称",
           key: "dikuaimingcheng",
-          width: 200,
+          minWidth: 220,
           fixed: "left",
           align: "left",
           render: (h, { row }) => {
@@ -529,12 +514,6 @@ export default {
           align: "left",
           width: 150,
         },
-        {
-          title: "承租方",
-          align: "center",
-          key: "chengzufang",
-          width: 150,
-        },
         {
           title: "租赁期限",
           width: 190,
@@ -566,37 +545,10 @@ export default {
           align: "right",
           width: 120,
         },
-        {
-          title: "实收租金",
-          label: "shishouzujin",
-          align: "right",
-          width: 120,
-        },
-        {
-          title: "保证金",
-          key: "baozhengjin",
-          width: 120,
-          customFn: (row) => {
-            return (
-              <div
-                style={{
-                  "text-align": row.baozhengjin === "无" ? "center" : "right",
-                }}
-              >
-                {row.baozhengjin}
-              </div>
-            );
-          },
-        },
-        {
-          title: "未到位原因",
-          key: "weidaoweiyuanyin",
-          minWidth: 140,
-        },
         {
           key: "dept",
-          title: "分公司",
-          width: 160,
+          title: "出租方",
+          width: 200,
           render: (h, { row }) => {
             return h('div',`${row.department ? ('【' + row.department.name + '】') : ''}${row.admin ? row.admin.name : ''}`)
           }

src/views/lease/component/imports.vue

@@ -137,6 +137,29 @@ export default {
       });
     },
     handleFileSelect(file) {
+      function getTimezoneOffsetMS(date) {
+        var time = date.getTime();
+        var utcTime = Date.UTC(date.getFullYear(),
+          date.getMonth(),
+          date.getDate(),
+          date.getHours(),
+          date.getMinutes(),
+          date.getSeconds(),
+          date.getMilliseconds());
+        return time - utcTime;
+      }
+
+      const importBugHotfixDiff = (function () {
+        const basedate = new Date(1899, 11, 30, 0, 0, 0);
+        const dnthreshAsIs = (new Date().getTimezoneOffset() - basedate.getTimezoneOffset()) * 60000;
+        const dnthreshToBe = getTimezoneOffsetMS(new Date()) - getTimezoneOffsetMS(basedate);
+        return dnthreshAsIs - dnthreshToBe;
+      }());
+
+      function fixPrecisionLoss(date) {
+        return (new Date(date.getTime() - importBugHotfixDiff));
+      }
+
       let linkTableName = new Map([
         ['标的类型', 'biaodileixing'],
         ['租赁标的', 'name'],
@@ -187,7 +210,13 @@ export default {
               } else {
                 let field = this.formInfo.find(j => j.name === header)
                 if (field) {
-                  myrow[field.field] = row[index1] instanceof Date ? this.$moment(row[index1]).format('YYYY-MM-DD') : row[index1]
+                  if (row[index1] instanceof Date ) {
+                    myrow[field.field] = this.$moment(fixPrecisionLoss(row[index1])).format('YYYY-MM-DD')
+                  } else if (typeof row[index1] === 'number') {
+                    myrow[field.field] = row[index1].toFixed(2)
+                  } else {
+                    myrow[field.field] = row[index1]
+                  }
                 }
               }
             })

src/views/lease/detailLease.vue

@@ -212,12 +212,19 @@ export default {
         {
           prop: 'biaodileixing',
           label: '标的类型',
-          width: 160
+          width: 160,
+          customFn: (row) => {
+            return (
+              <span>
+                {(row.land_id || row.house_id) ? (row.land_id ? '土地' : '房产') : row.biaodileixing}
+              </span>
+            );
+          },
         },
         {
           prop: "zuoluo",
           label: "坐落",
-          width: 160,
+          minWidth: 160,
           align: "left",
           customFn: (row) => {
             return (
@@ -233,7 +240,7 @@ export default {
         {
           prop: 'xiangxiweizhi',
           label: '详细位置',
-          width: 180,
+          minWidth: 180,
           align: 'left'
         },
         {

src/views/lease/index.vue

@@ -323,7 +323,7 @@ import headerContent from "@/components/LxHeader/XyContent.vue";
 import addPay from "@/views/lease/component/addPay.vue";
 import payList from "@/views/lease/component/payList.vue"
 export default {
-  name: 'tableList',
+  name: 'leaseIndex',
   components: {
     imports,
     LxHeader,