From 80e514ca619fbb1fdc1559db4e97f24d61c68b46 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 11 一月 2022 11:23:39 +0800
Subject: [PATCH] bug

---
 src/views/your/area-manage/areaManage.vue |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/your/area-manage/areaManage.vue b/src/views/your/area-manage/areaManage.vue
index bbec1da..3eb330d 100644
--- a/src/views/your/area-manage/areaManage.vue
+++ b/src/views/your/area-manage/areaManage.vue
@@ -68,6 +68,7 @@
         </FormItem>
         <FormItem label="閰嶉�佸憳" prop="userId">
           <Select v-model="areaForm.userId" filterable>
+            <Option :value="0" :key="0" selected>璇烽�夋嫨</Option>
             <Option v-for="item in userList" :value="item.id">{{ item.nickname }}</Option>
           </Select>
         </FormItem>
@@ -92,14 +93,14 @@
       <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"
              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="changePage1"
                 @on-page-size-change="changePageSize"
@@ -107,7 +108,6 @@
                 size="small"
                 show-total
                 show-elevator
-                show-sizer
         ></Page>
       </Row>
     </Modal>
@@ -361,6 +361,9 @@
           title: "鐗囧尯鎻忚堪",
           key: "description",
           width: 442,
+          render: (h, params) => {
+            return h("div",params.row.description=="undefined" ? '':params.row.description);
+          }
         },
         {
           title: "閰嶉�佷汉",
@@ -668,7 +671,6 @@
     changePage1(v) {
       this.searchForm.pageNumber = v;
       this.getCustomerList(this.areaSectionId);
-      this.clearSelectAll();
     },
     changePageSize(v) {
       this.searchForm.pageSize = v;
@@ -694,6 +696,7 @@
     },
     getCustList() {
       this.loading = true;
+      this.searchForm.pageNumber=1;
       getCustomer(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
@@ -701,6 +704,7 @@
           this.total2 = res.result.total;
         }
       });
+      this.$emit('update:current',this.searchForm.pageNumber);
     },
     getAllUser(){
       getDriver({type:1}).then((res)=>{
@@ -723,7 +727,6 @@
       this.loading = true;
       this.searchForm.areaSectionId=areaSectionId;
       getCustomer(this.searchForm).then((res) => {
-        console.log(this.searchForm)
         this.loading = false;
         if (res.success) {
           this.data3 = res.result.records;
@@ -759,6 +762,12 @@
       this.roleModalVisible = false;
     },
     submitArea() {
+      if(this.areaForm.userId==undefined){
+        this.areaForm.userId=0;
+      }
+      if(this.areaForm.description==undefined){
+        this.areaForm.description="";
+      }
       this.$refs.areaForm.validate((valid) => {
         if (valid) {
           if (this.modalType == 0) {
@@ -884,6 +893,7 @@
       this.$refs.areaForm.resetFields();
       delete this.areaForm.id;
       this.customerVisible = true;
+      console.log(this.areaSectionId);
     },
     addCar() {
       this.getAllUser();

--
Gitblit v1.9.1