chenrui hace 1 año
padre
commit
91def8e421

+ 1 - 1
src/api/reportData.js

@@ -1269,7 +1269,7 @@ export const brandTypeReportCount = (params) => {
 // 促销销售单报表(统计)  导出
 export const brandTypeReportExport = (params) => {
   return axios({
-    url: '/report/brandTypeReport/excelTireOnlineList ',
+    url: '/report/brandTypeReport/excelTireOnlineList',
     data: params,
     method: 'post',
     responseType: 'blob',

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

@@ -1863,8 +1863,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '促销销售单报表(统计)',
-              icon: 'profile'
-              // permission: 'M_promotionSalesOrderReportList'
+              icon: 'profile',
+              permission: 'M_promotionSalesOrderReport'
             },
             hideChildrenInMenu: true,
             children: [{
@@ -1874,8 +1874,8 @@ export const asyncRouterMap = [
               meta: {
                 title: '促销销售单报表(统计)',
                 icon: 'profile',
-                hidden: true
-                // permission: 'M_promotionSalesOrderReportList'
+                hidden: true,
+                permission: 'M_promotionSalesOrderReportList'
               }
             }]
           },

+ 1 - 1
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -305,7 +305,7 @@ export default {
         { title: '费用承担金额', dataIndex: 'splitAmount', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '费用承担人', dataIndex: 'childSplitObjName', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '人员平摊费用', dataIndex: 'childSplitAmount', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '备注', dataIndex: ' remarks', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '备注', dataIndex: 'remarks', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
     }
   },

+ 9 - 9
src/views/reportData/promotionSalesOrderReport/list.vue

@@ -94,7 +94,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_salesSlip_report')"
+                v-if="$hasPermissions('B_brandTypeReportExport')"
                 id="promotionSalesList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
@@ -148,9 +148,9 @@
                   <a-col
                     span="4">未参与活动销售额:{{ (totalData.notpromotionSale || totalData.notpromotionSale==0) ? toThousands(totalData.notpromotionSale) : '--' }}</a-col>
                   <a-col
-                    span="4">调拨物料成本费用:{{ (totalData.allocateAmount || totalData.allocateAmount==0) ? toThousands(totalData.allocateAmount) : '--' }}</a-col>
+                    span="4">调拨物料成本费用:{{ (totalData.allocateCost || totalData.allocateCost==0) ? toThousands(totalData.allocateCost) : '--' }}</a-col>
                   <a-col
-                    span="4">调拨物料销售费用:{{ (totalData.allocateAmount || totalData.allocateAmount==0) ? toThousands(totalData.allocateAmount) : '--' }}</a-col>
+                    span="4">调拨物料销售费用:{{ (totalData.allocateSaleAmount || totalData.allocateSaleAmount==0) ? toThousands(totalData.allocateSaleAmount) : '--' }}</a-col>
                   <a-col
                     span="4">促销成本费用+物料成本费用合计:{{ (totalData.promoCostFeeAndAllocateCost || totalData.promoCostFeeAndAllocateCost==0)? toThousands(totalData.promoCostFeeAndAllocateCost) : '--' }}</a-col>
                   <a-col
@@ -230,8 +230,8 @@ export default {
         { title: '促销销售费用比', dataIndex: 'promoSaleFeeRate', width: '96px', align: 'right', customRender: text => (text ? this.toThousands(text * 100) + '%' : '--') },
         { title: '参与活动销售额', dataIndex: 'promoSaleAmount', width: '96px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '未参与活动销售额', dataIndex: 'notpromotionSale', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
-        { title: '调拨物料成本费用', dataIndex: 'allocateAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
-        { title: '调拨物料销售费用', dataIndex: 'allocateAmount1', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '调拨物料成本费用', dataIndex: 'allocateCost', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '调拨物料销售费用', dataIndex: 'allocateSaleAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '促销成本费用+物料成本费用合计', dataIndex: 'promoCostFeeAndAllocateCost', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '成本合计占比', dataIndex: 'totalCostRate', width: '90px', align: 'right', customRender: text => (text ? this.toThousands(text * 100) + '%' : '--') },
         { title: '促销销售费用+物料销售费用合计', dataIndex: 'promoSaleFeeAndAllocateAmount', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
@@ -287,14 +287,14 @@ export default {
   methods: {
     // 统计月份  选择月份限制
     disabledStartDate (startValue) {
-      const endValue = this.endValue
+      const endValue = typeof (this.endValue) === 'string' ? this.moment().endOf('month') : this.endValue
       if (!startValue || !endValue) {
         return startValue.valueOf() > this.moment().month(this.moment().month()).valueOf()
       }
       return startValue.valueOf() >= endValue.valueOf()
     },
     disabledEndDate (endValue) {
-      const startValue = this.startValue
+      const startValue = typeof (this.startValue) === 'string' ? this.moment().startOf('month') : this.startValue
       if (!startValue) {
         return endValue.valueOf() > this.moment().month(this.moment().month()).valueOf()
       }
@@ -348,7 +348,7 @@ export default {
     },
     handleSearch () {
       const _this = this
-      if (!_this.form.monthInfo[0] || !_this.monthInfo.time[1]) {
+      if (!_this.form.monthInfo[0] || !_this.form.monthInfo[1]) {
         _this.$message.error('请选择统计月份')
         return
       }
@@ -399,7 +399,7 @@ export default {
       }
       this.$refs.subarea.clearData()
       this.$refs.ruleForm.resetFields()
-      this.$refs.table.clearTable()
+      this.$refs.table.refresh()
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight