lilei 1 month ago
parent
commit
10cf72f9eb

+ 4 - 2
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -317,7 +317,7 @@ export default {
       var arr = []
       if (_this.form.discountType === '1') {
         arr = [
-          { title: '特价产品原价金额', dataIndex: 'orginAmountValue', width: '25%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+          { title: '特价产品原价金额', dataIndex: 'orginAmountValue', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '省价折扣', dataIndex: 'provinceValue', width: '25%', align: 'center', customRender: function (text) { return (text ? (text.toFixed(2) + '%') : '--') } },
           { title: '市价折扣', dataIndex: 'cityValue', width: '25%', align: 'center', customRender: function (text) { return (text ? (text.toFixed(2) + '%') : '--') } },
           { title: '特约折扣', dataIndex: 'specialValue', width: '25%', align: 'center', customRender: function (text) { return (text ? (text.toFixed(2) + '%') : '--') } }
@@ -410,9 +410,11 @@ export default {
           // 阶梯
           if (resultObj.discountType != '0') {
             if (resultObj.discountType == '1' && resultObj.specialDiscountList) {
+              const utd = { 'YUAN': '元', 'GE': '个' }
               this.setTableData = resultObj.specialDiscountList.map(item => {
                 return {
-                  orginAmountValue: item.discountScopePrice,
+                  orginAmountValue: this.toThousands(item.discountScopeValue) + ' ' + utd[item.unitType],
+                  unitType: item.unitType,
                   provinceValue: item.provinceDiscountRate,
                   cityValue: item.cityDiscountRate,
                   specialValue: item.specialDiscountRate,

+ 31 - 12
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -214,15 +214,21 @@
                 placeholder="请输入"
                 @blur="handleSpecialPrice"/>
             </template>
-            <template slot="orginAmount" slot-scope="text, record">
-              <a-input-number
-                size="small"
-                :id="'promotionList-orginAmountValue'+record.id"
-                v-model="record.orginAmountValue"
-                :min="0"
-                :precision="2"
-                :max="99999999"
-                placeholder="请输入"/>
+            <template slot="orginAmount" slot-scope="text, record, index">
+              <div style="display:flex;align-items: center;">
+                <a-input-number
+                  size="small"
+                  :id="'promotionList-orginAmountValue'+record.id"
+                  v-model="record.orginAmountValue"
+                  :min="0"
+                  :precision="2"
+                  :max="99999999"
+                  placeholder="请输入"/>
+                <a-select size="small" style="width:50px;" v-model="record.unitType" @change="changeUnitType(index)" :disabled="index>0">
+                  <a-select-option value="YUAN">元</a-select-option>
+                  <a-select-option value="GE">个</a-select-option>
+                </a-select>
+              </div>
             </template>
             <template slot="actions" slot-scope="text, record, index">
               <a-button v-if="index==0" size="small" type="link" class="button-info" @click="addTableData"><a-icon type="plus"/>新增</a-button>
@@ -407,12 +413,20 @@ export default {
     handleSpecialPrice (e) {
       this.setTableData[0].specialValue = Number(e.target.value)
     },
+    changeUnitType () {
+      const ut = this.setTableData[0].unitType
+      this.setTableData = this.setTableData.map(item => {
+        item.unitType = ut
+        return item
+      })
+    },
     // 特价规则切换时清空数据
     handleDiscountType (val) {
       this.form.discountType = val
       this.$refs.specialProduct.reSetTableData()
       this.setTableData = [{
         orginAmountValue: 0,
+        unitType: 'YUAN',
         provinceValue: undefined,
         cityValue: undefined,
         specialValue: undefined
@@ -457,8 +471,10 @@ export default {
         this.$message.warning('最多只能添加5条!')
         return
       }
+      const ut = this.setTableData[0].unitType
       this.setTableData.push({
         orginAmountValue: 0,
+        unitType: ut,
         provinceValue: undefined,
         cityValue: undefined,
         specialValue: undefined
@@ -543,7 +559,8 @@ export default {
             form.specialDiscountList = _this.setTableData.map((item, index) => {
               return {
                 scopeLevel: index + 1,
-                discountScopePrice: item.orginAmountValue,
+                unitType: item.unitType,
+                discountScopeValue: item.orginAmountValue,
                 provinceDiscountRate: item.provinceValue,
                 cityDiscountRate: item.cityValue,
                 specialDiscountRate: item.specialValue
@@ -569,7 +586,8 @@ export default {
           } else if (form.discountType == '1') {
             infoDetail += '各级别价打折;'
             form.specialDiscountList.forEach(item => {
-              infoDetail += '阶梯' + item.scopeLevel + ':' + '原价:' + item.discountScopePrice + ',省级折扣' + item.provinceDiscountRate + '%,市级折扣' + item.cityDiscountRate + '%,特约折扣' + item.specialDiscountRate + '%;'
+              const utd = { 'YUAN': '元', 'GE': '个' }
+              infoDetail += '阶梯' + item.scopeLevel + ':' + '原价:' + item.discountScopeValue + utd[item.unitType] + ',省级折扣' + item.provinceDiscountRate + '%,市级折扣' + item.cityDiscountRate + '%,特约折扣' + item.specialDiscountRate + '%;'
             })
           } else {
             infoDetail += '各级别价直降;省级直降' + form.provinceValue.toFixed(2) + ',市级直降' + form.cityValue.toFixed(2) + ',特约直降' + form.specialValue.toFixed(2)
@@ -670,7 +688,8 @@ export default {
             if (resultObj.discountType == '1' && resultObj.specialDiscountList) {
               _this.setTableData = resultObj.specialDiscountList.map(item => {
                 return {
-                  orginAmountValue: item.discountScopePrice,
+                  orginAmountValue: item.discountScopeValue,
+                  unitType: item.unitType,
                   provinceValue: item.provinceDiscountRate,
                   cityValue: item.cityDiscountRate,
                   specialValue: item.specialDiscountRate,