lilei 2 سال پیش
والد
کامیت
079f59b825
39فایلهای تغییر یافته به همراه106 افزوده شده و 57 حذف شده
  1. 1 0
      src/config/router.config.js
  2. 1 0
      src/utils/util.js
  3. 2 1
      src/views/allocationManagement/matchSendOutOrder/list.vue
  4. 15 5
      src/views/allocationManagement/transferOut/detail.vue
  5. 3 10
      src/views/allocationManagement/transferOut/edit.vue
  6. 4 5
      src/views/allocationManagement/transferOut/list.vue
  7. 11 0
      src/views/allocationManagement/transferOut/printModal.vue
  8. 6 3
      src/views/allocationManagement/transferReturn/print.vue
  9. 1 0
      src/views/allocationManagement/transferReturn/printModal.vue
  10. 6 3
      src/views/allocationManagement/transfersPrint/list.vue
  11. 2 0
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  12. 2 0
      src/views/reportData/actualSalesReport/list.vue
  13. 2 0
      src/views/reportData/allCountryCostReport/list.vue
  14. 2 3
      src/views/reportData/allocationDetails/list.vue
  15. 2 0
      src/views/reportData/allocationPresentation/list.vue
  16. 2 0
      src/views/reportData/billingBackReport/list.vue
  17. 2 0
      src/views/reportData/billingOrderReport/list.vue
  18. 2 0
      src/views/reportData/billingReturnReport/list.vue
  19. 2 0
      src/views/reportData/expenseAccountReport/bearerList.vue
  20. 2 0
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  21. 2 0
      src/views/reportData/priceDifferenceDetailReport/list.vue
  22. 0 1
      src/views/reportData/receivedSendStorageReport/index.vue
  23. 2 1
      src/views/reportData/regionTypeSalesReport/list.vue
  24. 2 0
      src/views/reportData/returnGoodsPresentation/list.vue
  25. 2 0
      src/views/reportData/returnSlipReport/list.vue
  26. 2 0
      src/views/reportData/salesAmountReport/list.vue
  27. 2 5
      src/views/reportData/salesDetails/list.vue
  28. 2 5
      src/views/reportData/salesOrderTotal/list.vue
  29. 2 0
      src/views/reportData/salesPresentation/list.vue
  30. 2 2
      src/views/reportData/salesReturnDetailReport/list.vue
  31. 2 0
      src/views/reportData/salesReturnReport/list.vue
  32. 2 5
      src/views/reportData/salesReturnsReport/list.vue
  33. 2 0
      src/views/reportData/salesSlipReport/list.vue
  34. 2 2
      src/views/reportData/transferReturnDetailReport/list.vue
  35. 2 2
      src/views/reportData/transferReturnReport/list.vue
  36. 2 1
      src/views/reportData/urchaseDetailReturn/detailList.vue
  37. 2 1
      src/views/reportData/urchaseReturn/list.vue
  38. 2 1
      src/views/reportData/warehousingOrder/list.vue
  39. 2 1
      src/views/reportData/warehousingOrderDetail/list.vue

+ 1 - 0
src/config/router.config.js

@@ -1454,6 +1454,7 @@ export const asyncRouterMap = [
                   title: '调拨单详情',
                   icon: 'pull-request',
                   hidden: true,
+                  replaceTab: true,
                   permission: 'M_transferOut_detail'
                 }
               }

+ 1 - 0
src/utils/util.js

