chenrui 11 miesięcy temu
rodzic
commit
e40c597bbb

+ 4 - 4
src/config/router.config.js

@@ -3437,8 +3437,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '新增修理厂促销',
                   icon: 'file-ppt',
-                  hidden: true
-                  // permission: 'B_promotionManagementAdd'
+                  hidden: true,
+                  permission: 'B_promotionManagementAdd'
                 }
               },
               {
@@ -3448,8 +3448,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '编辑修理厂促销',
                   icon: 'file-ppt',
-                  hidden: true
-                  // permission: 'B_promotionManagementEdit'
+                  hidden: true,
+                  permission: 'B_promotionManagementEdit'
                 }
               }
             ]

+ 6 - 6
src/views/promotionRulesManagement/promotionManagement/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" >
               全部产品
@@ -199,10 +199,10 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '12%', 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: '12%', 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: '12%', align: 'center', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } }
+        { title: '原厂编码', dataIndex: 'origCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '活动价', dataIndex: 'price', width: '10%', align: 'right', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } },
+        { title: '返券金额', dataIndex: 'ruleValue', width: '10%', 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' }],

+ 2 - 2
src/views/promotionRulesManagement/promotionManagement/list.vue

@@ -97,7 +97,7 @@
                 type="link"
                 class="button-warning"
                 @click="promotionEdit(record)"
-                v-if="(record.publishState=='UNPUBLISH' || record.publishState=='CLOSE') && $hasPermissions('B_promotionManagementAdd')"
+                v-if="(record.publishState=='UNPUBLISH' || record.publishState=='CLOSE') && $hasPermissions('B_promotionManagementEdit')"
                 id="promotion-edit-btn">编辑</a-button>
               <a-button
                 size="small"
@@ -111,7 +111,7 @@
                 type="link"
                 class="button-success"
                 @click="handleSee(record)"
-                v-if="(record.publishState=='PUBLISH')&&$hasPermissions('B_promotionManagementContent')"
+                v-if="(record.publishState=='PUBLISH')&&$hasPermissions('B_promotionManagementDetail')"
                 id="promotion-modify-btn">查看</a-button>
               <a-button
                 size="small"