瀏覽代碼

经销商样式优化

chenrui 1 年之前
父節點
當前提交
d1541494b1

+ 7 - 7
src/views/common/chooseBrandModal.vue

@@ -26,19 +26,19 @@
       </a-row>
       <!-- 按钮 -->
       <div class="btn-con">
+        <a-button
+          id="chooseBrand-cancel"
+          size="large"
+          class="button-cancel"
+          @click="isShow=false"
+          style="padding: 0 60px;">取消</a-button>
         <a-button
           type="primary"
           id="chooseBrand-submit"
           size="large"
           class="button-primary"
           @click="handleSave"
-          style="padding: 0 60px;">保存</a-button>
-        <a-button
-          id="chooseBrand-cancel"
-          size="large"
-          class="button-cancel"
-          @click="isShow=false"
-          style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+          style="padding: 0 60px;margin-left: 15px;">保存</a-button>
       </div>
     </div>
   </a-modal>

+ 11 - 11
src/views/common/chooseProductsModal.vue

@@ -34,7 +34,7 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item  label="产品分类">
+                  <a-form-model-item label="产品分类">
                     <productTypeAll :isAll="type!='default'" placeholder="请选择产品分类" @change="changeProductType" v-model="queryParam.productType" id="chooseProducts-productType"></productTypeAll>
                   </a-form-model-item>
                 </a-col>
@@ -63,19 +63,19 @@
         </div>
         <!-- 按钮 -->
         <div class="btn-con">
+          <a-button
+            id="chooseProducts-cancel"
+            size="large"
+            class="button-cancel"
+            @click="isShow=false"
+            style="padding: 0 60px;">取消</a-button>
           <a-button
             type="primary"
             id="chooseProducts-save"
             size="large"
             class="button-primary"
             @click="handleSave"
-            style="padding: 0 60px;">保存</a-button>
-          <a-button
-            id="chooseProducts-cancel"
-            size="large"
-            class="button-cancel"
-            @click="isShow=false"
-            style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+            style="padding: 0 60px;margin-left: 15px;">保存</a-button>
         </div>
       </div>
     </a-spin>