@@ -113,6 +113,7 @@ export function getAuthPriceCode (config, router, store) {
     const authNode = treeFind(authTree,(item)=>item.code == authCode)
     console.log(authNode)
     const hasReqUrl = authNode.permission.split(',').find(item => url.replace(/\//g,'_').indexOf(item)>=0)
+    
     if(hasReqUrl&&authNode.children&&authNode.children.length){
       return hasPriceAuth(authNode.children,priceOptions)
     }

+ 2 - 1
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -218,7 +218,8 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      if (this.$hasPermissions('M_transferOut_detail')) {
+      if (this.$hasPermissions('M_mso_detail')) {
+        this.$store.state.app.curActionPermission = 'M_mso_detail'
         this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.allocateSn}` })
       }
     },

+ 15 - 5
src/views/allocationManagement/transferOut/detail.vue

@@ -208,7 +208,15 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/transferOut/list', query: { closeLastOldTab: true } })
+      if(this.$store.state.app.curActionPermission == 'M_tfoPrint_detail'){
+        this.$router.push({ name: 'transfersPrintList', query: { closeLastOldTab: true } })
+      }
+      else if(this.$store.state.app.curActionPermission == 'M_mso_detail'){
+        this.$router.push({ name: 'matchSendOutOrderAllocationList', query: { closeLastOldTab: true } })
+      }
+      else{
+        this.$router.push({ name: 'transferOutList', query: { closeLastOldTab: true } })
+      }
     },
     // 基本信息
     getDetail () {
@@ -245,10 +253,9 @@ export default {
       const filename = this.nowType == 'dbflExport' ? '调拨分类' : '调拨'
       this.spinning = true
       const params = { allocateSn: this.outBizSn || this.$route.params.sn, ...data }
-      params.showCostFlag = this.$hasPermissions('B_transferOut_export_costPrice')
-      params.showAmountFlag = this.$hasPermissions('B_transferOut_export_salesPrice')
       exportExcel(allocateBillDetailExcel, params, filename, function () {
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     // 打印成功
@@ -263,9 +270,9 @@ export default {
         params,
         objs.isPreview ? 'preview' : 'print',
         taskName,
-        (res) => {
-          _this.$message.info(res.message)
+        () => {
           _this.spinning = false
+          _this.$store.state.app.curActionPermission = ''
         },
         {
           billType: 'ALLOCATE',
@@ -291,6 +298,9 @@ export default {
       this.pageInit()
     }
   },
+  deactivated(){
+    this.$store.state.app.curActionPermission = ''
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {})
   }

+ 3 - 10
src/views/allocationManagement/transferOut/edit.vue

@@ -741,13 +741,10 @@ export default {
       const _this = this
       this.spinning = true
       const params = { allocateSn: this.outBizSn || this.$route.params.sn, printType: printType, ...data }
-      if(printType == 'ALLOCATE_BILL'){
-        params.showCostFlag = this.$hasPermissions('M_transferOut_edit_costPrice')
-        params.showAmountFlag = this.$hasPermissions('M_transferOut_edit_salesPrice')
-      }
       
       exportExcel(allocateBillDetailExcel, params, filename, function () {
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     exportFl (data) {
@@ -762,20 +759,16 @@ export default {
       const _this = this
       const params = JSON.parse(JSON.stringify(objs))
       delete params.type
-      _this.spinning = true
       const taskName = this.nowType == 'dbPrint' ? '调拨' : '调拨分类'
-      if(this.nowType == 'dbPrint'){
-        params.showCostFlag = this.$hasPermissions('B_transferOut_print_costPrice')
-        params.showAmountFlag = this.$hasPermissions('B_transferOut_print_salesPrice')
-      }
+      _this.spinning = true
       printFun(
         allocateBillDetailPrint,
         params,
         objs.isPreview ? 'preview' : 'print',
         taskName,
         (res) => {
-          _this.$message.info(res.message)
           _this.spinning = false
+          _this.$store.state.app.curActionPermission = ''
         },
         {
           billType: 'ALLOCATE',

+ 4 - 5
src/views/allocationManagement/transferOut/list.vue

@@ -258,8 +258,8 @@ export default {
         { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '6%' },
         { title: '调往对象', dataIndex: 'targetName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '发货说明', dataIndex: 'sendNo', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--'} },
+        { title: '发货说明', dataIndex: 'remarks', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -406,15 +406,14 @@ export default {
     //  导出
     handleExport () {
       const _this = this
+      this.$store.state.app.curActionPermission = 'B_transferOut_export'
       const params = this.queryParam
-      params.showCostFlag = this.$hasPermissions('B_transferOut_export_costPrice')
-      params.showAmountFlag = this.$hasPermissions('B_transferOut_export_salesPrice')
-
       this.exportLoading = true
       this.spinning = true
       hdExportExcel(allocateBillExport, params, '调拨列表', function () {
         _this.exportLoading = false
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     pageInit () {

+ 11 - 0
src/views/allocationManagement/transferOut/printModal.vue

@@ -134,6 +134,17 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          let authCode = ''
+          if (this.nowType == 'dbPrint') {
+            authCode = 'B_transferOut_print'
+          } else if (this.nowType == 'dbflPrint') {
+            authCode = 'B_transferOutType_print'
+          } else if (this.nowType == 'dbflExport') {
+            authCode = 'B_transferOutType_export'
+          } else if (this.nowType == 'dbExport') {
+            authCode = 'B_transferOut_detail_export'
+          }
+          this.$store.state.app.curActionPermission = authCode
           // 普通打印/导出
           const obj = {
             allocateSn: _this.itemData.allocateSn,

+ 6 - 3
src/views/allocationManagement/transferReturn/print.vue

@@ -73,22 +73,25 @@ export default {
         allocateReturnSn: obj.allocateReturnSn || '',
         printType: obj.printType
       }
-      params.showPriceFlag = this.$hasPermissions('B_transferReturnPrint_salesPrice')
       // 打印货位编号
       if (obj.orderBy) {
         params.orderBy = obj.orderBy
       }
       _this.$emit('loading')
-      printFun(allocateReturnPrint, params, obj.isPreview, '调拨退货单', () => { _this.$emit('unloading') })
+      printFun(allocateReturnPrint, params, obj.isPreview, '调拨退货单', () => { 
+        _this.$emit('unloading')
+        _this.$store.state.app.curActionPermission = ''
+     })
     },
     // 导出
     handleExcel () {
       const _this = this
       _this.$emit('loading')
       const params = { allocateReturnSn: this.params.allocateReturnSn || '' }
-      params.showPriceFlag = this.$hasPermissions('B_transferReturnExport_salesPrice')
+      _this.$store.state.app.curActionPermission = 'B_transferReturnExport'
       exportExcel(allocateReturnExcel, params, '调拨退货单明细', function () {
         _this.$emit('unloading')
+        _this.$store.state.app.curActionPermission = ''
       })
     }
   }

+ 1 - 0
src/views/allocationManagement/transferReturn/printModal.vue

@@ -99,6 +99,7 @@ export default {
             if (_this.form.orderBy != '-1') {
               obj.orderBy = _this.form.orderBy
             }
+            _this.$store.state.app.curActionPermission = 'B_transferReturnPrint'
             _this.$emit('ok', obj)
           }
           _this.isShow = false

+ 6 - 3
src/views/allocationManagement/transfersPrint/list.vue

@@ -306,6 +306,7 @@ export default {
       const _this = this
       const params = JSON.parse(JSON.stringify(objs))
       delete params.type
+      _this.$store.state.app.curActionPermission = 'B_transferOut_type_print'
       _this.spinning = true
       printFun(
         allocateBillDetailPrint,
@@ -314,10 +315,11 @@ export default {
         '调拨分类',
         (res) => {
           _this.spinning = false
-          if (res.status == 200) {
+          _this.$store.state.app.curActionPermission = ''
+          if (res&&res.status == 200) {
             _this.$refs.table.refresh()
-          }
-          _this.$message.info(res.message)
+            _this.$message.info(res.message)
+          }          
         }, {
           billType: 'ALLOCATE',
           billSn: objs.allocateSn,
@@ -328,6 +330,7 @@ export default {
     //  详情
     handleDetail (row) {
       if (this.$hasPermissions('M_tfoPrint_detail')) {
+        this.$store.state.app.curActionPermission = 'M_tfoPrint_detail'
         this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.allocateSn}` })
       }
     },

+ 2 - 0
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -254,12 +254,14 @@ export default {
     // 导出
     handleExcel () {
       const _this = this
+      this.$store.state.app.curActionPermission = 'B_inventoryQuery_rkDetail_export'
       const params = Object.assign(this.queryParam, { productSn: this.$route.params.sn })
       this.exportLoading = true
       this.spinning = true
       hdExportExcel(stockFlowExport, params, '出入库明细', function () {
         _this.exportLoading = false
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     //  返回列表

+ 2 - 0
src/views/reportData/actualSalesReport/list.vue

@@ -417,11 +417,13 @@ export default {
         if (valid) {
           _this.showExport = true
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_actualSalesReport_export'
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(actualSalesExport, params, '实售销售报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/allCountryCostReport/list.vue

@@ -544,11 +544,13 @@ export default {
         if (valid) {
           _this.showExport = true
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_returnGoodsPresentationExport'
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportRebateExport, params, '全国各省品类实际销售明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 3
src/views/reportData/allocationDetails/list.vue

@@ -382,15 +382,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showCostFlag = this.$hasPermissions('B_allocationDetails_Export_costPrice')
-          params.showPriceFlag = this.$hasPermissions('B_allocationDetails_Export_salesPrice')
-         
+          _this.$store.state.app.curActionPermission = 'B_allocationDetails_Export'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(allocateReportDetailExport, params, '调拨明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           console.log('error submit!!')

+ 2 - 0
src/views/reportData/allocationPresentation/list.vue

@@ -283,6 +283,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_allocationPresentationExport'
           _this.showExport = true
           delete params.time
           _this.exportLoading = true
@@ -290,6 +291,7 @@ export default {
           hdExportExcel(reportAllocateDbjdReportExport, params, '调拨交单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/billingBackReport/list.vue

@@ -344,12 +344,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_regionTypeSalesReportExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(jkUrl, params, excelTitle, function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/billingOrderReport/list.vue

@@ -339,12 +339,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_regionTypeSalesReportExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(jkUrl, params, excelTitle, function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/billingReturnReport/list.vue

@@ -394,12 +394,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_billingReturn_Report'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(billingReturnExport, params, '开单退货报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/expenseAccountReport/bearerList.vue

@@ -289,11 +289,13 @@ export default {
         if (valid) {
           _this.showExport = true
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_expenseCollectExportByTarget'
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(expenseCollectReportExportByTarget, params, '费用汇总报表(按承担方)', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -251,10 +251,12 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'M_hPriceDifferenceDetailReportList'
           _this.showExport = true
           _this.spinning = true
           hdExportExcel(headRebateDetailReportExport, params, '总部差价明细报表', function () {
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -253,12 +253,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_priceDifferenceDetail_Export'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportRebateExport, params, '差价明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 0 - 1
src/views/reportData/receivedSendStorageReport/index.vue

@@ -54,7 +54,6 @@
           <a-col :md="5" :sm="24">
             <a-form-item label="产品品牌">
               <ProductBrand id="receivedSendStorageReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-              </a-select>
             </a-form-item>
           </a-col>
           <a-col :md="5" :sm="24">

+ 2 - 1
src/views/reportData/regionTypeSalesReport/list.vue

@@ -26,7 +26,6 @@
                   <a-select-option v-for="item in salesStatusTypeList" :value="item.code" :key="item.code">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-model-item>
-              </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24" v-if="activeKey==0">
               <a-form-model-item label="所在区域">
@@ -261,12 +260,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_regionTypeSalesReportExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(jkUrl, params, excelTitle, function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/returnGoodsPresentation/list.vue

@@ -429,12 +429,14 @@ export default {
         if (valid) {
           const params = _this.queryParam
           delete params.time
+          _this.$store.state.app.curActionPermission = 'B_returnGoodsPresentationExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportSalesReturnThjdReportExport, params, '退货交单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/returnSlipReport/list.vue

@@ -436,12 +436,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_returnSlip_Report'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(returnSlipExport, params, '开单退货单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/salesAmountReport/list.vue

@@ -395,12 +395,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_salesAmountReport_export'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(salesAmountExport, params, '开单销售报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 5
src/views/reportData/salesDetails/list.vue

@@ -358,17 +358,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showCostFlag = this.$hasPermissions('B_salesDetailsExport_costPrice')
-          params.showPriceFlag = this.$hasPermissions('B_salesDetailsExport_salesPrice')
-          params.showCityPriceFlag = this.$hasPermissions('B_salesDetailsExport_cityPrice')
-          // params.showSpecialPriceFlag = this.$hasPermissions('B_salesDetailsExport_specialPrice')
-
+          _this.$store.state.app.curActionPermission = 'B_salesDetailsExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportSalesBillDetailExport, params, '销售明细(开单统计)报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 5
src/views/reportData/salesOrderTotal/list.vue

@@ -309,17 +309,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showCostFlag = this.$hasPermissions('B_salesOrderTotalExport_costPrice')
-          params.showPriceFlag = this.$hasPermissions('B_salesOrderTotalExport_salesPrice')
-          params.showProvincePriceFlag = this.$hasPermissions('B_salesOrderTotalExport_provincePrice')
-          params.showCityPriceFlag = this.$hasPermissions('B_salesOrderTotalExport_cityPrice')
-          params.showSpecialPriceFlag = this.$hasPermissions('B_salesOrderTotalExport_specialPrice')
+          _this.$store.state.app.curActionPermission = 'B_salesOrderTotalExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportSalesBillExport, params, '销售(开单统计)报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/salesPresentation/list.vue

@@ -430,12 +430,14 @@ export default {
         if (valid) {
           const params = _this.queryParam
           delete params.time
+          _this.$store.state.app.curActionPermission = 'B_salesPresentationExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportDispatchReportExport, params, '销售交单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 2
src/views/reportData/salesReturnDetailReport/list.vue

@@ -378,14 +378,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showPriceFlag = this.$hasPermissions('B_salerReturnDetailTable_export_salesPrice')
-          params.showCityPriceFlag = this.$hasPermissions('B_salerReturnDetailTable_export_cityPrice')
+          _this.$store.state.app.curActionPermission = 'B_salerReturnDetailTable_export'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportSalesReturnDetailExport, params, '销售退货明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/salesReturnReport/list.vue

@@ -418,9 +418,11 @@ export default {
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
+          _this.$store.state.app.curActionPermission = 'B_salesReturn_Report'
           hdExportExcel(salesReturnExport, params, '实售退货报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 5
src/views/reportData/salesReturnsReport/list.vue

@@ -244,17 +244,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showPriceFlag = this.$hasPermissions('B_salesReturns_report_salesPrice')
-          params.showProvincePriceFlag = this.$hasPermissions('B_salesReturns_report_provincePrice')
-          params.showCityPriceFlag = this.$hasPermissions('B_salesReturns_report_cityPrice')
-          params.showSpecialPriceFlag = this.$hasPermissions('B_salesReturns_report_specialPrice')
-
+          _this.$store.state.app.curActionPermission = 'B_salesReturns_report'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(salesReturnsExport, params, '销售退货单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 0
src/views/reportData/salesSlipReport/list.vue

@@ -436,12 +436,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.$store.state.app.curActionPermission = 'B_salesSlip_report'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(salesSlipExport, params, '开单销售单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 2
src/views/reportData/transferReturnDetailReport/list.vue

@@ -359,14 +359,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showPriceFlag = this.$hasPermissions('M_transferReturnDetailReportExport_salesPrice')
-          params.showCostFlag = this.$hasPermissions('M_transferReturnDetailReportExport_costPrice')
+          _this.$store.state.app.curActionPermission = 'M_transferReturnDetailReportExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(allocateReturnReportDetailExport, params, '调拨退货明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 2
src/views/reportData/transferReturnReport/list.vue

@@ -214,14 +214,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showPriceFlag = this.$hasPermissions('M_transferReturnReportExport_salesPrice')
-          params.showCostFlag = this.$hasPermissions('M_transferReturnReportExport_costPrice')
+          _this.$store.state.app.curActionPermission = 'M_transferReturnReportExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(allocateReturnReportExport, params, '调拨退货单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 1
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -378,10 +378,11 @@ export default {
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
-          params.showCostFlag = _this.$hasPermissions('B_urchaseDetailReturn_export_costPrice') ? 1 : 0
+          _this.$store.state.app.curActionPermission = 'B_urchaseDetailReturn_export'
           hdExportExcel(sparePartsReturnReportExportDetail, params, '采购退货明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 1
src/views/reportData/urchaseReturn/list.vue

@@ -177,10 +177,11 @@ export default {
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
-          params.showCostFlag = _this.$hasPermissions('B_urchaseReturn_Export_costPrice') ? 1 : 0
+          _this.$store.state.app.curActionPermission = 'B_urchaseReturn_Export'
           hdExportExcel(sparePartsReturnReportExport, params, '采购退货单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 1
src/views/reportData/warehousingOrder/list.vue

@@ -232,13 +232,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showCostFlag = this.$hasPermissions('B_warehousingOrderExport_costPrice')
+          _this.$store.state.app.curActionPermission = 'B_warehousingOrderExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportStockPutExport, params, '入库单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false

+ 2 - 1
src/views/reportData/warehousingOrderDetail/list.vue

@@ -250,13 +250,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = this.queryParam
-          params.showCostFlag = this.$hasPermissions('B_warehousingOrderDetailExport_costPrice')
+          _this.$store.state.app.curActionPermission = 'B_warehousingOrderDetailExport'
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportStockPutDetailExport, params, '入库单明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false
+            _this.$store.state.app.curActionPermission = ''
           })
         } else {
           return false