From 1b98ab0d3d007a5a65bdd446483853df34b8919c Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期三, 05 一月 2022 15:58:39 +0800
Subject: [PATCH] 优化

---
 src/views/your/carInfo-manage/carInfoManage.vue |   56 ++++++++++++++++++++++++--------------------------------
 1 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/views/your/carInfo-manage/carInfoManage.vue b/src/views/your/carInfo-manage/carInfoManage.vue
index 217e4b9..10ed7ed 100644
--- a/src/views/your/carInfo-manage/carInfoManage.vue
+++ b/src/views/your/carInfo-manage/carInfoManage.vue
@@ -259,16 +259,15 @@
             key: "carNo",
             width: 120,
             render: (h, params) => {
-              return h("div",params.row.car.carNo);
+              return h("div",params.row.car.carNo=="undefined" ? '':params.row.car.carNo);
             }
           },
           {
             title: "鍔犳补鍗″彿",
             key: "addOilCode",
             width: 140,
-            sortable: true,
             render: (h, params) => {
-              return h("div",params.row.car.addOilCode);
+              return h("div",params.row.car.addOilCode=="undefined" ? '':params.row.car.addOilCode);
             }
           },
           {
@@ -290,9 +289,24 @@
             }
           },
           {
+            title: "閫佽揣鎴锋暟",
+            key: "oilWear",
+            width: 130,
+          },
+          {
+            title: "閫佽揣閲�(浠�)",
+            key: "oilWear",
+            width: 130,
+          },
+          {
             title: "鏈堟补鑰�(鍗�)",
             key: "oilWear",
             width: 130,
+          },
+          {
+            title: "鏈堢噧娌硅垂(鍏�)",
+            key: "money",
+            width: 140,
           },
           {
             title: "鐧惧叕閲屾补鑰�",
@@ -314,32 +328,6 @@
             render: (h, params) => {
               return h("div",params.row.car.nickName);
             }
-          },
-          {
-            title: "鏈堝姞娌归噾棰�(鍏�)",
-            key: "money",
-            width: 140,
-          },
-          {
-            title: "鎿嶄綔",
-            key: "action",
-            align: "center",
-            width: 120,
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "a",
-                  {
-                    on: {
-                      click: () => {
-                        this.remove(params.row);
-                      },
-                    },
-                  },
-                  "鍒犻櫎"
-                ),
-              ]);
-            },
           },
         ],
         data: [],
@@ -454,14 +442,18 @@
           this.searchForm.beginTime = this.selectDate(this.value[0]);
           this.searchForm.endTime = this.selectDate(this.value[1]);
         }else{
-          this.searchForm.beginTime = "";
-          this.searchForm.endTime = "";
+          var date = new Date();
+          this.searchForm.endTime = this.selectDate(date);
+          this.value[1] = this.searchForm.endTime;
+          date.setDate(1);
+          this.value[0] = date;
+          this.searchForm.beginTime = this.selectDate(date);
         }
         getCar(this.searchForm).then((res) => {
           this.loading = false;
           if (res.success) {
             this.data = res.result;
-            this.total = res.result.length;
+            this.total = res.result[0].total;
           }
         });
       },

--
Gitblit v1.9.1