瀏覽代碼

样式修改

lilei 1 年之前
父節點
當前提交
822d8a8e8b
共有 45 個文件被更改,包括 217 次插入300 次删除
  1. 3 3
      src/views/allocationManagement/transferReturn/detail.vue
  2. 3 6
      src/views/common/chooseBrandModal.vue
  3. 4 7
      src/views/common/chooseProductsModal.vue
  4. 3 6
      src/views/common/chooseTypeModal.vue
  5. 4 6
      src/views/dealerManagement/businessOwnerSettings/categorySet.vue
  6. 2 2
      src/views/dealerManagement/businessOwnerSettings/chooseAreaModal.vue
  7. 2 2
      src/views/dealerManagement/businessOwnerSettings/list.vue
  8. 10 10
      src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue
  9. 15 25
      src/views/dealerManagement/businessOwnerSettings/supplierSet.vue
  10. 1 1
      src/views/dealerManagement/dealerAccountManagement/editModal.vue
  11. 3 3
      src/views/dealerManagement/dealerAccountManagement/list.vue
  12. 1 1
      src/views/dealerManagement/dealerRelationshipBinding/associateModal.vue
  13. 8 5
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  14. 2 2
      src/views/dealerManagement/dealerZoneSearch/list.vue
  15. 14 14
      src/views/dealerManagement/merchantInfoManagement/list.vue
  16. 4 4
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  17. 1 1
      src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue
  18. 1 1
      src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue
  19. 1 1
      src/views/dealerManagement/rebateSettings/associateModal.vue
  20. 8 8
      src/views/dealerManagement/rebateSettings/list.vue
  21. 1 1
      src/views/inventoryManagement/inventoryCheck/addModal.vue
  22. 4 4
      src/views/productManagement/newProduct/list.vue
  23. 7 7
      src/views/productManagement/priceChangeRecord/list.vue
  24. 9 9
      src/views/productManagement/productInfo/list.vue
  25. 3 3
      src/views/productManagement/productLaunchAudit/list.vue
  26. 1 1
      src/views/productManagement/productLevel/editModal.vue
  27. 4 4
      src/views/productManagement/productLevel/list.vue
  28. 8 8
      src/views/productManagement/productNotOnline/list.vue
  29. 4 4
      src/views/productManagement/productOfflineAudit/list.vue
  30. 1 1
      src/views/productManagement/productPricing/auditModal.vue
  31. 1 1
      src/views/productManagement/productPricing/editModal.vue
  32. 5 5
      src/views/productManagement/productPricing/list.vue
  33. 5 5
      src/views/productManagement/productUniversal/list.vue
  34. 5 5
      src/views/productManagement/shelfNoManage/list.vue
  35. 5 5
      src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue
  36. 4 3
      src/views/promotionRulesManagement/dealerPromotions/detail.vue
  37. 18 81
      src/views/promotionRulesManagement/dealerPromotions/detailModal.vue
  38. 14 14
      src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue
  39. 14 14
      src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue
  40. 6 6
      src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue
  41. 3 3
      src/views/promotionRulesManagement/promotionManagement/list.vue
  42. 1 1
      src/views/promotionRulesManagement/promotionManagement/lookUpCustomersModal.vue
  43. 1 1
      src/views/promotionRulesManagement/promotionManagement/promotionDescModal.vue
  44. 1 1
      src/views/promotionRulesManagement/promotionManagement/promotionShowModal.vue
  45. 2 5
      src/views/supplierManagement/costSetting/addProductModal.vue

+ 3 - 3
src/views/allocationManagement/transferReturn/detail.vue

