瀏覽代碼

bug修复

chenrui 3 年之前
父節點
當前提交
f92c85b374

+ 9 - 6
src/views/common/chooseCustomerModal.vue

@@ -23,21 +23,21 @@
                 <a-form-item label="地区">
                   <a-col span="7">
                     <a-form-item prop="provinceSn" style="margin: 0;">
-                      <a-select v-model="queryParam.provinceSn" @change="getCityList" placeholder="请选择省">
+                      <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
                         <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
                       </a-select>
                     </a-form-item>
                   </a-col>
                   <a-col span="7" offset="1">
                     <a-form-item prop="citySn" style="margin: 0;">
-                      <a-select v-model="queryParam.citySn" @change="getAreaList" placeholder="请选择市">
+                      <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
                         <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
                       </a-select>
                     </a-form-item>
                   </a-col>
                   <a-col span="7" offset="1">
                     <a-form-item prop="districtSn" style="margin: 0;">
-                      <a-select v-model="queryParam.districtSn" placeholder="请选择区/县">
+                      <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
                         <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
                       </a-select>
                     </a-form-item>
@@ -144,7 +144,6 @@ export default {
       this.$refs.table.refresh(true)
     },
     resetData () {
-      console.log('重置艾迪康')
       this.queryParam.dealerName = ''
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
@@ -171,13 +170,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.districtSn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 21 - 10
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -65,21 +65,21 @@
                       <!-- 地址 -->
                       <a-col span="8">
                         <a-form-model-item prop="provinceSn">
-                          <a-select id="merchantInfoManagementEdit-provinceSn" @change="getCityList" v-model="form.provinceSn" placeholder="请选择省">
+                          <a-select id="merchantInfoManagementEdit-provinceSn" allowClear @change="getCityList" v-model="form.provinceSn" placeholder="请选择省">
                             <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
                       </a-col>
                       <a-col span="8">
                         <a-form-model-item prop="citySn">
-                          <a-select id="merchantInfoManagementEdit-citySn" @change="getAreaList" v-model="form.citySn" placeholder="请选择市">
+                          <a-select id="merchantInfoManagementEdit-citySn" allowClear @change="getAreaList" v-model="form.citySn" placeholder="请选择市">
                             <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
                       </a-col>
                       <a-col span="8">
                         <a-form-model-item prop="districtSn">
-                          <a-select id="merchantInfoManagementEdit-districtSn" @change="areaCharged" v-model="form.districtSn" placeholder="请选择区/县">
+                          <a-select id="merchantInfoManagementEdit-districtSn" allowClear @change="areaCharged" v-model="form.districtSn" placeholder="请选择区/县">
                             <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
@@ -156,6 +156,7 @@
                       :disabledDate="disabledDate"
                       v-model="form.buildDate"
                       :format="dateFormat"
+                      allowClear
                       placeholder="请选择日期" />
                   </a-form-model-item>
                 </a-col>
@@ -188,6 +189,7 @@
                       :disabledDate="disabledDate"
                       v-model="form.brithday"
                       :format="dateFormat"
+                      allowClear
                       placeholder="请选择日期" />
                   </a-form-model-item>
                 </a-col>
@@ -247,21 +249,21 @@
                       <!-- 地址 -->
                       <a-col span="8">
                         <a-form-model-item prop="receiveProvinceSn">
-                          <a-select id="merchantInfoManagementEdit-receiveProvinceSn" @change="getCityList1" v-model="form.receiveProvinceSn" placeholder="请选择省">
+                          <a-select id="merchantInfoManagementEdit-receiveProvinceSn" allowClear @change="getCityList1" v-model="form.receiveProvinceSn" placeholder="请选择省">
                             <a-select-option v-for="item in addrProvinceList1" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
                       </a-col>
                       <a-col span="8">
                         <a-form-model-item prop="receiveCitySn">
-                          <a-select id="merchantInfoManagementEdit-receiveCitySn" @change="getAreaList1" v-model="form.receiveCitySn" placeholder="请选择市">
+                          <a-select id="merchantInfoManagementEdit-receiveCitySn" allowClear @change="getAreaList1" v-model="form.receiveCitySn" placeholder="请选择市">
                             <a-select-option v-for="item in addrCityList1" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
                       </a-col>
                       <a-col span="8">
                         <a-form-model-item prop="receiveDistrictSn">
-                          <a-select id="merchantInfoManagementEdit-receiveDistrictSn" @change="areaCharged1" v-model="form.receiveDistrictSn" placeholder="请选择区/县">
+                          <a-select id="merchantInfoManagementEdit-receiveDistrictSn" allowClear @change="areaCharged1" v-model="form.receiveDistrictSn" placeholder="请选择区/县">
                             <a-select-option v-for="item in addrDistrictList1" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
@@ -335,6 +337,7 @@
                       id="merchantInfoManagementEdit-jgDoorHeaderChangeTime"
                       :disabledDate="disabledDate"
                       v-model="form.jgDoorHeaderChangeTime"
+                      allowClear
                       :format="dateFormat"
                       placeholder="请选择日期" />
                   </a-form-model-item>
@@ -571,7 +574,9 @@ export default {
       this.form.citySn = undefined
       this.form.districtSn = undefined
       this.form.address = ''
-      this.getArea('city', val, 0)
+      if (val) {
+        this.getArea('city', val, 0)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
@@ -582,7 +587,9 @@ export default {
       this.addrDistrictList = []
       this.form.districtSn = undefined
       this.form.address = ''
-      this.getArea('district', val, 0)
+      if (val) {
+        this.getArea('district', val, 0)
+      }
     },
     // 区县变更
     areaCharged (val) {
@@ -603,7 +610,9 @@ export default {
       this.form.receiveCitySn = undefined
       this.form.receiveDistrictSn = undefined
       this.form.receiveAddress = ''
-      this.getArea('city', val, 1)
+      if (val) {
+        this.getArea('city', val, 1)
+      }
     },
     // 获取区县列表
     getAreaList1 (val) {
@@ -614,7 +623,9 @@ export default {
       this.addrDistrictList1 = []
       this.form.receiveDistrictSn = undefined
       this.form.receiveAddress = ''
-      this.getArea('district', val, 1)
+      if (val) {
+        this.getArea('district', val, 1)
+      }
     },
     // 区县变更
     areaCharged1 (val) {

+ 6 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -286,13 +286,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealerCountySn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 6 - 2
src/views/reportData/actualSalesReport/list.vue

@@ -404,13 +404,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealerCountySn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 1 - 1
src/views/reportData/allocationDetails/list.vue

@@ -98,7 +98,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <a-form-model-item prop="dealerProvinceSn">
-                    <a-select id="allocationDetailsList-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省">
+                    <a-select id="allocationDetailsList-dealerProvinceSn" allowClear v-model="queryParam.dealerProvinceSn" placeholder="请选择省">
                       <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
                     </a-select>
                   </a-form-model-item>

+ 6 - 2
src/views/reportData/billingReturnReport/list.vue

@@ -405,13 +405,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealerCountySn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 6 - 2
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -389,7 +389,9 @@ export default {
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
       this.queryParam.address = ''
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
@@ -400,7 +402,9 @@ export default {
       this.addrDistrictList = []
       this.queryParam.districtSn = undefined
       this.queryParam.address = ''
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     // 区县变更
     areaCharged (val) {

+ 6 - 2
src/views/reportData/returnSlipReport/list.vue

@@ -412,13 +412,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealerCountySn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 6 - 2
src/views/reportData/salesAmountReport/list.vue

@@ -404,13 +404,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealerCountySn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 6 - 2
src/views/reportData/salesReturnDetailReport/list.vue

@@ -427,13 +427,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealerCountySn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 6 - 2
src/views/reportData/salesReturnReport/list.vue

@@ -405,13 +405,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealerCountySn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 6 - 2
src/views/reportData/salesReturnsReport/list.vue

@@ -267,13 +267,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealerCountySn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 6 - 2
src/views/reportData/salesSlipReport/list.vue

@@ -412,13 +412,17 @@ export default {
       this.addrDistrictList = []
       this.queryParam.dealer.citySn = undefined
       this.queryParam.dealer.districtSn = undefined
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.queryParam.dealer.districtSn = undefined
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     //  省/市/区
     getArea (leve, sn) {

+ 10 - 5
src/views/supplierManagement/supplierInfo/edit.vue

@@ -55,21 +55,21 @@
                       <!-- 地址 -->
                       <a-col span="8">
                         <a-form-model-item prop="provinceSn">
-                          <a-select id="supplierInfoEdit-provinceSn" @change="getCityList" v-model="form.provinceSn" placeholder="请选择省">
+                          <a-select id="supplierInfoEdit-provinceSn" allowClear @change="getCityList" v-model="form.provinceSn" placeholder="请选择省">
                             <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
                       </a-col>
                       <a-col span="8">
                         <a-form-model-item prop="citySn">
-                          <a-select id="supplierInfoEdit-citySn" @change="getAreaList" v-model="form.citySn" placeholder="请选择市">
+                          <a-select id="supplierInfoEdit-citySn" allowClear @change="getAreaList" v-model="form.citySn" placeholder="请选择市">
                             <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
                       </a-col>
                       <a-col span="8">
                         <a-form-model-item prop="districtSn">
-                          <a-select id="supplierInfoEdit-districtSn" @change="areaCharged" v-model="form.districtSn" placeholder="请选择区/县">
+                          <a-select id="supplierInfoEdit-districtSn" allowClear @change="areaCharged" v-model="form.districtSn" placeholder="请选择区/县">
                             <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
                           </a-select>
                         </a-form-model-item>
@@ -173,6 +173,7 @@
                       format="YYYY-MM-DD"
                       placeholder="请选择日期"
                       :disabledDate="disabledDate"
+                      allowClear
                       v-model="form.buildDate"/>
                   </a-form-model-item>
                 </a-col>
@@ -391,7 +392,9 @@ export default {
       this.form.citySn = undefined
       this.form.districtSn = undefined
       this.form.address = ''
-      this.getArea('city', val)
+      if (val) {
+        this.getArea('city', val)
+      }
     },
     // 获取区县列表
     getAreaList (val) {
@@ -402,7 +405,9 @@ export default {
       this.addrDistrictList = []
       this.form.districtSn = undefined
       this.form.address = ''
-      this.getArea('district', val)
+      if (val) {
+        this.getArea('district', val)
+      }
     },
     // 区县变更
     areaCharged (val) {