Explorar el Código

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei hace 1 año
padre
commit
fbe51ecfc9

+ 17 - 10
src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue

@@ -1,13 +1,12 @@
 <template>
-  <a-modal
-    centered
-    class="chooseProducts-modal"
-    :footer="null"
-    :maskClosable="false"
+  <a-drawer
     title="选择产品"
-    v-model="isShow"
-    @cancel="isShow=false"
-    :width="900">
+    class="chooseProducts-modal"
+    placement="right"
+    :visible="isShow"
+    @close="isShow=false"
+    width="50%"
+  >
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="products-con">
         <div>
@@ -75,11 +74,19 @@
               <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
               <span v-else>--</span>
             </template>
+            <!-- 包装数 -->
+            <template slot="productQty" slot-scope="text, record">
+              <span v-if="record.packQty">
+                {{ record.packQty }}{{ record.packQtyUnit }}{{ '/'+record.unit }}
+              </span>
+              <span v-else>--</span>
+            </template>
+
           </s-table>
         </div>
       </div>
     </a-spin>
-  </a-modal>
+  </a-drawer>
 </template>
 
 <script>
@@ -130,7 +137,7 @@ export default {
         { title: '原厂编码', dataIndex: 'origCode', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
-        { title: '包装数', dataIndex: 'packQtyV', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '包装数', scopedSlots: { customRender: 'productQty' }, align: 'center' },
         { title: '单位', dataIndex: 'unit', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象

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

@@ -61,7 +61,7 @@
                 购买门槛产品金额{{ record.gateAmount*100 }}%作为配额
               </span>
               <span v-else-if="record.gateType==='MIN_AMOUNT'">
-                购买门槛产品满最低金额{{ record.gateAmount }}不限制配额。
+                购买门槛产品满最低金额{{ record.gateAmount }}元,不限制配额。
               </span>
               <span v-else>购买满{{ record.gateAmount }}元门槛产品,可使用 {{ record.quotaAmount }}元配额,采购规则中的正价商品</span>
             </div>
@@ -184,7 +184,7 @@ export default {
         { title: '规则门槛', scopedSlots: { customRender: 'cillProduct' }, width: '20%', align: 'center' },
         { title: '规则', scopedSlots: { customRender: 'ruleProduct' }, width: '20%', align: 'center' },
         { title: '订单起订金额(元)', dataIndex: 'minOrderAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '订单经费上限(元)', dataIndex: 'upperLimitAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '活动经费上限(元)', dataIndex: 'upperLimitAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'center' }
       ]
       return arr

+ 22 - 17
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -7,7 +7,7 @@
     title="详情"
     v-model="isShow"
     @cancel="isShow=false"
-    :width="900">
+    width="70%">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
         id="dealerPromotions-basicInfo-form"
@@ -15,22 +15,27 @@
         :model="form"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
-        <a-form-model-item label="规则门槛" v-if="form.gateFlag">
-          <div>{{ form.gateFlag=== '0'?'无':'有' }}</div>
-          <div v-if="form.gateFlag==='1'">购买满{{ form.gateAmount }}元门槛产品,可使用{{ form.quotaAmount }}元配额,采购规则中的正价商品(配额算销售额)</div>
-        </a-form-model-item>
-        <a-form-model-item label="促销简称" v-if="form.description">
+        <a-form-model-item label="规则简称" v-if="form.description">
           {{ form.description }}
         </a-form-model-item>
+        <a-form-model-item label="规则门槛" v-if="form.gateFlag">
+          <div v-if="form.gateFlag=== '0'">无</div>
+          <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 }}元配额,采购规则中的正价商品(配额算销售额)</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>
         </a-form-model-item>
         <a-form-model-item label="满赠规则" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_MONEY'">
-          {{ form.regularSameFlag==='1'?'同款':'不同款' }}产品购买满{{ form.regularAmount }}元正价产品,送{{ form.giveAmount }}元{{ perCentNum }}促销品采购额
+          {{ form.regularSameFlag==='1'?'同款':'不同款' }}产品购买满{{ form.regularAmount }}元正价产品,送{{ form.giveAmount }}元{{ perCentNum }}%促销品采购额
         </a-form-model-item>
-        <a-form-model-item label="数量叠加" prop="accrualFlag" v-if="form.accrualFlag">{{ form.accrualFlag==='1'?'是':'否' }}</a-form-model-item>
+        <a-form-model-item label="数量叠加" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'&&form.accrualFlag">{{ form.accrualFlag==='1'?'是':'否' }}</a-form-model-item>
+        <a-form-model-item label="金额叠加" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_MONEY'&&form.accrualFlag">{{ form.accrualFlag==='1'?'是':'否' }}</a-form-model-item>
         <a-form-model-item prop="minOrderFlag">
           <span slot="label">
             <a-tooltip title="What do you want others to call you?">
@@ -38,7 +43,7 @@
             </a-tooltip>
             订单起订金额
           </span>
-          {{ form.minOrderFlag === '1'?'限制':'不限制' }}{{ form.minOrderAmount }}
+          {{ form.minOrderFlag === '1'?'限制':'不限制' }}{{ form.minOrderAmount?form.minOrderAmount+'元':'' }}
         </a-form-model-item>
         <a-form-model-item prop="upperLimitFlag">
           <span slot="label">
@@ -47,10 +52,10 @@
             </a-tooltip>
             活动经费上限
           </span>
-          {{ form.upperLimitFlag === '1'?'限制':'不限制' }}{{ form.upperLimitAmount }}
+          {{ form.upperLimitFlag === '1'?'限制':'不限制' }}{{ form.upperLimitAmount?form.upperLimitAmount+'元' :''}}
         </a-form-model-item>
         <a-form-model-item label="促销品是否与正品一致" v-if="form.regularPromotionSameFlag" prop="regularPromotionSameFlag">{{ form.regularPromotionSameFlag==='1'?'是':'否' }}</a-form-model-item>
-        <a-form-model-item label="采购额使用范围" v-if="form.scopeFlag" prop="scopeFlag">{{ form.scopeFlag==='1'?'全部产品':'部分产品' }}</a-form-model-item>
+        <a-form-model-item label="采购额用范围" v-if="form.scopeFlag" prop="scopeFlag">{{ 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">
@@ -83,19 +88,19 @@
           >
             <!-- 产品分类 -->
             <template slot="productType" slot-scope="text, record">
-              <div style="max-height:100px;overflow-y:scroll;" v-if="record.productTypeList && record.productTypeList.length>0">
-                <a-tag style="margin-bottom:5px;" v-for="item in record.productTypeList" :key="item.id">{{ item.productTypeName1 }}{{ item.productTypeName2?'/'+item.productTypeName2 :'' }}{{ item.productTypeName3?'/'+item.productTypeName3:'' }}</a-tag>
+              <div style="max-height:110px;overflow-y:scroll;" v-if="record.productTypeList && record.productTypeList.length>0">
+                <a-tag style="margin-bottom:5px;" v-for="item in record.productTypeList" :key="item.id">{{ item.productTypeName3? item.productTypeName2+'/'+item.productTypeName3:(item.productTypeName2&&!item.productTypeName3)?item.productTypeName2:item.productTypeName1}}</a-tag>
               </div>
             </template>
             <!-- 品牌 -->
             <template slot="productBrand" slot-scope="text, record">
-              <div style="max-height:100px;overflow-y:scroll;" v-if="record.productBrandList && record.productBrandList.length>0">
+              <div style="max-height:110px;overflow-y:scroll;" v-if="record.productBrandList && record.productBrandList.length>0">
                 <a-tag style="margin-bottom:5px;" v-for="item in record.productBrandList" :key="item.id">{{ item.productBrandName }}</a-tag>
               </div>
             </template>
             <!-- 产品 -->
             <template slot="product" slot-scope="text, record">
-              <div style="max-height:100px;overflow-y:scroll;" v-if="record.productThisList && record.productThisList.length>0">
+              <div style="max-height:110px;overflow-y:scroll;" v-if="record.productThisList && record.productThisList.length>0">
                 <a-tag style="margin-bottom:5px;" v-for="item in record.productThisList" :key="item.id">{{ item.productCode }}</a-tag>
               </div>
             </template>
@@ -123,7 +128,7 @@
             <!-- 产品分类 -->
             <template slot="productType" slot-scope="text, record">
               <div style="max-height:100px;overflow-y:scroll;" v-if="record.productTypeList && record.productTypeList.length>0">
-                <a-tag style="margin-bottom:5px;" v-for="item in record.productTypeList" :key="item.id">{{ item.productTypeName1 }}{{ item.productTypeName2?'/'+item.productTypeName2 :'' }}{{ item.productTypeName3?'/'+item.productTypeName3:'' }}</a-tag>
+                <a-tag style="margin-bottom:5px;" v-for="item in record.productTypeList" :key="item.id">{{ item.productTypeName3? item.productTypeName2+'/'+item.productTypeName3:(item.productTypeName2&&!item.productTypeName3)?item.productTypeName2:item.productTypeName1}}</a-tag>
               </div>
             </template>
             <!-- 品牌 -->
@@ -238,7 +243,7 @@ export default {
       return arr
     },
     perCentNum () {
-      return Math.floor(((this.form.giveAmount / this.form.regularAmount) * 100).toFixed(2)) + '%'
+      return Math.floor(((this.form.giveAmount / this.form.regularAmount) * 100).toFixed(2))
     }
   },
   methods: {

+ 10 - 8
src/views/promotionRulesManagement/dealerPromotions/editActiveEndTime.vue

@@ -20,10 +20,10 @@
           <div style="margin-left:40px;">确定要变更{{ form.name }}的促销时间吗?</div>
         </a-form-model-item>
         <a-form-model-item label="原结束日期" prop="time">
-          <span>{{ form.timeStart }}</span>
+          <span>{{ form.timeEnd }}</span>
         </a-form-model-item>
-        <a-form-model-item label="变更后结束日期" prop="timeEnd">
-          <a-date-picker style="width:90%" @change="onChange" :format="dateFormat"/>
+        <a-form-model-item label="变更后结束日期" prop="newTimeEnd">
+          <a-date-picker style="width:90%" @change="onChange" :format="dateFormat" :disabled-date="disabledDate"/>
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
@@ -57,11 +57,12 @@ export default {
       form: {
         name: '',
         timeStart: '',
-        timeEnd: ''
+        timeEnd: '',
+        newTimeEnd: ''
       },
       dateFormat: 'YYYY-MM-DD',
       rules: {
-        timeEnd: [
+        newTimeEnd: [
           { required: true, message: '请选择变更的结束时间', trigger: 'change' }
         ]
       }
@@ -69,14 +70,14 @@ export default {
   },
   methods: {
     onChange (date, dateString) {
-      this.form.timeEnd = dateString + ' 23:59:59'
+      this.form.newTimeEnd = dateString + ' 23:59:59'
     },
     //  保存
     handleSave () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          promotionDateModify({ promotionSn: _this.form.sn, promotionDateStart: _this.form.timeStart, promotionDateEnd: this.form.timeEnd }).then(res => {
+          promotionDateModify({ promotionSn: _this.form.sn, promotionDateStart: _this.form.timeStart, promotionDateEnd: _this.form.newTimeEnd }).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
               setTimeout(() => {
@@ -114,7 +115,8 @@ export default {
         this.form = {
           name: '',
           timeStart: '',
-          timeEnd: ''
+          timeEnd: '',
+          newTimeEnd: ''
         }
       }
     }

+ 8 - 9
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -88,11 +88,10 @@
         <!-- 发布状态 -->
         <template slot="releaseStatus" slot-scope="text, record">
           <a-switch
-            v-if="record.state === 'NOT_START'||record.state ==='RUNNING'||record.state ==='IS_OVER'"
             id="promotionList-enable"
             @change="changeStatus(record)"
+            :disabled="record.state!='NOT_START' && record.state!='RUNNING'"
             :checked="record.enabledFlag == 1 ? true : false"></a-switch>
-          <span v-else>--</span>
         </template>
         <!-- 操作 -->
         <!--  state 待提交:WAIT_SUBMIT 待审核:WAIT_AUDIT 未开始:NOT_START 进行中:RUNNING 审核不通过:AUDIT_REJECT 已结束:IS_OVER -->
@@ -215,13 +214,13 @@ 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: '14%', align: 'center' },
-        { title: '促销简称', dataIndex: 'description', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '15%', align: 'center' },
-        { title: '参与客户', scopedSlots: { customRender: 'joinCustomers' }, width: '12%', align: 'center', ellipsis: true },
-        { title: '促销描述', dataIndex: 'content', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '活动状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发布状态', scopedSlots: { customRender: 'releaseStatus' }, width: '9%', align: 'center', ellipsis: true },
+        { title: '促销名称', scopedSlots: { customRender: 'promotionName' }, width: '18%', align: 'center' },
+        { title: '促销简称', dataIndex: 'description', width: '14%', align: 'center', 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: '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' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 1 - 0
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -339,6 +339,7 @@ export default {
           const form = JSON.parse(JSON.stringify(_this.form))
           if (form.gateFlag == '1') {
             form.gateProductList = this.$refs.cillProduct.getResultVal()
+            form.gateAmount = form.gateType === 'RATIO_AMOUNT' ? form.gateAmount / 100 : form.gateAmount
           } else {
             form.gateProductList = []
             form.gateAmount = ''

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

@@ -44,13 +44,13 @@
               placeholder="请选择"
               allowClear></v-select>
             <div v-if="form.gateType==='RATIO_AMOUNT'">
-              购买门槛产品金额 <a-input-number v-model="form.gateAmount" :min="0" :max="100" size="small"/> %作为配额
+              购买门槛产品金额 <a-input-number v-model="form.gateAmount" oninput="value=value.replace(/^\./g, '0.').match(/\d+\.?\d{0,2}/)" :min="0" size="small"/> %作为配额
               <a-tooltip title="如:填写100%,则购买10000元门槛产品,可享受10000配额购买正价产品,根据门槛金额动态调整配额">
                 <a-icon type="question-circle" theme="filled" :style="{ fontSize: '14px', color: 'gray' }"/>
               </a-tooltip>
             </div>
             <div v-if="form.gateType==='MIN_AMOUNT'">
-              购买门槛产品满最低金额 <a-input-number v-model="form.gateAmount" :min="0" :max="999999" :precision="2" size="small"/> 不限制配额。
+              购买门槛产品满最低金额 <a-input-number v-model="form.gateAmount" :min="0" :max="999999" :precision="2" size="small"/>元,不限制配额。
             </div>
             <div class="ruleDescList" v-if="form.gateType==='FIXED_AMOUNT'">
               购买满
@@ -271,13 +271,13 @@ export default {
     }
   },
   methods: {
-    //满赠  同款    促销品与正品一致  默认是 可修改   
+    // 满赠  同款    促销品与正品一致  默认是 可修改
     //     不同款                   默认否 不可修改
-    handleFullGift(e){
-      if(e==='0'){
-        this.form.regularPromotionSameFlag='0'
-      }else{
-        this.form.regularPromotionSameFlag='1'
+    handleFullGift (e) {
+      if (e === '0') {
+        this.form.regularPromotionSameFlag = '0'
+      } else {
+        this.form.regularPromotionSameFlag = '1'
       }
     },
     // 导入

+ 8 - 9
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -1,13 +1,12 @@
 <template>
-  <a-modal
-    centered
-    class="promotionList-basicInfo-modal"
-    :footer="null"
-    :maskClosable="false"
+  <a-drawer
     title="规则设置"
-    v-model="isShow"
-    @cancel="isShow=false"
-    width="80%">
+    class="promotionList-basicInfo-modal"
+    placement="right"
+    :visible="isShow"
+    @close="isShow=false"
+    width="86%"
+  >
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
         id="promotionList-basicInfo-form"
@@ -159,7 +158,7 @@
       @ok="handleProductsOk" />
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" @close="closeGuideModel" @ok="hanldeOk" />
-  </a-modal>
+  </a-drawer>
 </template>
 
 <script>

+ 20 - 28
src/views/promotionRulesManagement/dealerPromotions/tableType1.vue

@@ -15,11 +15,11 @@
       <template slot="productType" slot-scope="text, record,index">
         <div style="max-height:126px;width:100%;overflow-y:scroll;" v-if="!record.productThisList || record.productThisList.length==0">
           <a-row v-if="record.productTypeArr && record.productTypeArr.length>0">
-            <a-col :span="16">
+            <a-col :span="18">
               <div v-for="con in record.productTypeArr" :key="con.id">
-                <a-tooltip v-if="con.title&&con.title.length > 6" :title="con.title">
+                <a-tooltip v-if="con.title&&con.title.length > 12" :title="con.title">
                   <a-tag style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,con,'typeList')">
-                    {{ `${con.title.slice(0, 6)}...` }}
+                    {{ `${con.title.slice(0, 12)}...` }}
                   </a-tag>
                 </a-tooltip>
                 <a-tag v-else style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,con,'typeList')">
@@ -27,23 +27,23 @@
                 </a-tag>
               </div>
             </a-col>
-            <a-col :span="4" style="text-align:right;">
+            <a-col :span="6" style="text-align:right;">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addClassifyTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
           <a-row v-else>
             <a-col :span="24">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addClassifyTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
         </div>
         <div v-else>
           <a-tag style="background: #fff; borderStyle: dashed;" :style="{color:'grey',cursor:'not-allowed'}">
-            <a-icon type="plus" /> 选择
+            <a-icon type="plus" />
           </a-tag>
         </div>
       </template>
@@ -51,36 +51,28 @@
       <template slot="productBrand" slot-scope="text, record,index">
         <div style="max-height:126px;overflow-y:scroll;" v-if="!record.productThisList || record.productThisList.length==0">
           <a-row v-if="record.productBrandArr && record.productBrandArr.length>0">
-            <a-col :span="16">
-              <div v-for="item in record.productBrandArr" :key="item.brandSn">
-                <a-tooltip v-if="item.brandName&&item.brandName.length > 6" :title="item.brandName">
-                  <a-tag style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
-                    {{ `${item.brandName.slice(0, 6)}...` }}
-                  </a-tag>
-                </a-tooltip>
-                <a-tag v-else style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
-                  {{ item.brandName }}
-                </a-tag>
-              </div>
+            <a-col :span="18">
+              <a-tag v-for="item in record.productBrandArr" :key="item.brandSn" style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
+                {{ item.brandName }}
+              </a-tag>
             </a-col>
-
-            <a-col :span="4" style="text-align:right;">
+            <a-col :span="6" style="text-align:right;">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addBrandTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
           <a-row v-else>
             <a-col :span="24">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addBrandTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
         </div>
         <div v-else>
           <a-tag style="background: #fff; borderStyle: dashed;" :style="{color:'grey',cursor:'not-allowed'}">
-            <a-icon type="plus" /> 选择
+            <a-icon type="plus" />
           </a-tag>
         </div>
       </template>
@@ -88,26 +80,26 @@
       <template slot="product" slot-scope="text, record,index">
         <div v-if="(record.productBrandArr && record.productBrandArr.length>0)||(record.productTypeArr && record.productTypeArr.length>0)">
           <a-tag style="background: #fff; borderStyle: dashed;" :style="{color:'grey',cursor:'not-allowed'}">
-            <a-icon type="plus" /> 选择
+            <a-icon type="plus" />
           </a-tag>
         </div>
         <div style="max-height:126px;overflow-y:scroll;" v-else>
           <a-row v-if="record.productThisList && record.productThisList.length>0">
-            <a-col :span="16">
+            <a-col :span="18">
               <a-tag style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'productList')" v-for="item in record.productThisList" :key="item.productSn">
                 {{ item.productCode }}
               </a-tag>
             </a-col>
-            <a-col :span="4" style="text-align:right;">
+            <a-col :span="6" style="text-align:right;">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addProductTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
           <a-row v-else>
             <a-col :span="24">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addProductTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>

+ 20 - 28
src/views/promotionRulesManagement/dealerPromotions/tableType2.vue

@@ -15,11 +15,11 @@
       <template slot="productType" slot-scope="text, record,index">
         <div style="max-height:126px;width:100%;overflow-y:scroll;" v-if="!record.productThisList || record.productThisList.length==0">
           <a-row v-if="record.productTypeArr && record.productTypeArr.length>0">
-            <a-col :span="16">
+            <a-col :span="18">
               <div v-for="con in record.productTypeArr" :key="con.id">
-                <a-tooltip v-if="con.title&&con.title.length > 6" :title="con.title">
+                <a-tooltip v-if="con.title&&con.title.length > 12" :title="con.title">
                   <a-tag style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,con,'typeList')">
-                    {{ `${con.title.slice(0, 6)}...` }}
+                    {{ `${con.title.slice(0, 12)}...` }}
                   </a-tag>
                 </a-tooltip>
                 <a-tag v-else style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,con,'typeList')">
@@ -27,23 +27,23 @@
                 </a-tag>
               </div>
             </a-col>
-            <a-col :span="4" style="text-align:right;">
+            <a-col :span="6" style="text-align:right;">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addClassifyTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
           <a-row v-else>
             <a-col :span="24">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addClassifyTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
         </div>
         <div v-else>
           <a-tag style="background: #fff; borderStyle: dashed;" :style="{color:'grey',cursor:'not-allowed'}">
-            <a-icon type="plus" /> 选择
+            <a-icon type="plus" />
           </a-tag>
         </div>
       </template>
@@ -51,36 +51,28 @@
       <template slot="productBrand" slot-scope="text, record,index">
         <div style="max-height:126px;overflow-y:scroll;" v-if="!record.productThisList || record.productThisList.length==0">
           <a-row v-if="record.productBrandArr && record.productBrandArr.length>0">
-            <a-col :span="16">
-              <div v-for="item in record.productBrandArr" :key="item.brandSn">
-                <a-tooltip v-if="item.brandName&&item.brandName.length > 6" :title="item.brandName">
-                  <a-tag style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
-                    {{ `${item.brandName.slice(0, 6)}...` }}
-                  </a-tag>
-                </a-tooltip>
-                <a-tag v-else style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
-                  {{ item.brandName }}
-                </a-tag>
-              </div>
+            <a-col :span="18">
+              <a-tag v-for="item in record.productBrandArr" :key="item.brandSn" style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'brandList')">
+                {{ item.brandName }}
+              </a-tag>
             </a-col>
-
-            <a-col :span="4" style="text-align:right;">
+            <a-col :span="6" style="text-align:right;">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addBrandTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
           <a-row v-else>
             <a-col :span="24">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addBrandTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
         </div>
         <div v-else>
           <a-tag style="background: #fff; borderStyle: dashed;" :style="{color:'grey',cursor:'not-allowed'}">
-            <a-icon type="plus" /> 选择
+            <a-icon type="plus" />
           </a-tag>
         </div>
       </template>
@@ -88,26 +80,26 @@
       <template slot="product" slot-scope="text, record,index">
         <div v-if="(record.productBrandArr && record.productBrandArr.length>0)||(record.productTypeArr && record.productTypeArr.length>0)">
           <a-tag style="background: #fff; borderStyle: dashed;" :style="{color:'grey',cursor:'not-allowed'}">
-            <a-icon type="plus" /> 选择
+            <a-icon type="plus" />
           </a-tag>
         </div>
         <div style="max-height:126px;overflow-y:scroll;" v-else>
           <a-row v-if="record.productThisList && record.productThisList.length>0">
-            <a-col :span="16">
+            <a-col :span="18">
               <a-tag style="margin-bottom:10px;" closable @close.prevent="delLabel(record.productScopeSn,item,'productList')" v-for="item in record.productThisList" :key="item.productSn">
                 {{ item.productCode }}
               </a-tag>
             </a-col>
-            <a-col :span="4" style="text-align:right;">
+            <a-col :span="6" style="text-align:right;">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addProductTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
           <a-row v-else>
             <a-col :span="24">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addProductTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>

+ 10 - 10
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -29,14 +29,14 @@
             </a-col>
             <a-col :span="4" style="text-align:right;">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addClassifyTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
           <a-row v-else>
             <a-col :span="24">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addClassifyTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
@@ -62,14 +62,14 @@
 
             <a-col :span="4" style="text-align:right;">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addBrandTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
           <a-row v-else>
             <a-col :span="24">
               <a-tag style="background: #fff; borderStyle: dashed;" @click="addBrandTag(index, record)" color="blue">
-                <a-icon type="plus" /> 选择
+                <a-icon type="plus" />
               </a-tag>
             </a-col>
           </a-row>
@@ -250,12 +250,12 @@ export default {
         { title: '产品分类', width: '11%', scopedSlots: { customRender: 'productType' }, align: 'center' },
         { title: '品牌', width: '11%', scopedSlots: { customRender: 'productBrand' }, align: 'center' },
         { title: '产品', scopedSlots: { customRender: 'product' }, width: '8%', align: 'center' },
-        { title: '省原价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '省特价', scopedSlots: { customRender: 'provincePrice' }, width: '6%', align: 'center' },
-        { title: '省折扣', scopedSlots: { customRender: 'provinceDiscount' }, width: '6%', align: 'center' },
-        { title: '市原价', dataIndex: 'cityPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '市特价', scopedSlots: { customRender: 'cityPrice' }, width: '6%', align: 'center' },
-        { title: '市折扣', scopedSlots: { customRender: 'cityDiscount' }, width: '6%', align: 'center' },
+        { title: '省原价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '省特价', scopedSlots: { customRender: 'provincePrice' }, width: '6%', align: 'center' },
+        { title: '省折扣', scopedSlots: { customRender: 'provinceDiscount' }, width: '6%', align: 'center' },
+        { title: '市原价', dataIndex: 'cityPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '市特价', scopedSlots: { customRender: 'cityPrice' }, width: '6%', align: 'center' },
+        { title: '市折扣', scopedSlots: { customRender: 'cityDiscount' }, width: '6%', align: 'center' },
         { title: '特约原价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '特约特价', scopedSlots: { customRender: 'specialPrice' }, width: '6%', align: 'center' },
         { title: '特约折扣', scopedSlots: { customRender: 'specialDiscount' }, width: '6%', align: 'center' },