@@ -217,7 +217,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 290
+      this.tableHeight = window.innerHeight - tableSearchH - 285
     }
   },
   mounted () {
@@ -240,10 +240,10 @@ export default {
 <style lang="less">
   .allocateBillDetail-wrap{
     .allocateBillDetail-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .allocateBillDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 3 - 6
src/views/common/chooseBrandModal.vue

@@ -16,7 +16,7 @@
           <a-checkbox :checked="checkAgent" @change="onCheckAgentChange">代理品牌</a-checkbox>
         </span>
       </div>
-      <a-divider />
+      <a-divider style="margin:10px 0;" />
       <a-row style="height: 400px;overflow-y: scroll;">
         <a-col :span="6" v-for="(item,index) in brandList" :key="item.brandSn">
           <a-checkbox :checked="item.checked" :disabled="item.isDisabled" @change="e=>onChange(e,index)">
@@ -28,17 +28,14 @@
       <div class="btn-con">
         <a-button
           id="chooseBrand-cancel"
-          size="large"
           class="button-cancel"
           @click="isShow=false"
-          style="padding: 0 60px;">取消</a-button>
+          style="padding: 0 30px;">取消</a-button>
         <a-button
           type="primary"
           id="chooseBrand-submit"
-          size="large"
-          class="button-primary"
           @click="handleSave"
-          style="padding: 0 60px;margin-left: 15px;">保存</a-button>
+          style="padding: 0 30px;margin-left: 15px;">保存</a-button>
       </div>
     </div>
   </a-modal>

+ 4 - 7
src/views/common/chooseProductsModal.vue

@@ -65,17 +65,14 @@
         <div class="btn-con">
           <a-button
             id="chooseProducts-cancel"
-            size="large"
             class="button-cancel"
             @click="isShow=false"
-            style="padding: 0 60px;">取消</a-button>
+            style="padding: 0 30px;">取消</a-button>
           <a-button
             type="primary"
             id="chooseProducts-save"
-            size="large"
-            class="button-primary"
             @click="handleSave"
-            style="padding: 0 60px;margin-left: 15px;">保存</a-button>
+            style="padding: 0 30px;margin-left: 15px;">保存</a-button>
         </div>
       </div>
     </a-spin>
@@ -136,8 +133,8 @@ export default {
       loading: false, //  表格加载中
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'code', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } }
+        { title: '产品编码', dataIndex: 'code', align: 'left',width: 200 },
+        { title: '产品名称', dataIndex: 'name', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 3 - 6
src/views/common/chooseTypeModal.vue

@@ -12,7 +12,7 @@
       <div>
         <a-checkbox :checked="checkAll" :disabled="!linkageStatus&&chooseList.length>0 " @change="onCheckAllChange">全选</a-checkbox>
       </div>
-      <a-divider />
+      <a-divider style="margin:10px 0;" />
       <a-tree
         style="height: 400px;overflow-y: scroll;"
         checkable
@@ -26,17 +26,14 @@
       <div class="btn-con">
         <a-button
           id="chooseType-cancel"
-          size="large"
           class="button-cancel"
           @click="isShow=false"
-          style="padding: 0 60px;">取消</a-button>
+          style="padding: 0 30px;">取消</a-button>
         <a-button
           type="primary"
           id="chooseType-submit"
-          size="large"
-          class="button-primary"
           @click="handleSave"
-          style="padding: 0 60px;margin-left: 15px;">保存</a-button>
+          style="padding: 0 30px;margin-left: 15px;">保存</a-button>
       </div>
     </div>
   </a-modal>

+ 4 - 6
src/views/dealerManagement/businessOwnerSettings/categorySet.vue

@@ -3,12 +3,12 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <a-card size="small" :bordered="false" class="categorySet-cont">
         <div class="table-operator" ref="categorySetAddBtn">
-          <a-button type="primary" class="button-error" @click="addCategory" :disabled="disabled">+新增管辖品类</a-button>
+          <a-button type="primary" @click="addCategory" :disabled="disabled">新增管辖品类</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.bizUserScopeSn"
           rowKeyName="bizUserScopeSn"
@@ -300,7 +300,7 @@ export default {
     },
     setTableH () {
       const addBtnHeight = this.$refs.categorySetAddBtn.offsetHeight
-      this.tableHeight = window.innerHeight - addBtnHeight - 385
+      this.tableHeight = window.innerHeight - addBtnHeight - 325
     }
   },
   watch: {
@@ -316,8 +316,6 @@ export default {
 
 <style lang="less">
   .categorySet-wrap{
-    .table-operator{
-    text-align:right;
-    }
+     
   }
 </style>

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

@@ -27,8 +27,8 @@
         </div>
       </div>
       <div class="areaFooter">
+        <a-button style="margin-right: 15px" @click="visible = false" :disabled="disabled" id="areaSet-reset">取消</a-button>
         <a-button type="primary" @click="save" :disabled="disabled" id="areaSet-refresh">保存</a-button>
-        <a-button style="margin-left: 5px" @click="visible = false" :disabled="disabled" id="areaSet-reset">取消</a-button>
       </div>
     </div>
   </a-drawer>
@@ -144,7 +144,7 @@ export default {
       this.getArea()
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 345
+      this.tableHeight = window.innerHeight - 325
     }
   }
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -190,7 +190,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 10 - 10
src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue

@@ -5,21 +5,17 @@
         <a-page-header :ghost="false" :backIcon="false" class="header-bar">
           <!-- 自定义的二级文字标题 -->
           <template slot="subTitle">
-            <span class="subTitle-word text-overflow" style="max-width:300px;">用户姓名:{{ infoObj.userName?infoObj.userName:'--' }}</span>
-            <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
+            <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+            <span class="subTitle-word text-overflow" style="max-width:300px;margin-left:15px;">用户姓名:{{ infoObj.userName?infoObj.userName:'--' }}</span>
           </template>
         </a-page-header>
       </div>
       <a-card size="small" :bordered="false" class="categorySet-cont">
-        <div :style="{ height: tableHeight+84.5+'px' }">
+        <div>
           <a-tabs v-model="activeKeyVal" @change="handleTabs">
             <a-tab-pane key="1" tab="设置管辖区域" v-if="infoObj.allDealerFlag && infoObj.allDealerFlag!=1">
               <div class="areaSet-wrap">
                 <div class="table-page-search-wrapper newTableSearchName" >
-                  <div class="areaSet-btnGroup" style="margin-bottom:20px;">
-                    <a-button type="primary" class="button-error" @click="openAreaModal" ghost>选择区域</a-button>
-                    <a-button type="primary" class="button-error" @click="openDealerModal" ghost>选择经销商</a-button>
-                  </div>
                   <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                     <a-row :gutter="15">
                       <a-col :md="6" :sm="24">
@@ -38,6 +34,10 @@
                       </a-col>
                     </a-row>
                   </a-form>
+                  <div class="areaSet-btnGroup" style="margin-bottom:10px;">
+                    <a-button type="primary" class="button-info" @click="openAreaModal">选择区域</a-button>
+                    <a-button type="primary" class="button-error" @click="openDealerModal">选择经销商</a-button>
+                  </div>
                 </div>
                 <a-spin :spinning="spinning" tip="Loading...">
                   <!-- 列表 -->
@@ -50,8 +50,8 @@
                     :columns="columns"
                     :data="loadData"
                     :defaultLoadData="false"
-                    :style="{ height: tableHeight-100+'px' }"
-                    :scroll="{ y: tableHeight-180 }"
+                    :style="{ height: tableHeight+70+'px' }"
+                    :scroll="{ y: tableHeight }"
                     bordered>
                     <!-- 操作 -->
                     <template slot="action" slot-scope="text, record">
@@ -346,7 +346,7 @@ export default {
     },
     setTableH () {
       const headHeight = this.$refs.headerBar.offsetHeight
-      this.tableHeight = window.innerHeight - headHeight - 210
+      this.tableHeight = window.innerHeight - headHeight - 340
     }
   },
   watch: {

+ 15 - 25
src/views/dealerManagement/businessOwnerSettings/supplierSet.vue

@@ -1,25 +1,18 @@
 <template>
   <div class="categorySet-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-card size="small" :bordered="false" class="categorySet-cont">
-        <div class="areaSet-wrap">
-          <div class="table-page-search-wrapper newTableSearchName" >
-            <div class="areaSet-btnGroup" style="margin-bottom:20px;">
-              <a-button type="primary" class="button-error" @click="openSupplierModal">新增</a-button>
+        <div class="areaSet-wrap">
+          <div class="table-page-search-wrapper flex-center" style="width:100%;justify-content: space-between;margin-bottom:10px">
+            <div class="areaSet-btnGroup">
+              <a-button type="primary" @click="openSupplierModal">新增</a-button>
             </div>
-            <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-              <a-row :gutter="15">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="供应商名称">
-                    <a-input id="areaSet-dealerName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商名称"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="areaSet-refresh">查询</a-button>
-                  <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="areaSet-reset">重置</a-button>
-                </a-col>
-              </a-row>
-            </a-form>
+            <div>
+              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+                <a-input style="width:300px;" id="areaSet-dealerName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商名称"/>
+                <a-button style="margin-left: 15px" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="areaSet-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="areaSet-reset">重置</a-button>
+              </a-form>
+            </div>
           </div>
           <a-spin :spinning="spinning" tip="Loading...">
             <!-- 列表 -->
@@ -32,8 +25,8 @@
               :columns="columns"
               :data="loadData"
               :defaultLoadData="false"
-              :style="{ height: tableHeight+'px' }"
-              :scroll="{ y: tableHeight-180 }"
+              :style="{ height: tableHeight + 70 +'px' }"
+              :scroll="{ y: tableHeight }"
               bordered>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
@@ -49,7 +42,6 @@
             </s-table>
           </a-spin>
         </div>
-      </a-card>
     </a-spin>
     <!-- 选择供应商 -->
     <a-drawer
@@ -203,7 +195,7 @@ export default {
       this.$refs.table.refresh()
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 385
+      this.tableHeight = window.innerHeight - 345
     }
   },
   watch: {
@@ -219,8 +211,6 @@ export default {
 
 <style lang="less">
   .categorySet-wrap{
-    .table-operator{
-    text-align:right;
-    }
+    
   }
 </style>

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

@@ -101,7 +101,7 @@ export default {
       spinning: false,
       formItemLayout: {
         labelCol: { span: 6 },
-        wrapperCol: { span: 18 }
+        wrapperCol: { span: 16 }
       },
       form: {
         tenantSn: '',

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="dealerAccountList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="dealerAccountList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -124,7 +124,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center' },
-        { title: '经销商名称', dataIndex: 'org.name', width: '25%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '经销商名称', dataIndex: 'org.name', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '管理员姓名', dataIndex: 'name', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '管理员账号', dataIndex: 'loginName', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '授权用户数', dataIndex: 'org.childUserMaxNum', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -234,7 +234,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

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

@@ -27,7 +27,7 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button id="product-category-edit-modal-back" @click="isShow = false" >关闭</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>

+ 8 - 5
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="relationshipBindingList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="relationshipBindingList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="getList()">
@@ -250,28 +250,31 @@ export default {
           })
         }
       })
+    },
+    setHtable(){
+      this.tableHeight = window.innerHeight - 346
     }
   },
   watch: {
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.tableHeight = window.innerHeight - 356
+      this.setHtable()
     }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.tableHeight = window.innerHeight - 356
+      this.setHtable()
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.tableHeight = window.innerHeight - 356
+      this.setHtable()
       this.resetSearchForm()
     }
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {
-      this.tableHeight = window.innerHeight - 356
+      this.setHtable()
       this.resetSearchForm(true)
     }
   }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -179,7 +179,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 205
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

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

