From a0654f2c21511a0e16b977427a563a3ccdfd1fba Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 14 三月 2023 15:34:06 +0800
Subject: [PATCH] 搜索bug

---
 src/views/your/addOil-manage/addOilManage.vue |   76 ++++++++++++++++++++++++++------------
 1 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/views/your/addOil-manage/addOilManage.vue b/src/views/your/addOil-manage/addOilManage.vue
index 1cd128a..62983b1 100644
--- a/src/views/your/addOil-manage/addOilManage.vue
+++ b/src/views/your/addOil-manage/addOilManage.vue
@@ -13,9 +13,9 @@
           openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
           }}</Button>
         <Input
-                v-model="searchForm.carNo"
+                v-model="searchForm2.carNo"
                 suffix="ios-search"
-                @on-change="getDataList"
+                @on-change="getDataList2"
                 placeholder="杈撳叆杞︾墝鍙锋悳绱�"
                 clearable
                 style="width: 250px"
@@ -82,24 +82,32 @@
         <Row :gutter="0">
           <Col span="12">
             <FormItem label="鍔犳补閲�" prop="amount">
-              <Input v-model="addOilForm.amount" type="number"/>
+              <Input v-model="addOilForm.amount" type="number">
+                <span slot="append">鍗�</span>
+              </Input>
             </FormItem>
           </Col>
           <Col span="12">
             <FormItem label="鍗曚环" prop="unitPrice">
-              <Input v-model="addOilForm.unitPrice" type="number"/>
+              <Input v-model="addOilForm.unitPrice" type="number">
+                <span slot="append">鍏�</span>
+              </Input>
             </FormItem>
           </Col>
         </Row>
         <Row :gutter="0">
           <Col span="12">
             <FormItem label="鍔犳补閲戦" prop="money">
-              <Input v-model="addOilForm.money" type="number"/>
+              <Input v-model="addOilForm.money" type="number">
+                <span slot="append">鍏�</span>
+              </Input>
             </FormItem>
           </Col>
           <Col span="12">
             <FormItem label="閲岀▼" prop="mileage">
-              <Input v-model="addOilForm.mileage" type="number"/>
+              <Input v-model="addOilForm.mileage" type="number">
+                <span slot="append">鍏噷</span>
+              </Input>
             </FormItem>
           </Col>
         </Row>
@@ -247,6 +255,14 @@
           order: "desc", // 榛樿鎺掑簭鏂瑰紡
           key: "",
         },
+        searchForm2: {
+          // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+          pageNumber: 1, // 褰撳墠椤垫暟
+          pageSize: 10, // 椤甸潰澶у皬
+          sort: "createTime", // 榛樿鎺掑簭瀛楁
+          order: "desc", // 榛樿鎺掑簭鏂瑰紡
+          key: "",
+        },
         addOilForm: {
           status : 0
         },
@@ -274,19 +290,18 @@
           {
             title: "杞︾墝鍙�",
             key: "carNo",
-            width: 100,
+            width: 120,
             sortable: true,
           },
           {
             title: "鍔犳补鍗″彿",
             key: "addOilCode",
-            width: 100,
-            sortable: true,
+            width: 140,
           },
           {
             title: "鍔犳补鏃ユ湡",
             key: "addDate",
-            width: 150,
+            width: 120,
             sortable: true,
           },
           {
@@ -304,19 +319,22 @@
           {
             title: "鍔犳补閲戦",
             key: "money",
-            minWidth: 100,
+            minWidth: 120,
             sortable: true,
           },
           {
             title: "鍔犳补鏃堕噷绋�",
             key: "mileage",
-            minWidth: 100,
+            minWidth: 130,
             sortable: true,
           },
           {
             title: "澶囨敞",
             key: "remarks",
-            minWidth: 150,
+            width: 150,
+            render: (h, params) => {
+              return h("div",params.row.remarks=="undefined" ? '':params.row.remarks);
+            }
           },
           {
             title: "鎿嶄綔",
@@ -326,15 +344,15 @@
             render: (h, params) => {
               return h("div", [
                 h(
-                        "a",
-                        {
-                          on: {
-                            click: () => {
-                              this.edit(params.row);
-                            },
-                          },
-                        },
-                        "缂栬緫"
+                  "a",
+                  {
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      },
+                    },
+                  },
+                  "缂栬緫"
                 ),
                 h("Divider", {
                   props: {
@@ -446,7 +464,17 @@
           this.loading = false;
           if (res.success) {
             this.data = res.result.records;
-            this.total = res.result.length;
+            this.total = res.result.total;
+          }
+        });
+      },
+      getDataList2() {
+        this.loading = true;
+        getAddOilList(this.searchForm2).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
           }
         });
       },
@@ -868,4 +896,4 @@
       this.init();
     },
   };
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.1