Просмотр исходного кода

Merge branch 'develop_yh44' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh44

lilei 10 месяцев назад
Родитель
Сommit
b86967af77

+ 2 - 2
src/views/promotionManagement/promotionInfo/chooseProductsModal.vue

@@ -170,8 +170,8 @@ export default {
         // { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '品牌', dataIndex: 'productBrandName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
-        { title: '包装数', scopedSlots: { customRender: 'productQty' }, align: 'center' },
-        { title: '单位', dataIndex: 'unit', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } }
+        { title: '包装数', scopedSlots: { customRender: 'productQty' }, width: '10%', align: 'center' },
+        { title: '单位', dataIndex: 'unit', align: 'center', width: '10%', ellipsis: true, customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 5 - 5
src/views/promotionManagement/promotionInfo/detailModal.vue

@@ -83,8 +83,8 @@
               <span>
                 {{ form.promoRule&&form.promoRule.validType?form.promoRule.validType==='FIXED'?'固定日期':'领取后,立即生效,':'--' }}
               </span>
-              <span class="timeBox" v-if="form.promoRule.validType==='FIXED'">{{ form.promoRule.validStartDate }}~{{ form.promoRule.validEndDate }}</span>
-              <span class="timeBox" v-else>有效期{{ form.promoRule.validDays }}天</span>
+              <span class="timeBox" v-if="form.promoRule&&form.promoRule.validType&&form.promoRule.validType==='FIXED'">{{ form.promoRule.validStartDate }}~{{ form.promoRule.validEndDate }}</span>
+              <span class="timeBox" v-else>有效期{{ form.promoRule&&form.promoRule.validDays?form.promoRule.validDays:'--' }}天</span>
             </a-form-model-item>
             <a-form-model-item label="券适用范围" prop="range" >
               全部产品
@@ -194,9 +194,9 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '活动价', dataIndex: 'price', width: '12%', align: 'center', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } },
-        { title: '返券金额', dataIndex: 'ruleValue', width: '12%', align: 'center', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } },
-        { title: '参考终端价', dataIndex: 'terminalPrice', width: '10%', align: 'center', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } }
+        { title: '活动价', dataIndex: 'price', width: '12%', align: 'right', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } },
+        { title: '返券金额', dataIndex: 'ruleValue', width: '12%', align: 'right', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } },
+        { title: '参考终端价', dataIndex: 'terminalPrice', width: '10%', align: 'right', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } }
       ],
       rules: {
         title: [{ required: true, message: '请输入标题名称', trigger: 'blur' }],