@@ -73,15 +73,15 @@
           bordered>
           <!-- 经销商 -->
           <template slot="dealerName" slot-scope="text, record">
-            <span v-if="$hasPermissions('B_merchantInfo_detail')" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dealerName }}</span>
+            <span v-if="$hasPermissions('B_merchantInfo_detail')" class="link-bule" @click="handleDetail(record)">{{ record.dealerName }}</span>
             <span v-else>{{ record.dealerName }}</span>
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
             <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
-            <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
             <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button>
+            <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
             <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
             <span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
           </template>
@@ -137,20 +137,20 @@ export default {
       total: 0,
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { 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: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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 },
-        { title: '联系电话', dataIndex: 'dealerTelephone', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '绑定手机号码', dataIndex: 'managerMobile', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核状态', dataIndex: 'auditStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '生效时间', dataIndex: 'cooperateEffectiveTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
+        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系人', dataIndex: 'contact', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系电话', dataIndex: 'dealerTelephone', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '绑定手机号码', dataIndex: 'managerMobile', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核状态', dataIndex: 'auditStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '生效时间', dataIndex: 'cooperateEffectiveTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '16%', align: 'center' }
       ],
       loading: false,
       // 加载数据方法 必须为 Promise 对象

+ 4 - 4
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -111,9 +111,9 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '添加时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '类型', dataIndex: 'type', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型名称', dataIndex: 'goodsName', align: 'center', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型名称', dataIndex: 'goodsName', align: 'left', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'product.name', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -325,7 +325,7 @@ export default {
 <style lang="less" scoped>
   .permissionSetting-wrap{
     .permissionSetting-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

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

@@ -33,7 +33,7 @@
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
             <a-button  @click="cansel">取消</a-button>
-            <a-button style="margin-left: 50px;" type="primary" @click="onSubmit">确定</a-button>
+            <a-button style="margin-left: 15px;" type="primary" @click="onSubmit">确定</a-button>
           </div>
         </a-form-model>
       </a-spin>

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

@@ -25,7 +25,7 @@
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
             <a-button @click="cansel">取消</a-button>
-            <a-button style="margin-left: 50px;" type="primary" @click="onSubmit">确定</a-button>
+            <a-button style="margin-left: 15px;" type="primary" @click="onSubmit">确定</a-button>
           </div>
         </a-form-model>
       </a-spin>

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

@@ -27,7 +27,7 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button id="product-category-edit-modal-back" @click="isShow = false" >关闭</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>

+ 8 - 8
src/views/dealerManagement/rebateSettings/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="rebateSettingsList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="rebateSettingsList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -117,12 +117,12 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'center', ellipsis: true },
-        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'center', width: '15%' },
-        { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'center', width: '15%' },
-        { title: '指定归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'center', width: '15%' },
-        { title: '上级经销商', scopedSlots: { customRender: 'sjcjgs' }, align: 'center', width: '15%' },
-        { title: '上级经销商级别', scopedSlots: { customRender: 'sjgsjxsjb' }, align: 'center', width: '15%' },
+        { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'left', ellipsis: true },
+        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'left', width: '15%' },
+        { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'left', width: '15%' },
+        { title: '指定归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'left', width: '15%' },
+        { title: '上级经销商', scopedSlots: { customRender: 'sjcjgs' }, align: 'left', width: '15%' },
+        { title: '上级经销商级别', scopedSlots: { customRender: 'sjgsjxsjb' }, align: 'left', width: '15%' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -174,7 +174,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 210
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 1 - 1
src/views/inventoryManagement/inventoryCheck/addModal.vue

@@ -26,8 +26,8 @@
           </p>
         </div>
         <div class="btn-cont">
+          <a-button id="inventoryCheckAddModal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="inventoryCheckAddModal-save" @click="handleSave">确定</a-button>
-          <a-button id="inventoryCheckAddModal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 4 - 4
src/views/productManagement/newProduct/list.vue

@@ -128,11 +128,11 @@ export default {
         { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
         { slots: { title: 'auditTimeTit' }, dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 140, align: 'center' },
-        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 350, align: 'left' },
+        { title: '产品名称', dataIndex: 'name', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: 180, align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: 140, align: 'left', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 7 - 7
src/views/productManagement/priceChangeRecord/list.vue

@@ -178,9 +178,9 @@ export default {
         { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
         { title: '变更时间', dataIndex: 'updateDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 140, align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'left' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '变更原因', dataIndex: 'changeReason', width: 70, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '变更状态', scopedSlots: { customRender: 'productStatus' }, width: 70, align: 'center' }
@@ -191,7 +191,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeProvincePrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterProvincePrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterProvincePrice' }, width: 70, align: 'right' }
         ]
       })
       arr.push({
@@ -200,7 +200,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeCityPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: 70, align: 'right' }
         ]
       })
       arr.push({
@@ -209,7 +209,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeSpecialPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterSpecialPrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterSpecialPrice' }, width: 70, align: 'right' }
         ]
       })
       arr.push({
@@ -218,7 +218,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeTerminalPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterTerminalPrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterTerminalPrice' }, width: 70, align: 'right' }
         ]
       })
       arr.push({
@@ -227,7 +227,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeCarOwnersPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterCarOwnersPrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterCarOwnersPrice' }, width: 70, align: 'right' }
         ]
       })
       return arr

+ 9 - 9
src/views/productManagement/productInfo/list.vue

@@ -269,19 +269,19 @@ export default {
       openGuideModal: false,
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', align: 'center', width: '15%', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'left', width: '14%', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
-        { slots: { title: 'arrowFalgTitle' }, scopedSlots: { customRender: 'arrowFalg' }, width: '6%', align: 'center' },
-        { title: '最近修改时间', dataIndex: 'updateDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '最新定价时间', dataIndex: 'pricingTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
+        { slots: { title: 'arrowFalgTitle' }, scopedSlots: { customRender: 'arrowFalg' }, width: '5%', align: 'center' },
+        { title: '最近修改时间', dataIndex: 'updateDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '最新定价时间', dataIndex: 'pricingTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '定价状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '停产状态', width: '6%', align: 'center', scopedSlots: { customRender: 'stopStatus' } },
-        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '7%', align: 'center' },
+        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '5%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       loadingAudit: false,

+ 3 - 3
src/views/productManagement/productLaunchAudit/list.vue

@@ -149,9 +149,9 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '15%', align: 'center' },
+        { title: '产品名称', dataIndex: 'name', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '15%', align: 'left' },
         { title: '提交时间', dataIndex: 'submitTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提交人', dataIndex: 'submitPerson', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '审核状态', dataIndex: 'bizStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }

+ 1 - 1
src/views/productManagement/productLevel/editModal.vue

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

+ 4 - 4
src/views/productManagement/productLevel/list.vue

@@ -122,11 +122,11 @@ export default {
       exportLoading: false, // 导出loading
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', align: 'center', width: '25%', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '19%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'left', width: '25%', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '19%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '16%', align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '16%', align: 'left' },
         { title: '包装数', dataIndex: 'packQtyV', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品级别', dataIndex: 'level', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 8 - 8
src/views/productManagement/productNotOnline/list.vue

@@ -150,19 +150,19 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'left', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'code', width: '7%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '7%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '7%', align: 'center' },
-        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'left' },
+        { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '可用库存', dataIndex: 'currentStockQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '第一次入库时间', dataIndex: 'skCreateDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '定价状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '定价时间', dataIndex: 'pricingTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '定价时间', dataIndex: 'pricingTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
 
       if (this.$hasPermissions('M_productNotOnlineList_costPrice')) {

+ 4 - 4
src/views/productManagement/productOfflineAudit/list.vue

@@ -168,12 +168,12 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
+        { title: '产品名称', dataIndex: 'name', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
         { title: '提交时间', dataIndex: 'submitTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提交人', dataIndex: 'submitPerson', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '下线选项', dataIndex: 'reasonType', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下线选项', dataIndex: 'reasonType', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '通用编码', dataIndex: 'commonCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '下线备注', dataIndex: 'submitNote', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '审核状态', dataIndex: 'bizStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }

+ 1 - 1
src/views/productManagement/productPricing/auditModal.vue

@@ -51,8 +51,8 @@
           <a-descriptions-item label="变更原因">{{ detailsData && detailsData.changeReason || '--' }}</a-descriptions-item>
         </a-descriptions>
         <div class="btn-cont">
+          <a-button id="productPricingAudit-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="productPricingAudit-save" @click="handleAudit">审核通过</a-button>
-          <a-button id="productPricingAudit-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </div>
     </a-spin>

+ 1 - 1
src/views/productManagement/productPricing/editModal.vue

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

+ 5 - 5
src/views/productManagement/productPricing/list.vue

@@ -206,15 +206,15 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '3%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'left', width: '13%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '6%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '7%', align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '11%', align: 'left' },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '定价状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '定价时间', dataIndex: 'pricingTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '定价时间', dataIndex: 'pricingTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '成本价', scopedSlots: { customRender: 'sterminaldsdPrice' }, width: '7%', align: 'center' },
         { title: '省级价', dataIndex: 'provincePrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 5 - 5
src/views/productManagement/productUniversal/list.vue

@@ -132,12 +132,12 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', align: 'left', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品状态', dataIndex: 'product.stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '通用产品编码', dataIndex: 'productCommonCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '通用产品名称', dataIndex: 'productCommont.name', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '通用产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'center' },
+        { title: '通用产品编码', dataIndex: 'productCommonCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '通用产品名称', dataIndex: 'productCommont.name', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '通用产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
         { title: '通用产品状态', dataIndex: 'productCommont.stateDictValue', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],

+ 5 - 5
src/views/productManagement/shelfNoManage/list.vue

@@ -216,13 +216,13 @@ export default {
 	  columns () {
 	    const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '20%', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', align: 'left', width: '20%', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'product.productBrandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
         { title: '产品状态', dataIndex: 'product.stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '货位编号', dataIndex: 'stackPlaceCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]

+ 5 - 5
src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue

@@ -20,27 +20,27 @@
             :label-col="formItemLayout.labelCol"
             :wrapper-col="formItemLayout.wrapperCol">
             <a-row :gutter="15">
-              <a-col :md="6" :sm="24">
+              <a-col :md="8" :sm="24">
                 <a-form-model-item label="产品编码">
                   <a-input id="chooseProducts-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="8" :sm="24">
                 <a-form-model-item label="产品名称">
                   <a-input id="chooseProducts-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="8" :sm="24">
                 <a-form-model-item label="产品分类">
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="queryParam.productType" id="chooseProducts-productType"></productTypeAll>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="8" :sm="24">
                 <a-form-model-item label="产品品牌">
                   <ProductBrand id="chooseProducts-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="chooseProducts-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetData" :disabled="disabled" id="chooseProducts-reset">重置</a-button>
               </a-col>

+ 4 - 3
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -111,8 +111,9 @@
         <a-card size="small" :bordered="false">
           <a-button
             type="primary"
+            class="button-info"
             size="large"
-            style="padding:0 30px;"
+            style="padding:0 40px;"
             @click="handleSubmit"
             :disabled="disabled"
             v-if="$hasPermissions('B_rulesSubmit')&&(mainContentList&&mainContentList.length>0)">提交</a-button>
@@ -317,7 +318,7 @@ export default {
    box-sizing: border-box;
    transform: translateZ(0);
     .salesDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .btnGroup{
       margin-bottom:15px;
@@ -350,7 +351,7 @@ export default {
       width: 100%;
       text-align:center;
       position:fixed;
-      bottom:10px;
+      bottom:0;
       right:0px;
       box-shadow: 0 0 20px #dcdee2;
     }

+ 18 - 81
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -16,108 +16,45 @@
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
         <a-form-model-item label="规则简称" v-if="form.description">
-          <a-input
-            size="small"
-            disabled="true"
-            v-model.trim="form.description"></a-input>
+          {{form.description}}
         </a-form-model-item>
         <a-form-model-item label="规则门槛" v-if="form.gateFlag">
-          <a-radio-group v-model="form.gateFlag" button-style="solid" size="small" disabled="true">
-            <a-radio-button value="1">
-              有
-            </a-radio-button>
-            <a-radio-button value="0">
-              无
-            </a-radio-button>
-          </a-radio-group>
+          {{form.gateFlag==='1'?'有':'无'}}
           <div v-if="form.gateFlag==='1'">
-            <span v-if="form.gateType==='RATIO_AMOUNT'">购买门槛产品金额{{ form.gateAmount*100 }}%作为配额 </span>
-            <span v-if="form.gateType==='MIN_AMOUNT'">购买门槛产品满最低金额{{ form.gateAmount }}元,不限制配额。</span>
-            <span v-if="form.gateType==='FIXED_AMOUNT'">购买满{{ form.gateAmount }}元门槛产品,可使用{{ form.quotaAmount }}元配额,采购规则中的{{ form.promotionRuleType!='PROMO_PROD'?'正价':'特价' }}商品(配额算销售额)</span>
+            <span v-if="form.gateType==='RATIO_AMOUNT'">购买门槛产品金额 {{ form.gateAmount*100 }}% 作为配额 </span>
+            <span v-if="form.gateType==='MIN_AMOUNT'">购买门槛产品满最低金额 {{ form.gateAmount }} 元,不限制配额。</span>
+            <span v-if="form.gateType==='FIXED_AMOUNT'">购买满 {{ form.gateAmount }} 元门槛产品,可使用 {{ form.quotaAmount }} 元配额,采购规则中的 {{ form.promotionRuleType!='PROMO_PROD'?'正价':'特价' }} 商品(配额算销售额)</span>
           </div>
         </a-form-model-item>
         <!-- 买产品送产品 -->
         <a-form-model-item label="满赠规则" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'">
-          <span>{{ form.regularSameFlag==='1'?'同款':'不同款' }}产品购买满{{ form.regularQty }}个正价产品,送{{ form.promotionQty }}个促销产品</span>
-          <span v-if="form.restrictFlag&&form.restrictFlag==1">,限制正价产品款数{{ form.restrictCategory }}</span>
+          <span>{{ form.regularSameFlag==='1'?'同款':'不同款' }}产品购买满 {{ form.regularQty }} 个正价产品,送 {{ form.promotionQty }} 个促销产品</span>
+          <span v-if="form.restrictFlag&&form.restrictFlag==1">,限制正价产品款数 {{ form.restrictCategory }}</span>
         </a-form-model-item>
         <a-form-model-item label="满赠规则" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_MONEY'">
-          购买满{{ form.regularAmount }}元正价产品,送{{ form.giveAmount }}元({{ perCentNum }}%促销品采购额)
+          购买满 {{ form.regularAmount }} 元正价产品,送 {{ form.giveAmount }} 元({{ perCentNum }}%促销品采购额)
         </a-form-model-item>
         <a-form-model-item label="数量叠加" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'&&form.accrualFlag">
-          <a-radio-group v-model="form.accrualFlag" button-style="solid" size="small" disabled="true">
-            <a-radio-button value="1">
-              是
-            </a-radio-button>
-            <a-radio-button value="0">
-              否
-            </a-radio-button>
-          </a-radio-group>
+          {{form.accrualFlag==='1'?'是':'否'}}
         </a-form-model-item>
         <a-form-model-item label="金额叠加" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_MONEY'&&form.accrualFlag">
-          <a-radio-group v-model="form.accrualFlag" button-style="solid" size="small" disabled="true">
-            <a-radio-button value="1">
-              是
-            </a-radio-button>
-            <a-radio-button value="0">
-              否
-            </a-radio-button>
-          </a-radio-group>
+          {{form.accrualFlag==='1'?'是':'否'}}
         </a-form-model-item>
         <a-form-model-item prop="minOrderFlag" label="订单起订金额">
-          <a-select v-model="form.minOrderFlag" style="width: 160px" size="small" disabled="true">
-            <a-select-option value="0">
-              不限
-            </a-select-option>
-            <a-select-option value="1">
-              限制
-            </a-select-option>
-          </a-select>
-          <a-input
-            disabled="true"
-            v-if="form.minOrderAmount"
-            size="small"
-            style="margin-left:10px;width:100px;"
-            v-model="form.minOrderAmount"/>
-          {{ form.minOrderAmount?'元':'' }}
+          {{form.minOrderFlag==='1'?'限制':'不限'}}
+          {{ form.minOrderAmount? (form.minOrderAmount + '元'):'' }}
         </a-form-model-item>
         <a-form-model-item prop="upperLimitFlag" label="活动经费上限">
-          <a-select v-model="form.upperLimitFlag" style="width: 160px" size="small" disabled="true">
-            <a-select-option value="0">
-              不限
-            </a-select-option>
-            <a-select-option value="1">
-              限制
-            </a-select-option>
-          </a-select>
-          <a-input
-            disabled="true"
-            v-if="form.upperLimitAmount"
-            size="small"
-            style="margin-left:10px;width:100px;"
-            v-model="form.upperLimitAmount"/>
-          {{ form.upperLimitAmount?'元':'' }}
+          {{form.upperLimitFlag==='1'?'限制':'不限'}}
+          {{ form.upperLimitAmount?(form.upperLimitAmount+'元'):'' }}
         </a-form-model-item>
         <a-form-model-item label="促销品是否与正品一致" v-if="form.regularPromotionSameFlag" prop="regularPromotionSameFlag">
-          <a-radio-group v-model="form.regularPromotionSameFlag" button-style="solid" size="small" disabled="true">
-            <a-radio-button value="1">
-              是
-            </a-radio-button>
-            <a-radio-button value="0">
-              否
-            </a-radio-button>
-          </a-radio-group>
+          {{form.regularPromotionSameFlag==='1'?'是':'否'}}
         </a-form-model-item>
         <a-form-model-item label="采购额适用范围" v-if="form.scopeFlag" prop="scopeFlag" >
-          <a-radio-group v-model="form.scopeFlag" button-style="solid" size="small" disabled="true">
-            <a-radio-button value="0">
-              部分产品
-            </a-radio-button>
-            <a-radio-button value="1">
-              全部产品
-            </a-radio-button>
-          </a-radio-group>
-        </a-form-model-item></a-form-model>
+          {{form.scopeFlag==='1'?'全部产品':'部分产品'}}
+        </a-form-model-item>
+      </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <a-radio-group v-model="chooseVal" button-style="solid">
           <a-radio-button value="a" v-show="form.gateFlag==='1'">

+ 14 - 14
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -27,12 +27,12 @@
         </a-form-model-item>
         <a-form-model-item label="规则门槛" prop="gateFlag">
           <a-radio-group v-model="form.gateFlag" button-style="solid" size="small" @change="changeGateFlag">
-            <a-radio-button value="1">
+            <a-radio value="1">
-            </a-radio-button>
-            <a-radio-button value="0">
+            </a-radio>
+            <a-radio value="0">
-            </a-radio-button>
+            </a-radio>
           </a-radio-group>
           <div v-if="form.gateFlag && form.gateFlag === '1'">
             <v-select
@@ -95,12 +95,12 @@
         </a-form-model-item>
         <a-form-model-item label="金额叠加" prop="accrualFlag">
           <a-radio-group v-model="form.accrualFlag" button-style="solid" size="small">
-            <a-radio-button value="1">
+            <a-radio value="1">
-            </a-radio-button>
-            <a-radio-button value="0">
+            </a-radio>
+            <a-radio value="0">
-            </a-radio-button>
+            </a-radio>
           </a-radio-group>
           <span style="color:gray;">(如:满1000送200,金额叠加则:满2000送400,以此类推)</span>
         </a-form-model-item>
@@ -146,18 +146,18 @@
         </a-form-model-item>
         <a-form-model-item label="采购额适用范围" prop="scopeFlag">
           <a-radio-group v-model="form.scopeFlag" button-style="solid" size="small">
-            <a-radio-button value="0">
+            <a-radio value="0">
               部分产品
-            </a-radio-button>
-            <a-radio-button value="1">
+            </a-radio>
+            <a-radio value="1">
               全部产品
-            </a-radio-button>
+            </a-radio>
           </a-radio-group>
         </a-form-model-item>
       </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <div class="flex">
-          <a-radio-group v-model="chooseVal" button-style="solid" size="small">
+          <a-radio-group v-model="chooseVal" button-style="solid">
             <a-radio-button value="a" v-show="form.gateFlag==='1'">
               门槛产品
             </a-radio-button>
@@ -579,7 +579,7 @@ export default {
 <style lang="less" scoped>
   .promotionList-basicInfo-modal{
     /deep/.ant-modal-body {
-      padding: 40px 40px 24px;
+      padding: 20px 30px;
       max-height: 745px !important;
       overflow-y: scroll !important;
     }

+ 14 - 14
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -27,12 +27,12 @@
         </a-form-model-item>
         <a-form-model-item label="规则门槛" prop="gateFlag">
           <a-radio-group v-model="form.gateFlag" button-style="solid" size="small" @change="changeGateFlag">
-            <a-radio-button value="1">
+            <a-radio value="1">
-            </a-radio-button>
-            <a-radio-button value="0">
+            </a-radio>
+            <a-radio value="0">
-            </a-radio-button>
+            </a-radio>
           </a-radio-group>
           <div v-if="form.gateFlag && form.gateFlag === '1'">
             <v-select
@@ -106,12 +106,12 @@
         </a-form-model-item>
         <a-form-model-item label="数量叠加" prop="accrualFlag">
           <a-radio-group v-model="form.accrualFlag" button-style="solid" size="small">
-            <a-radio-button value="1">
+            <a-radio value="1">
-            </a-radio-button>
-            <a-radio-button value="0">
+            </a-radio>
+            <a-radio value="0">
-            </a-radio-button>
+            </a-radio>
           </a-radio-group>
           <span style="color:gray;">(如:满10送2,数量叠加则:满20送4,满30送6)</span>
         </a-form-model-item>
@@ -169,18 +169,18 @@
         </a-form-model-item>
         <a-form-model-item label="促销品与正品一致" prop="regularPromotionSameFlag">
           <a-radio-group v-model="form.regularPromotionSameFlag" button-style="solid" size="small" :disabled="form.regularSameFlag==0">
-            <a-radio-button value="1">
+            <a-radio value="1">
-            </a-radio-button>
-            <a-radio-button value="0">
+            </a-radio>
+            <a-radio value="0">
-            </a-radio-button>
+            </a-radio>
           </a-radio-group>
         </a-form-model-item>
       </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <div class="flex">
-          <a-radio-group v-model="chooseVal" button-style="solid" size="small">
+          <a-radio-group v-model="chooseVal" button-style="solid">
             <a-radio-button value="a" v-show="form.gateFlag==='1'">
               门槛产品
             </a-radio-button>
@@ -606,7 +606,7 @@ export default {
 <style lang="less" scoped>
   .promotionList-basicInfo-modal{
     /deep/.ant-modal-body {
-      padding: 40px 40px 24px;
+      padding: 20px 30px;
       max-height: 745px !important;
       overflow-y: scroll !important;
     }

+ 6 - 6
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -27,12 +27,12 @@
         </a-form-model-item>
         <a-form-model-item label="规则门槛" prop="gateFlag">
           <a-radio-group v-model="form.gateFlag" button-style="solid" size="small" @change="handleChange">
-            <a-radio-button value="1">
+            <a-radio value="1">
-            </a-radio-button>
-            <a-radio-button value="0">
+            </a-radio>
+            <a-radio value="0">
-            </a-radio-button>
+            </a-radio>
           </a-radio-group>
           <div v-if="form.gateFlag && form.gateFlag === '1'">
             <v-select
@@ -105,7 +105,7 @@
       </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <div class="flex">
-          <a-radio-group v-model="chooseVal" button-style="solid" size="small">
+          <a-radio-group v-model="chooseVal" button-style="solid">
             <a-radio-button value="a" v-show="form.gateFlag==='1'">
               门槛产品
             </a-radio-button>
@@ -652,7 +652,7 @@ export default {
 <style lang="less" scoped>
   .promotionList-basicInfo-modal{
     /deep/.ant-modal-body {
-      padding: 40px 40px 24px;
+      padding: 20px 30px;
       max-height: 745px !important;
       overflow-y: scroll !important;
     }

+ 3 - 3
src/views/promotionRulesManagement/promotionManagement/list.vue

@@ -91,7 +91,7 @@
           </template>
           <!-- 参与客户 -->
           <template slot="joinCustomers" slot-scope="text, record">
-            <span @click="handleCustomers(record)" v-if="record.promoBuyerSnSet&&record.promoBuyerSnSet.length>0">共有<span class="font1">{{ record.promoBuyerSnSet.length }}</span>个客户</span>
+            <span @click="handleCustomers(record)" v-if="record.promoBuyerSnSet&&record.promoBuyerSnSet.length>0">共有<span class="link-bule">{{ record.promoBuyerSnSet.length }}</span>个客户</span>
             <span v-else>共有0个客户</span>
           </template>
           <!-- 促销描述 -->
@@ -100,10 +100,10 @@
               <template slot="title">
                 <span>{{ record.description }}</span>
               </template>
-              <div @click="promotionDesc(record)" class="desc font1">{{ record.description }}</div>
+              <div @click="promotionDesc(record)" class="link-bule">{{ record.description }}</div>
             </a-tooltip>
             <div v-else-if="!record.description" class="desc">--</div>
-            <div v-else @click="promotionDesc(record)" class="desc font1">{{ record.description }}</div>
+            <div v-else @click="promotionDesc(record)" class="link-bule">{{ record.description }}</div>
           </template>
           <!-- 促销展示 -->
           <template slot="salesShow" slot-scope="text, record">

+ 1 - 1
src/views/promotionRulesManagement/promotionManagement/lookUpCustomersModal.vue

@@ -63,7 +63,7 @@
         </s-table>
       </a-card>
       <div class="btn-cont">
-        <a-button type="primary" id="lookUpCustomers-modal-back" @click="isShow = false">关闭</a-button>
+        <a-button id="lookUpCustomers-modal-back" @click="isShow = false">关闭</a-button>
       </div>
     </a-spin>
   </a-modal>

+ 1 - 1
src/views/promotionRulesManagement/promotionManagement/promotionDescModal.vue

@@ -12,7 +12,7 @@
       {{ con }}
     </div>
     <div class="btn-cont">
-      <a-button type="primary" id="promotionDesc-modal-back" @click="isShow = false">关闭</a-button>
+      <a-button type="default" id="promotionDesc-modal-back" @click="isShow = false">关闭</a-button>
     </div>
   </a-modal>
 </template>

+ 1 - 1
src/views/promotionRulesManagement/promotionManagement/promotionShowModal.vue

@@ -19,7 +19,7 @@
     </div>
     <div class="btn-cont">
       <!-- <a-button id="promotionDesc-modal-back" @click="isShow = false" style="margin-right:10px;">下载图片</a-button> -->
-      <a-button type="primary" id="promotionDesc-modal-back" @click="isShow = false">关闭</a-button>
+      <a-button id="promotionDesc-modal-back" @click="isShow = false">关闭</a-button>
     </div>
   </a-modal>
 </template>

+ 2 - 5
src/views/supplierManagement/costSetting/addProductModal.vue

@@ -77,17 +77,14 @@
         <div class="btn-con">
           <a-button
             id="chooseProducts-cancel"
-            size="large"
             class="button-cancel"
             @click="isShow=false"
-            style="padding: 0 60px;margin-right: 15px;">取消</a-button>
+            style="padding: 0 30px;margin-right: 15px;">取消</a-button>
           <a-button
             type="primary"
             id="chooseProducts-save"
-            size="large"
-            class="button-primary"
             @click="handleSave"
-            style="padding: 0 60px;">保存</a-button>
+            style="padding: 0 30px;">保存</a-button>
         </div>
       </div>
     </a-spin>