@@ -179,11 +179,11 @@ export default {
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
           if (_this.type == 'dealership') { //  设置经销权时选择产品
-            if(!_this.queryParam.productBrandSn && !_this.queryParam.productTypeSn1){
-              _this.$message.info("请选择产品品牌或产品分类")
+            if (!_this.queryParam.productBrandSn && !_this.queryParam.productTypeSn1) {
+              _this.$message.info('请选择产品品牌或产品分类')
               return
             }
-             
+
             // 校验产品是否被包含在品牌分类中
             const params = []
             if (_this.queryParam.productBrandSn) {

+ 7 - 7
src/views/common/chooseTypeModal.vue

@@ -24,19 +24,19 @@
       />
       <!-- 按钮 -->
       <div class="btn-con">
+        <a-button
+          id="chooseType-cancel"
+          size="large"
+          class="button-cancel"
+          @click="isShow=false"
+          style="padding: 0 60px;">取消</a-button>
         <a-button
           type="primary"
           id="chooseType-submit"
           size="large"
           class="button-primary"
           @click="handleSave"
-          style="padding: 0 60px;">保存</a-button>
-        <a-button
-          id="chooseType-cancel"
-          size="large"
-          class="button-cancel"
-          @click="isShow=false"
-          style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+          style="padding: 0 60px;margin-left: 15px;">保存</a-button>
       </div>
     </div>
   </a-modal>

+ 2 - 2
src/views/dealerManagement/businessOwnerSettings/addModal.vue

@@ -64,8 +64,8 @@
           <chooseWarehouse ref="warehouse" modeType="multiple" :value="warehouseList" @change="handleWarehouse"></chooseWarehouse>
         </a-form-model-item>
         <div style="display: flex;justify-content: center;padding: 30px 0;">
-          <a-button type="primary" @click="handleSave">{{ itemId?'保存':'确定' }}</a-button>
-          <a-button style="margin-left: 15px;" @click="isShow=false">取消</a-button>
+          <a-button @click="isShow=false">取消</a-button>
+          <a-button style="margin-left: 15px;" type="primary" @click="handleSave">{{ itemId?'保存':'确定' }}</a-button>
         </div>
       </a-form-model>
     </a-spin>

+ 5 - 7
src/views/dealerManagement/businessOwnerSettings/list.vue

@@ -32,17 +32,18 @@
     <a-card size="small" :bordered="false" class="dealerZoneSearch-wrap">
       <a-spin :spinning="spinning" tip="Loading...">
         <div class="table-operator">
-          <a-button id="businessOwnerSettings-add" type="primary" class="button-error" @click="handleAdd">+新增</a-button>
+          <a-button id="businessOwnerSettings-add" type="primary" @click="handleAdd">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -189,7 +190,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   watch: {
@@ -221,11 +222,8 @@ export default {
   .dealerZoneSearch-wrap{
     height: 100%;
     margin-top:6px;
-    .table-operator{
-      text-align:right;
-    }
     .warehouseBox{
-  wwidth: 100%;
+      width: 100%;
       display: -webkit-box;
       -webkit-box-orient: vertical;
       -webkit-line-clamp: 2;

+ 2 - 2
src/views/dealerManagement/dealerAccountManagement/editModal.vue

@@ -69,8 +69,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="dealerAccountEdit-save" @click="handleSave">保存</a-button>
-          <a-button id="dealerAccountEdit-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+          <a-button id="dealerAccountEdit-back" @click="isShow = false" >取消</a-button>
+          <a-button type="primary" id="dealerAccountEdit-save" style="margin-left: 15px;" @click="handleSave">保存</a-button>
         </div>
       </a-spin>
     </div>

+ 4 - 3
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -32,17 +32,18 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button id="dealerAccountList-add" type="primary" v-if="$hasPermissions('B_dealerAccount_add')" class="button-error" @click="handleEdit()">新增</a-button>
+          <a-button id="dealerAccountList-add" type="primary" v-if="$hasPermissions('B_dealerAccount_add')" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -233,7 +234,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   watch: {

+ 2 - 2
src/views/dealerManagement/dealerRelationshipBinding/associateModal.vue

@@ -27,8 +27,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="product-category-edit-modal-save" @click="handleSave">确定</a-button>
-          <a-button id="product-category-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">关闭</a-button>
+          <a-button id="product-category-edit-modal-back" @click="isShow = false" >关闭</a-button>
+          <a-button type="primary" id="product-category-edit-modal-save" style="margin-left: 15px;" @click="handleSave">确定</a-button>
         </div>
       </a-spin>
     </div>

+ 64 - 69
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -19,78 +19,76 @@
       </div>
     </a-card>
     <!-- 列表 -->
-    <a-tabs @change="tabChange" v-model="tabInd" :tabBarStyle="{'background':'#fff'}">
-      <a-tab-pane key="1" tab="省市级关系绑定"></a-tab-pane>
-      <a-tab-pane key="2" tab="特约店关系绑定"></a-tab-pane>
-    </a-tabs>
-    <div class="mainContext">
-      <a-card size="small" :bordered="false">
-        <a-spin :spinning="spinning" tip="Loading...">
+    <a-card size="small" :bordered="false">
+      <a-tabs @change="tabChange" v-model="tabInd" :tabBarStyle="{'background':'#fff'}">
+        <a-tab-pane key="1" tab="省市级关系绑定"></a-tab-pane>
+        <a-tab-pane key="2" tab="特约店关系绑定"></a-tab-pane>
+      </a-tabs>
+      <a-spin :spinning="spinning" tip="Loading...">
+        <a-table
+          class="sTable"
+          ref="table"
+          size="small"
+          :rowKey="(record) => record.dealerSn"
+          :columns="columns"
+          :pagination="false"
+          :data-source="list"
+          @expand="expand"
+          :expandedRowKeys="expandedRowKeys"
+          :expandRowByClick="true"
+          :loading="loading"
+          :style="{'height':tableHeight+70+'px' }"
+          :scroll="{ y: tableHeight +30 }">
           <a-table
-            class="sTable"
-            ref="table"
-            size="small"
+            slot="expandedRowRender"
             :rowKey="(record) => record.dealerSn"
-            :columns="columns"
-            :pagination="false"
-            :data-source="list"
-            @expand="expand"
-            :expandedRowKeys="expandedRowKeys"
-            :expandRowByClick="true"
-            :loading="loading"
-            :style="{'height':tableHeight+84.5+'px' }"
-            :scroll="{ y: tableHeight +30 }">
-            <a-table
-              slot="expandedRowRender"
-              :rowKey="(record) => record.dealerSn"
-              :columns="innerColumns"
-              :data-source="innerData"
-              :pagination="false">
-              <!-- 操作 -->
-              <template slot="action" slot-scope="text, record">
-                <a-button
-                  type="link"
-                  v-if="$hasPermissions('B_dealerRelationshipBinding_unrelation')"
-                  class="button-error"
-                  size="small"
-                  icon="close"
-                  :id="'relationshipBindingList-delSubItem'+record.id"
-                  @click.stop="handleDisassociate(record)">取消关联</a-button>
-                <span v-else>--</span>
-              </template>
-            </a-table>
+            :columns="innerColumns"
+            :data-source="innerData"
+            :pagination="false">
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
               <a-button
                 type="link"
-                v-if="$hasPermissions('B_dealerRelationshipBinding_relation')"
-                class="button-info"
+                v-if="$hasPermissions('B_dealerRelationshipBinding_unrelation')"
+                class="button-error"
                 size="small"
-                icon="plus"
-                :id="'relationshipBindingList-addSubItem'+record.id"
-                @click.stop="handleAssociate(record)">关联下级</a-button>
+                icon="close"
+                :id="'relationshipBindingList-delSubItem'+record.id"
+                @click.stop="handleDisassociate(record)">取消关联</a-button>
               <span v-else>--</span>
             </template>
           </a-table>
-          <!-- 分页 -->
-          <tablePagination
-            ref="tablePagination"
-            :total="paginationProps.total"
-            :current="paginationProps.current"
-            :pageSize="paginationProps.pageSize"
-            @changePageSize="changePageSize"
-            @changePage="changePage" />
-        </a-spin>
-        <!-- 关联下级 -->
-        <associate-modal
-          v-drag
-          :openModal="openModal"
-          :nowData="nowData"
-          :tabInd="tabInd"
-          @ok="addItemOk"
-          @close="openModal=false" />
-      </a-card>
-    </div>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              type="link"
+              v-if="$hasPermissions('B_dealerRelationshipBinding_relation')"
+              class="button-info"
+              size="small"
+              icon="plus"
+              :id="'relationshipBindingList-addSubItem'+record.id"
+              @click.stop="handleAssociate(record)">关联下级</a-button>
+            <span v-else>--</span>
+          </template>
+        </a-table>
+        <!-- 分页 -->
+        <tablePagination
+          ref="tablePagination"
+          :total="paginationProps.total"
+          :current="paginationProps.current"
+          :pageSize="paginationProps.pageSize"
+          @changePageSize="changePageSize"
+          @changePage="changePage" />
+      </a-spin>
+      <!-- 关联下级 -->
+      <associate-modal
+        v-drag
+        :openModal="openModal"
+        :nowData="nowData"
+        :tabInd="tabInd"
+        @ok="addItemOk"
+        @close="openModal=false" />
+    </a-card>
   </div>
 </template>
 I
@@ -256,24 +254,24 @@ export default {
   },
   watch: {
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.tableHeight = window.innerHeight - 360
+      this.tableHeight = window.innerHeight - 356
     }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.tableHeight = window.innerHeight - 360
+      this.tableHeight = window.innerHeight - 356
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.tableHeight = window.innerHeight - 360
+      this.tableHeight = window.innerHeight - 356
       this.resetSearchForm()
     }
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {
-      this.tableHeight = window.innerHeight - 360
+      this.tableHeight = window.innerHeight - 356
       this.resetSearchForm(true)
     }
   }
@@ -289,7 +287,4 @@ export default {
       height: 100%;
     }
   }
-  .mainContext{
-    margin-top:-11px;
-  }
 </style>

+ 3 - 2
src/views/dealerManagement/dealerZoneSearch/list.vue

@@ -41,12 +41,13 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -178,7 +179,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 220
+      this.tableHeight = window.innerHeight - tableSearchH - 205
     }
   },
   watch: {

+ 7 - 7
src/views/dealerManagement/marketingDivisionSetNew/list.vue

@@ -2,14 +2,14 @@
   <a-card size="small" :bordered="false" class="marketingDivisionSetNew-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
-      <div ref="tableSearch" class="table-operator" style="border: 0;text-align:right;">
-        <a-button id="marketingDivisionSetNew-add" type="primary" class="button-error" @click="addArea">+新增区域</a-button>
+      <div ref="tableSearch" class="table-operator" style="border: 0;">
+        <a-button id="marketingDivisionSetNew-add" type="primary" @click="addArea">新增区域</a-button>
       </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px'}"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -156,19 +156,19 @@ export default {
     //  编辑
     handleEdit (row) {
       // 大区
-      if(row.type && row.type == 'root'){
+      if (row.type && row.type == 'root') {
         this.itemId = row && row.subareaSn ? row.subareaSn : null
         this.openAreaModal = true
-      }else{
+      } else {
         // 分区
         this.parentData = row
         this.openZoneModal = true
       }
     },
     // 查看经销商
-    handleView(row){
+    handleView (row) {
       this.parentData = row
-      this.openDealerModal=true
+      this.openDealerModal = true
     },
     pageInit () {
       const _this = this

+ 50 - 44
src/views/dealerManagement/marketingDivisionSetNew/viewDealers.vue

@@ -35,10 +35,10 @@
                 </a-form-item>
               </a-col>
               <a-col :md="8" :sm="24">
-              <a-form-model-item label="地区">
+                <a-form-model-item label="地区">
                   <AreaList id="viewDealers-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
-              </a-form-model-item>
-            </a-col>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="searchForm" :disabled="disabled" id="viewDealers-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="viewDealers-reset">重置</a-button>
@@ -58,7 +58,7 @@
           </a-empty>
         </div>
         <div class="tableCon" v-else>
-          <div style="text-align:right;margin-bottom:10px;"><a-button type="primary" class="button-error" @click="openAddDealer=true"><a-icon type="plus" />绑定经销商</a-button></div>
+          <div style="margin-bottom:10px;"><a-button type="primary" class="button-error" @click="openAddDealer=true">绑定经销商</a-button></div>
           <s-table
             class="sTable"
             ref="table"
@@ -70,13 +70,13 @@
             :scroll="{ y: tableHeight }"
             bordered>
             <template slot="action" slot-scope="text, record">
-            <a-button
-              size="small"
-              type="link"
-              class="button-error"
-              @click="handleDel(record)"
+              <a-button
+                size="small"
+                type="link"
+                class="button-error"
+                @click="handleDel(record)"
               >删除</a-button>
-          </template>
+            </template>
           </s-table>
         </div>
       </a-spin>
@@ -93,7 +93,13 @@
       class="deraw-bindDealer"
       @close="openAddDealer = false">
       <div class="dealerModalCon">
-        <chooseDealer ref="chooseDealer" v-if="openAddDealer" :parentData="parentData" pageType="viewDealers" @add="hanldAdd" @plAdd="hanldPlAdd"></chooseDealer>
+        <chooseDealer
+          ref="chooseDealer"
+          v-if="openAddDealer"
+          :parentData="parentData"
+          pageType="viewDealers"
+          @add="hanldAdd"
+          @plAdd="hanldPlAdd"></chooseDealer>
       </div>
     </a-drawer>
   </div>
@@ -116,7 +122,7 @@ export default {
     },
     parentData: {
       type: Object,
-      default: function(){
+      default: function () {
         return null
       }
     }
@@ -129,7 +135,7 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.resetData()
-      }else{
+      } else {
         this.pageInit()
       }
     },
@@ -145,7 +151,7 @@ export default {
       openAddDealer: false,
       flag: true,
       queryParam: { //  查询条件
-        dealer:{
+        dealer: {
           nameLike: '',
           dealerType: null,
           dealerLevel: null,
@@ -171,7 +177,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return queryPageAreaDealer(Object.assign(parameter, this.queryParam, {subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn})).then(res => {
+        return queryPageAreaDealer(Object.assign(parameter, this.queryParam, { subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -185,15 +191,15 @@ export default {
           this.setTableH()
           return data
         })
-      },
+      }
     }
   },
   methods: {
     // 绑定
-    hanldAdd(row){
+    hanldAdd (row) {
       console.log(row)
-      bindDealer({subareaAreaSn: this.parentData.subareaAreaSn,dealerSn:row.dealerSn}).then(res => {
-        if(res.status == 200){
+      bindDealer({ subareaAreaSn: this.parentData.subareaAreaSn, dealerSn: row.dealerSn }).then(res => {
+        if (res.status == 200) {
           this.resetSearchForm()
           this.$refs.chooseDealer.searchForm(false)
         }
@@ -201,10 +207,10 @@ export default {
       })
     },
     // 批量绑定
-    hanldPlAdd(rows){
+    hanldPlAdd (rows) {
       console.log(rows)
-      batchBindDealer({subareaAreaSn: this.parentData.subareaAreaSn,dealerSnSet:rows}).then(res => {
-        if(res.status == 200){
+      batchBindDealer({ subareaAreaSn: this.parentData.subareaAreaSn, dealerSnSet: rows }).then(res => {
+        if (res.status == 200) {
           this.resetSearchForm()
           this.$refs.chooseDealer.searchForm(false)
         }
@@ -212,7 +218,7 @@ export default {
       })
     },
     // 删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -220,8 +226,8 @@ export default {
         centered: true,
         onOk () {
           _this.spinning = true
-          deleteBindDealer({sn: row.subareaAreaDealerSn}).then(res => {
-            if(res.status == 200){
+          deleteBindDealer({ sn: row.subareaAreaDealerSn }).then(res => {
+            if (res.status == 200) {
               _this.resetSearchForm()
             }
             _this.spinning = false
@@ -229,42 +235,42 @@ export default {
         }
       })
     },
-    searchForm(){
-      if(this.flag){
+    searchForm () {
+      if (this.flag) {
         this.hasData()
-      }else{
+      } else {
         this.$refs.table.refresh(true)
       }
     },
-    resetData(){
+    resetData () {
       this.queryParam = {
-          dealer:{
-            nameLike: '',
-            dealerType: null,
-            dealerLevel: null,
-            auditState: undefined,
-            provinceSn: undefined,
-            citySn: undefined,
-            districtSn: undefined
-          }
+        dealer: {
+          nameLike: '',
+          dealerType: null,
+          dealerLevel: null,
+          auditState: undefined,
+          provinceSn: undefined,
+          citySn: undefined,
+          districtSn: undefined
         }
+      }
       this.$refs.areaList.clearData()
     },
     resetSearchForm () {
-      if(this.flag){
+      if (this.flag) {
         this.hasData()
-      }else{
+      } else {
         this.resetData()
         this.$refs.table.refresh(true)
       }
     },
-    areaChange(val){
+    areaChange (val) {
       this.queryParam.dealer.provinceSn = val[0] ? val[0] : ''
       this.queryParam.dealer.citySn = val[1] ? val[1] : ''
       this.queryParam.dealer.districtSn = val[2] ? val[2] : ''
     },
-   async hasData(){
-      const ret = await queryPageAreaDealer({pageNo:1,pageSize:10,subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn}).then(res => res.data)
+    async hasData () {
+      const ret = await queryPageAreaDealer({ pageNo: 1, pageSize: 10, subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn }).then(res => res.data)
       this.flag = ret.count == 0
     },
     pageInit () {
@@ -280,7 +286,7 @@ export default {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 290
     }
-  },
+  }
 }
 </script>
 

+ 6 - 6
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="merchantInfoManagementList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="merchantInfoManagementList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -57,13 +57,13 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" class="button-error" @click="handleAdd">新增</a-button>
+          <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" @click="handleAdd">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -140,8 +140,8 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '10%', align: 'center', ellipsis: true },
-        { title: '商户别名', dataIndex: 'dealerAlias', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '10%', align: 'left', ellipsis: true },
+        { title: '商户别名', dataIndex: 'dealerAlias', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '联系人', dataIndex: 'contact', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -290,7 +290,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 260
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   watch: {

+ 2 - 2
src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue

@@ -32,8 +32,8 @@
               placeholder="请选择日期" />
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
-            <a-button type="primary" @click="onSubmit">确定</a-button>
-            <a-button style="margin-left: 50px;" @click="cansel">取消</a-button>
+            <a-button  @click="cansel">取消</a-button>
+            <a-button style="margin-left: 50px;" type="primary" @click="onSubmit">确定</a-button>
           </div>
         </a-form-model>
       </a-spin>

+ 2 - 2
src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue

@@ -24,8 +24,8 @@
             <v-select code="DEALER_LEVEL" id="ucModal-dealerLevel" v-model="form.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
-            <a-button type="primary" @click="onSubmit">确定</a-button>
-            <a-button style="margin-left: 50px;" @click="cansel">取消</a-button>
+            <a-button @click="cansel">取消</a-button>
+            <a-button style="margin-left: 50px;" type="primary" @click="onSubmit">确定</a-button>
           </div>
         </a-form-model>
       </a-spin>

+ 2 - 2
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -27,8 +27,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="product-category-edit-modal-save" @click="handleSave">确定</a-button>
-          <a-button id="product-category-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">关闭</a-button>
+          <a-button id="product-category-edit-modal-back" @click="isShow = false" >关闭</a-button>
+          <a-button type="primary" style="margin-left: 15px;" id="product-category-edit-modal-save" @click="handleSave">确定</a-button>
         </div>
       </a-spin>
     </div>

+ 3 - 2
src/views/dealerManagement/rebateSettings/list.vue

@@ -34,12 +34,13 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -173,7 +174,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 225
+      this.tableHeight = window.innerHeight - tableSearchH - 210
     }
   },
   watch: {