From 9252ac63bade4c0e155b2c5a2882fdfda863ee96 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期一, 10 一月 2022 11:26:09 +0800
Subject: [PATCH] bug

---
 src/views/your/area-manage/areaManage.vue |   53 +++++++++++++++++++++++++++++------------------------
 1 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/views/your/area-manage/areaManage.vue b/src/views/your/area-manage/areaManage.vue
index 2277c71..65bd9e7 100644
--- a/src/views/your/area-manage/areaManage.vue
+++ b/src/views/your/area-manage/areaManage.vue
@@ -92,22 +92,21 @@
       <Row class="operation" style="padding-bottom: 20px">
         <Button @click="addCustomer" type="primary" icon="md-add">娣诲姞</Button>
         <Button @click="init" icon="md-refresh">鍒锋柊</Button>
-        <Input v-model="searchForm.name" suffix="ios-search" @on-change="getCustList" placeholder="杈撳叆鍟嗘埛鍚嶇О鎼滅储" clearable style="width: 250px"
+        <Input v-model="searchForm.customerName" suffix="ios-search" @on-change="getCustList" placeholder="杈撳叆鍟嗘埛鍚嶇О鎼滅储" clearable style="width: 250px"
         />
       </Row>
-      <Table :loading="loading" border :columns="columns3" :data="data3" ref="table" style="height: 350px"
+      <Table :loading="loading" border :columns="columns3" :data="data3" ref="table"
              sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
       </Table>
       <Row type="flex" justify="end" class="page">
-        <Page :current="searchForm.pageNumber" :total="total2"
+        <Page :current.sync="searchForm.pageNumber" :total="total2"
                 :page-size="searchForm.pageSize"
-                @on-change="changePage"
+                @on-change="changePage1"
                 @on-page-size-change="changePageSize"
                 :page-size-opts="[10, 20, 50]"
                 size="small"
                 show-total
                 show-elevator
-                show-sizer
         ></Page>
       </Row>
     </Modal>
@@ -158,7 +157,7 @@
           </Col>
           <Col span="12">
             <FormItem label="鑱旂郴鏂瑰紡" prop="phone">
-              <Input v-model="customerForm.phone" type="number"/>
+              <Input v-model="customerForm.phone"/>
             </FormItem>
           </Col>
         </Row>
@@ -277,6 +276,7 @@
   addCar,
   getCarList,
   getUser,
+  getDriver,
   addArea,
   deleteArea,
   getAreaSection,
@@ -360,6 +360,9 @@
           title: "鐗囧尯鎻忚堪",
           key: "description",
           width: 442,
+          render: (h, params) => {
+            return h("div",params.row.description=="undefined" ? '':params.row.description);
+          }
         },
         {
           title: "閰嶉�佷汉",
@@ -439,7 +442,6 @@
           title: "鎿嶄綔",
           key: "action",
           align: "center",
-
           render: (h, params) => {
             return h("div", [
               h(
@@ -503,23 +505,23 @@
         {
           title: "鍟嗘埛鍚嶇О",
           key: "name",
-          width: 100,
+          tooltip:true,
+          width: 200,
         },
         {
           title: "鍟嗘埛缂栧彿",
-          key: "code",
-          minWidth: 120,
+          key: "licence",
+          minWidth: 140,
         },
         {
           title: "鑱旂郴鏂瑰紡",
           key: "phone",
-          width: 140,
+          width: 135,
         },
         {
           title: "鐘舵��",
           key: "status",
           width:100,
-          sortable: true,
           render: (h, params) => {
             let re = "";
             if (params.row.status == 0) {
@@ -542,16 +544,6 @@
               ]);
             }
           },
-        },
-        {
-          title: "涓婃閰嶉�佹棩鏈�",
-          key: "lastTime",
-          width: 150,
-        },
-        {
-          title: "鍟嗘埛娉ㄥ唽鍦板潃",
-          key: "registeredAddress",
-          width: 180,
         },
         {
           title: "鑱旂郴浜�",
@@ -600,7 +592,9 @@
       data2: [],
       data3: [],
       total: 0,
-
+      type: {
+        type : 1
+      },
       total2: 0,
       permData: [],
       editRolePermId: "",
@@ -673,6 +667,10 @@
       this.getDataList();
       this.clearSelectAll();
     },
+    changePage1(v) {
+      this.searchForm.pageNumber = v;
+      this.getCustomerList(this.areaSectionId);
+    },
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
@@ -697,6 +695,7 @@
     },
     getCustList() {
       this.loading = true;
+      this.searchForm.pageNumber=1;
       getCustomer(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
@@ -704,9 +703,10 @@
           this.total2 = res.result.total;
         }
       });
+      this.$emit('update:current',this.searchForm.pageNumber);
     },
     getAllUser(){
-      getUser().then((res)=>{
+      getDriver({type:1}).then((res)=>{
         if (res.success){
           this.userList=res.result;
         }
@@ -772,16 +772,19 @@
                 this.$Message.success("鎿嶄綔鎴愬姛");
                 this.getDataList();
                 this.roleModalVisible = false;
+                this.areaForm={};
               }
             });
           } else {
             this.submitLoading = true;
+            this.$delete(this.areaForm,'children')
             addArea(this.areaForm).then((res) => {
               this.submitLoading = false;
               if (res.success) {
                 this.$Message.success("鎿嶄綔鎴愬姛");
                 this.getDataList();
                 this.roleModalVisible = false;
+                this.areaForm={};
               }
             });
           }
@@ -883,6 +886,7 @@
       this.$refs.areaForm.resetFields();
       delete this.areaForm.id;
       this.customerVisible = true;
+      console.log(this.areaSectionId);
     },
     addCar() {
       this.getAllUser();
@@ -922,6 +926,7 @@
       let str = JSON.stringify(v);
       let roleInfo = JSON.parse(str);
       this.areaForm = roleInfo;
+      console.log(this.areaForm);
       this.roleModalVisible = true;
     },
     editEquipment(v) {

--
Gitblit v1.9.1