chenrui 1 éve
szülő
commit
cd2bf6a4ab

+ 10 - 3
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -15,13 +15,18 @@
                 <a-input id="merchantInfoManagementList-nameLike" v-model.trim="queryParam.nameLike" allowClear placeholder="请输入商户名称/别名"/>
               </a-form-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="商户类型">
                 <v-select code="DEALER_TYPE" id="merchantInfoManagementList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择商户类型"></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="商户级别">
+                <v-select code="DEALER_LEVEL" id="merchantInfoManagementList-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="7" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="审核状态">
                   <v-select code="AUDIT_STATE" id="merchantInfoManagementList-auditState" v-model="queryParam.auditState" allowClear placeholder="请选择审核状态"></v-select>
                 </a-form-item>
@@ -32,7 +37,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="merchantInfoManagementList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="merchantInfoManagementList-reset">重置</a-button>
               <a-button
@@ -124,6 +129,7 @@ export default {
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
+        dealerLevel: undefined, // 商户级别
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaAreaSn: undefined // 分区
@@ -189,6 +195,7 @@ export default {
       this.queryParam = {
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
+        dealerLevel: undefined, // 商户级别
         subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined

+ 3 - 0
src/views/dealerManagement/provincialWarehouseManagement/chooseDealer.vue

@@ -186,7 +186,10 @@ export default {
         _this.$message.warning('请在列表勾选后再进行批量操作!')
         return
       }
+      this.spinning = true
+      console.log('111111111111111:', _this.rowSelectionInfo)
       const dealerInfoList = await getDealerListInfo({ dealerSnList: _this.rowSelectionInfo.selectedRowKeys })
+      this.spinning = false
       this.$emit('plAdd', dealerInfoList.data)
     },
     pageInit (data) {

+ 10 - 14
src/views/dealerManagement/provincialWarehouseManagement/relatedDealersList.vue

@@ -29,7 +29,7 @@
                   </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-item label="经销商名称">
-                      <a-input id="relatedDealersList-purchaseBillNo" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
+                      <a-input id="relatedDealersList-purchaseBillNo" v-model.trim="queryParam.nameLike" allowClear placeholder="请输入经销商名称"/>
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -120,14 +120,12 @@ export default {
       disabled: false,
       exportLoading: false,
       queryParam: {
-        subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined
-        },
+        subareaSn: undefined,
+        subareaAreaSn: undefined,
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        dealerName: undefined,
+        nameLike: '',
         relationType: 'PURCHASE'
       },
       tableHeight: 0,
@@ -199,8 +197,8 @@ export default {
       this.queryParam.districtSn = val[2] ? val[2] : ''
     },
     subareaChange (val) {
-      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
     },
     // 解绑
     handleDelete (row) {
@@ -231,14 +229,12 @@ export default {
     //  重置
     resetSearchForm () {
       this.queryParam = {
-        subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined
-        },
+       subareaSn: undefined,
+       subareaAreaSn: undefined,
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        dealerName: undefined,
+        nameLike: '',
         serviceCenterSn: this.$route.params.sn,
         relationType: 'PURCHASE'
       }
@@ -251,7 +247,7 @@ export default {
       const _this = this
       _this.exportLoading = true
       _this.spinning = true
-      _this.queryParam.serviceCenterName = _this.serviceCenterName
+      _this.queryParam.serviceCenterName = this.$route.params.name
       hdExportExcel(serviceCenterExport, _this.queryParam, '省仓客户列表导出', function () {
         _this.exportLoading = false
         _this.spinning = false