Forráskód Böngészése

迭代30经销商促销

chenrui 1 éve
szülő
commit
52c89532f7

BIN
public/templ/促销规则导入产品.xlsx


BIN
public/templ/促销规则导入特价产品.xlsx


+ 2 - 1
src/views/promotionRulesManagement/dealerPromotions/importGuideModal.vue

@@ -16,8 +16,9 @@
           </div>
           <ul>
             <li v-if="goodFlag==='1'">1) 导入的Excel文件中必须包含名为“产品编码”的列,“产品编码”必填</li>
-            <li v-else>1) 导入的Excel文件中必须包含名为“产品编码”、“省级特价”、“市级特价”和“特约特价”的列,都为必填</li>
+            <li v-else>1) 导入的Excel文件中必须包含名为“产品编码”、“省级特价”、“市级特价”和“特约特价”的列,都为必填,省级特价≤市级特价≤特约特价</li>
             <li>2) 如果导入的产品已经存在,则不会导入该行</li>
+            <li>3)设置类型和起订数量非必填:设置类型为空则默认为“按数量设置”,起订数量为空则默认为“1”。</li>
             <li>
               <a :href="filePath" style="margin: 5px 0 0;display: block;">
                 <a-icon type="download" style="padding-right: 5px;" />下载导入模板

+ 13 - 4
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -60,8 +60,11 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
-        <div class="table-operator" v-if="$hasPermissions('B_dealerPromotionAdd')">
-          <a-button id="promotionList-add" type="primary" @click="handleAdd">新增</a-button>
+        <div class="table-operator tableBtnSet" >
+          <a-button v-if="$hasPermissions('B_dealerPromotionAdd')" id="promotionList-add" type="primary" @click="handleAdd">新增</a-button>
+          <a-checkbox @change="onChange">
+            待审核(修改参与客户)
+          </a-checkbox>
         </div>
         <!-- 列表 -->
         <s-table
@@ -86,8 +89,9 @@
           </template>
           <!-- 参与客户 -->
           <template slot="joinCustomers" slot-scope="text, record">
-            <div v-if="record.dealerScope ==='ALL_DEALER'">全部客户</div>
-            <div class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerSnList?record.dealerSnList.length:0 }}</span>个客户</div>
+            <span v-if="record.dealerScope ==='ALL_DEALER'">全部客户</span>
+            <span class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerSnList?record.dealerSnList.length:0 }}</span>个客户</span>
+            <a-badge count="审" :number-style="{ backgroundColor: '#f30', zoom:'80%' }" />
           </template>
           <!-- 发布状态 -->
           <template slot="releaseStatus" slot-scope="text, record">
@@ -453,5 +457,10 @@ export default {
     .joinCustomer{
       cursor:pointer;
     }
+    .tableBtnSet{
+     display: flex;
+     align-items: center;
+     justify-content: space-between;
+    }
   }
 </style>