chenrui 1 år sedan
förälder
incheckning
56153d713f

+ 0 - 2
src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue

@@ -181,7 +181,6 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.productType = []
-      this.chooseData = []
     },
     //  重置
     resetSearchForm () {
@@ -225,7 +224,6 @@ export default {
         let selectedRows = []
         const selectedRowKeys = []
         selectedRows = _this.chooseData
-        console.log('11111111111111', _this.chooseData)
         _this.chooseData.map(item => {
           selectedRowKeys.push(item.goodsSn)
         })

+ 3 - 14
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -61,13 +61,7 @@
             </div>
           </div>
         </a-form-model-item>
-        <a-form-model-item prop="minOrderFlag">
-          <span slot="label">
-            <a-tooltip title="What do you want others to call you?">
-              <a-icon type="info-circle" />
-            </a-tooltip>
-            订单起订金额
-          </span>
+        <a-form-model-item prop="minOrderFlag" label="订单起订金额">
           <a-select default-value="1" v-model="form.minOrderFlag" style="width: 160px" size="small">
             <a-select-option value="0">
               不限
@@ -87,13 +81,7 @@
             :precision="2"
             placeholder="请输入金额"/>
         </a-form-model-item>
-        <a-form-model-item prop="upperLimitFlag">
-          <span slot="label">
-            <a-tooltip title="What do you want others to call you?">
-              <a-icon type="info-circle" />
-            </a-tooltip>
-            活动经费上限
-          </span>
+        <a-form-model-item prop="upperLimitFlag" label="活动经费上限">
           <a-select default-value="1" v-model="form.upperLimitFlag" style="width: 160px" size="small">
             <a-select-option value="0">
               不限
@@ -471,6 +459,7 @@ export default {
     },
     // 打开新增产品弹窗(禁用已选)
     addProducts () {
+      this.chooseProducts = []
       this.openProductsModal = true
       const dataList = this.setShowData('This')
       this.$refs.productBox.handleDisabled(dataList)

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

@@ -101,7 +101,7 @@
       <template slot="provinceDiscount" slot-scope="text, record">
         <div v-if="record.dataSourceOrigin=='0'">
           <a-input-number
-            style="width:90%;"
+            style="width:80%;"
             size="small"
             v-model="record.provinceDiscountRate"
             :min="0"
@@ -109,9 +109,9 @@
             :max="999999"
             :precision="2"
             placeholder="请输入"
-          />
+          />%
         </div>
-        <span v-else>{{ record.provinceDiscountRate?record.provinceDiscountRate+'%':'--' }}</span>
+        <span v-else>{{ (record.provinceDiscountRate||record.provinceDiscountRate==0)?record.provinceDiscountRate+'%':'--' }}</span>
       </template>
       <!-- 市价特价 -->
       <template slot="cityPrice" slot-scope="text, record">
@@ -134,15 +134,15 @@
         <div v-if="record.dataSourceOrigin=='0'">
           <a-input-number
             size="small"
-            style="width:90%;"
+            style="width:80%;"
             v-model="record.cityDiscountRate"
             :min="0"
             :step="1"
             :max="999999"
             :precision="2"
-            placeholder="请输入"/>
+            placeholder="请输入"/>%
         </div>
-        <span v-else>{{ record.cityDiscountRate?record.cityDiscountRate+'%':'--' }}</span>
+        <span v-else>{{ (record.cityDiscountRate||record.cityDiscountRate==0)?record.cityDiscountRate+'%':'--' }}</span>
       </template>
       <!-- 特约特价 -->
       <template slot="specialPrice" slot-scope="text, record">
@@ -165,15 +165,15 @@
         <div v-if="record.dataSourceOrigin=='0'">
           <a-input-number
             size="small"
-            style="width:90%;"
+            style="width:80%;"
             v-model="record.specialDiscountRate"
             :min="0"
             :step="1"
             :precision="2"
             :max="999999"
-            placeholder="请输入"/>
+            placeholder="请输入"/>%
         </div>
-        <span v-else>{{ record.specialDiscountRate ? record.specialDiscountRate+'%':'--' }}</span>
+        <span v-else>{{ (record.specialDiscountRate||record.specialDiscountRate==0) ? record.specialDiscountRate+'%':'--' }}</span>
       </template>
       <!-- 设置起订量 -->
       <template slot="setNum" slot-scope="text, record">
@@ -253,13 +253,13 @@ export default {
         { title: '产品', scopedSlots: { customRender: 'product' }, width: '10%', align: 'center' },
         { title: '省级原价', dataIndex: 'provincePrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '省级特价', scopedSlots: { customRender: 'provincePrice' }, width: '5%', align: 'center' },
-        { title: '省级折扣(%)', scopedSlots: { customRender: 'provinceDiscount' }, width: '5%', align: 'center' },
+        { title: '省级折扣', scopedSlots: { customRender: 'provinceDiscount' }, width: '5%', align: 'center' },
         { title: '市级原价', dataIndex: 'cityPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '市级特价', scopedSlots: { customRender: 'cityPrice' }, width: '5%', align: 'center' },
-        { title: '市级折扣(%)', scopedSlots: { customRender: 'cityDiscount' }, width: '5%', align: 'center' },
+        { title: '市级折扣', scopedSlots: { customRender: 'cityDiscount' }, width: '5%', align: 'center' },
         { title: '特约原价', dataIndex: 'specialPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '特约特价', scopedSlots: { customRender: 'specialPrice' }, width: '5%', align: 'center' },
-        { title: '特约折扣(%)', scopedSlots: { customRender: 'specialDiscount' }, width: '5%', align: 'center' },
+        { title: '特约折扣', scopedSlots: { customRender: 'specialDiscount' }, width: '5%', align: 'center' },
         { title: '设置起订量', width: '7%', scopedSlots: { customRender: 'setNum' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ],