lilei 1 anno fa
parent
commit
d7787f0fbf

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

@@ -40,9 +40,9 @@
       </a-card>
       <a-card size="small" title="规则设置" :bordered="false" class="pages-wrap">
         <div class="btnGroup" v-if="$hasPermissions('B_rulesAddEdit')&&$route.query.type=='rule'">
-          <a-button type="primary" class="button-warning" @click="openBtnModal('SendProducts')" :disabled="disabled">买产品送产品</a-button>
-          <a-button style="margin:0 10px" type="primary" class="button-warn" @click="openBtnModal('SendAmount')" :disabled="disabled">买产品送采购额</a-button>
-          <a-button type="primary" @click="openBtnModal('SpecialOffer')" :disabled="disabled">特价产品</a-button>
+          <a-button type="primary" class="button-info" @click="openBtnModal('SendProducts')" :disabled="disabled">买产品送产品</a-button>
+          <a-button type="primary" class="button-info" @click="openBtnModal('SendAmount')" :disabled="disabled">买产品送采购额</a-button>
+          <a-button type="primary" style="margin-left:5px;" @click="openBtnModal('SpecialOffer')" :disabled="disabled">特价产品</a-button>
         </div>
         <!-- 列表 -->
         <s-table

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

@@ -61,13 +61,13 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_dealerPromotionAdd')">
-          <a-button id="promotionList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+          <a-button id="promotionList-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.sparePartsReturnNo"
           :columns="columns"
@@ -221,11 +221,11 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销名称', scopedSlots: { customRender: 'promotionName' }, width: '18%', align: 'center' },
-        { title: '促销简称', dataIndex: 'description', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销名称', scopedSlots: { customRender: 'promotionName' }, width: '18%', align: 'left' },
+        { title: '促销简称', dataIndex: 'description', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '13%', align: 'center' },
         { title: '参与客户', scopedSlots: { customRender: 'joinCustomers' }, width: '7%', align: 'center', ellipsis: true },
-        { title: '促销描述', dataIndex: 'content', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '促销描述', dataIndex: 'content', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '活动状态', dataIndex: 'stateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发布状态', scopedSlots: { customRender: 'releaseStatus' }, width: '7%', align: 'center', ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
@@ -414,7 +414,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

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

@@ -53,12 +53,12 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_promotionManagementAdd')">
-          <a-button type="primary" class="button-error" @click="openAddModal = true">新增</a-button>
+          <a-button type="primary" @click="openAddModal = true">新增</a-button>
         </div>
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+94.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -352,7 +352,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {