Jelajahi Sumber

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

lilei 10 bulan lalu
induk
melakukan
e0298c2ea4

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

@@ -3319,8 +3319,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '促销活动',
-              icon: 'contacts'
-              // permission: 'M_promotionInfoList'
+              icon: 'contacts',
+              permission: 'M_promotionInfoList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -3331,8 +3331,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '促销活动列表',
                   icon: 'contacts',
-                  hidden: true
-                  // permission: 'M_promotionInfoList'
+                  hidden: true,
+                  permission: 'M_promotionInfoList'
                 }
               },
               {
@@ -3342,8 +3342,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '编辑促销',
                   icon: 'contacts',
-                  hidden: true
-                  // permission: 'M_promotionInfoEdit'
+                  hidden: true,
+                  permission: 'M_promotionInfoEdit'
                 }
               }
             ]
@@ -3355,8 +3355,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '优惠券详情',
-              icon: 'contacts'
-              // permission: 'M_couponDetailsList'
+              icon: 'contacts',
+              permission: 'M_couponDetailsList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -3367,8 +3367,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '优惠券详情',
                   icon: 'contacts',
-                  hidden: true
-                  // permission: 'M_couponDetailsList'
+                  hidden: true,
+                  permission: 'M_couponDetailsList'
                 }
               }
             ]

+ 1 - 1
src/views/promotionManagement/couponDetails/list.vue

@@ -56,7 +56,7 @@
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
-            v-if="record.ticketState==='UNUSED'"
+            v-if="record.ticketState==='UNUSED'&&$hasPermissions('B_checkTicketBtn')"
             type="link"
             class="button-success"
             @click="handleWriteoff(record)"

+ 3 - 9
src/views/promotionManagement/promotionInfo/detailModal.vue

@@ -92,12 +92,6 @@
             <a-form-model-item label="使用说明" prop="ruleExplain" >
               {{ form.promoRule&&form.promoRule.ruleExplain?form.promoRule.ruleExplain:'--' }}
             </a-form-model-item>
-            <a-form-model-item label="加盟商编辑" prop="dealerEditFlag" >
-              {{ form.dealerEditFlag?form.dealerEditFlag==='1'?'是':'否':'--' }}
-            </a-form-model-item>
-            <a-form-model-item label="是否发布" prop="publishFlag" >
-              {{ form.publishFlag?form.publishFlag==='1'?'是':'否':'--' }}
-            </a-form-model-item>
             <a-form-model-item label="产品范围" prop="productRangeList" >
               <div v-if="productRangeList&&productRangeList.length>0">
                 <a-tree-select
@@ -197,12 +191,12 @@ export default {
       imageSet: [],
       columns: [
         { 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: '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: '12%', 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: '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) : '--') } }
       ],
       rules: {
         title: [{ required: true, message: '请输入标题名称', trigger: 'blur' }],

+ 4 - 4
src/views/promotionManagement/promotionInfo/list.vue

@@ -95,26 +95,26 @@
             type="link"
             class="button-primary"
             @click="handleOpen(record)"
-            v-if="record.dealerEditFlag==='1'&&(record.dealerPublishState=='UNPUBLISH'||record.dealerPublishState=='CLOSE')"
+            v-if="record.dealerEditFlag==='1'&&(record.dealerPublishState=='UNPUBLISH'||record.dealerPublishState=='CLOSE')&&$hasPermissions('B_publishActiveBtn')"
             id="productOnlineInfoList-detail-btn">开启</a-button>
           <a-button
             size="small"
             type="link"
             class="button-primary"
-            v-if="record.dealerEditFlag==='1'&&record.dealerPublishState=='PUBLISH'"
+            v-if="record.dealerEditFlag==='1'&&record.dealerPublishState=='PUBLISH'&&$hasPermissions('B_closeActiveBtn')"
             @click="handleClose(record)"
             id="productOnlineInfoList-detail-btn">关闭</a-button>
           <a-button
             size="small"
             type="link"
             class="button-primary"
-            v-if="record.dealerEditFlag==='1'&&record.dealerPublishState!='END'"
+            v-if="record.dealerEditFlag==='1'&&record.dealerPublishState!='END'&&$hasPermissions('B_promoActiveEditBtn')"
             @click="handleEdit(record,'edit')">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-success"
-            v-if="record.dealerPublishState!='END'"
+            v-if="record.dealerPublishState!='END'&&$hasPermissions('B_promoActiveSeeBtn')"
             @click="handleSee(record)">查看</a-button>
         </template>
       </s-table>

+ 1 - 1
src/views/promotionManagement/promotionInfo/productTable.vue

@@ -102,7 +102,7 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              if (!data.list[i].price) {
+              if (!data.list[i].price && data.list[i].price != 0) {
                 data.list[i].price = data.list[i].terminalPrice
               } else {
                 data.list[i].price = data.list[i].price