lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
fa0ad94e80
Modificáronse 85 ficheiros con 474 adicións e 381 borrados
  1. 9 9
      src/views/allocationManagement/transferOut/detail.vue
  2. 17 10
      src/views/allocationManagement/transferOut/edit.vue
  3. 6 3
      src/views/allocationManagement/transferOut/list.vue
  4. 4 2
      src/views/allocationManagement/transferReturn/check.vue
  5. 11 4
      src/views/allocationManagement/transferReturn/detail.vue
  6. 29 20
      src/views/allocationManagement/transferReturn/edit.vue
  7. 7 3
      src/views/allocationManagement/transferReturn/editGrp.vue
  8. 3 1
      src/views/allocationManagement/transferReturn/list.vue
  9. 4 1
      src/views/allocationManagement/transferReturn/print.vue
  10. 1 1
      src/views/allocationManagement/transfersPrint/list.vue
  11. 7 3
      src/views/bnSetting/menu/adminMenus.vue
  12. 1 1
      src/views/financialManagement/allocateReturnConfirmation/detailModal.vue
  13. 4 4
      src/views/financialManagement/allocateReturnConfirmation/list.vue
  14. 20 13
      src/views/financialManagement/financialCollection/dispatchModal.vue
  15. 8 2
      src/views/financialManagement/financialCollection/edit.vue
  16. 1 1
      src/views/financialManagement/financialCollection/selectGlAllocatModal.vue
  17. 1 1
      src/views/financialManagement/financialCollection/selectGlSalesModal.vue
  18. 4 4
      src/views/financialManagement/inventoryConfirmation/detail.vue
  19. 2 2
      src/views/financialManagement/returnConfirmation/detailModal.vue
  20. 1 1
      src/views/financialManagement/returnConfirmation/list.vue
  21. 1 2
      src/views/financialManagement/warehousingConfirmation/detailModal.vue
  22. 1 1
      src/views/financialManagement/warehousingConfirmation/list.vue
  23. 2 2
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  24. 2 2
      src/views/inventoryManagement/inventoryQuery/list.vue
  25. 3 3
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  26. 5 7
      src/views/productManagement/priceChangeRecord/list.vue
  27. 3 27
      src/views/productManagement/productPricing/list.vue
  28. 2 2
      src/views/promotionRulesManagement/orderStatistics/detailModal.vue
  29. 3 5
      src/views/promotionRulesManagement/orderStatistics/list.vue
  30. 2 2
      src/views/promotionRulesManagement/productStatistics/detailModal.vue
  31. 4 4
      src/views/promotionRulesManagement/productStatistics/list.vue
  32. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/auditNoPassModal.vue
  33. 4 5
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  34. 3 4
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  35. 2 2
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  36. 2 2
      src/views/purchasingManagement/purchaseReturn/detailModal.vue
  37. 2 2
      src/views/purchasingManagement/purchaseReturn/list.vue
  38. 2 2
      src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue
  39. 1 1
      src/views/purchasingManagement/purchaseReturn/queryPart.vue
  40. 2 2
      src/views/reportData/actualSalesReport/list.vue
  41. 21 13
      src/views/reportData/allocationDetails/list.vue
  42. 3 3
      src/views/reportData/allocationOrderTotal/list.vue
  43. 2 2
      src/views/reportData/allocationPresentation/list.vue
  44. 4 3
      src/views/reportData/billingReturnReport/list.vue
  45. 8 7
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  46. 6 5
      src/views/reportData/priceDifferenceDetailReport/list.vue
  47. 4 3
      src/views/reportData/returnGoodsPresentation/list.vue
  48. 4 3
      src/views/reportData/returnSlipReport/list.vue
  49. 4 3
      src/views/reportData/salesAmountReport/list.vue
  50. 24 16
      src/views/reportData/salesDetails/list.vue
  51. 38 24
      src/views/reportData/salesOrderTotal/list.vue
  52. 4 3
      src/views/reportData/salesPresentation/list.vue
  53. 26 21
      src/views/reportData/salesReturnDetailReport/list.vue
  54. 4 3
      src/views/reportData/salesReturnReport/list.vue
  55. 30 15
      src/views/reportData/salesReturnsReport/list.vue
  56. 4 3
      src/views/reportData/salesSlipReport/list.vue
  57. 10 8
      src/views/reportData/transferReturnDetailReport/list.vue
  58. 9 5
      src/views/reportData/transferReturnReport/list.vue
  59. 4 4
      src/views/reportData/urchaseDetailReturn/detailList.vue
  60. 3 3
      src/views/reportData/urchaseReturn/list.vue
  61. 3 2
      src/views/reportData/warehousingOrder/list.vue
  62. 3 2
      src/views/reportData/warehousingOrderDetail/list.vue
  63. 2 2
      src/views/salesManagement/backorder/detailModal.vue
  64. 1 1
      src/views/salesManagement/backorder/list.vue
  65. 2 2
      src/views/salesManagement/examineVerify/list.vue
  66. 1 2
      src/views/salesManagement/matchSendOutOrder/list.vue
  67. 1 1
      src/views/salesManagement/outboundOrder/list.vue
  68. 12 12
      src/views/salesManagement/priceInquiry/list.vue
  69. 4 3
      src/views/salesManagement/pushOrderManagement/detail.vue
  70. 2 2
      src/views/salesManagement/pushOrderManagement/list.vue
  71. 2 2
      src/views/salesManagement/salesCollection/list.vue
  72. 1 1
      src/views/salesManagement/salesCollection/voucherModal.vue
  73. 1 1
      src/views/salesManagement/salesQuery/edit.vue
  74. 7 5
      src/views/salesManagement/shortageStatisticsC/list.vue
  75. 8 3
      src/views/salesManagement/shortageStatisticsP/list.vue
  76. 1 1
      src/views/salesManagement/stockPrint/list.vue
  77. 9 9
      src/views/salesManagement/waitDispatch/queryPart.vue
  78. 1 1
      src/views/salesReturnManagement/custConfirm/list.vue
  79. 2 2
      src/views/salesReturnManagement/salesReturn/detail.vue
  80. 5 2
      src/views/salesReturnManagement/salesReturn/list.vue
  81. 1 1
      src/views/salesReturnManagement/salesReturn/queryPart.vue
  82. 2 2
      src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue
  83. 0 3
      src/views/supplierManagement/associatedProduct/add.vue
  84. 1 4
      src/views/supplierManagement/associatedProductDetails/list.vue
  85. 3 4
      src/views/supplierManagement/costSetting/list.vue

+ 9 - 9
src/views/allocationManagement/transferOut/detail.vue

@@ -107,8 +107,8 @@
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
             总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
-            <span v-if="$hasPermissions('B_isShowCost')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ,</span>
-            <span v-if="$hasPermissions('B_isShowPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
+            <span v-if="$hasPermissions('M_transferOut_detail_costPrice')||$hasPermissions('M_tfoPrint_detail_costPrice')||$hasPermissions('M_mso_detail_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ,</span>
+            <span v-if="$hasPermissions('M_transferOut_detail_salesPrice')||$hasPermissions('M_tfoPrint_detail_salesPrice')||$hasPermissions('M_mso_detail_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -192,14 +192,14 @@ export default {
         { title: '单位', dataIndex: 'productEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调出数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
+      if (this.$hasPermissions('M_transferOut_detail_costPrice')||this.$hasPermissions('M_tfoPrint_detail_salesPrice')||this.$hasPermissions('M_mso_detail_costPrice')) { // 成本价权限
         arr.splice(5, 0, { title: '成本价', dataIndex: 'cost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(8, 0, { title: '成本小计(¥)', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '成本小计', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 6 : 5
+      if (this.$hasPermissions('M_transferOut_detail_salesPrice')||this.$hasPermissions('M_tfoPrint_detail_salesPrice')||this.$hasPermissions('M_mso_detail_salesPrice')) { //  售价权限
+        const ind = this.$hasPermissions('M_transferOut_detail_costPrice')||this.$hasPermissions('M_tfoPrint_detail_costPrice') ? 6 : 5
         arr.splice(ind, 0, { title: '售价', dataIndex: 'price', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 3, 0, { title: '售价小计(¥)', dataIndex: 'totalPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind + 3, 0, { title: '售价小计', dataIndex: 'totalPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       arr.push({ title: '费用归属部门', dataIndex: 'departmentName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })
       return arr
@@ -245,8 +245,8 @@ 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_isShowCost')
-      params.showAmountFlag = this.$hasPermissions('B_isShowPrice')
+      params.showCostFlag = this.$hasPermissions('B_transferOut_export_costPrice')
+      params.showAmountFlag = this.$hasPermissions('B_transferOut_export_salesPrice')
       exportExcel(allocateBillDetailExcel, params, filename, function () {
         _this.spinning = false
       })

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

@@ -176,8 +176,8 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
-                <span v-if="$hasPermissions('B_isShowCost')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ,</span>
-                <span v-if="$hasPermissions('B_isShowPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
+                <span v-if="$hasPermissions('M_transferOut_edit_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ,</span>
+                <span v-if="$hasPermissions('M_transferOut_edit_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
               </div>
             </a-alert>
             <!-- 筛选条件 -->
@@ -446,11 +446,11 @@ export default {
         { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action1' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_transferOut_edit_costPrice')) { //  成本价权限
         arr.splice(4, 0, { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 5 : 4
+      if (this.$hasPermissions('M_transferOut_edit_salesPrice')) { //  售价权限
+        const ind = this.$hasPermissions('M_transferOut_edit_costPrice') ? 5 : 4
         arr.splice(ind, 0, { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
@@ -470,11 +470,11 @@ export default {
         { title: '单位', dataIndex: 'productEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_transferOut_edit_costPrice')) { //  成本价权限
         arr.splice(4, 0, { title: '成本价', dataIndex: 'cost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 5 : 4
+      if (this.$hasPermissions('M_transferOut_edit_salesPrice')) { //  售价权限
+        const ind = this.$hasPermissions('M_transferOut_edit_costPrice') ? 5 : 4
         arr.splice(ind, 0, { title: '售价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'right' })
       }
       return arr
@@ -741,8 +741,11 @@ export default {
       const _this = this
       this.spinning = true
       const params = { allocateSn: this.outBizSn || this.$route.params.sn, printType: printType, ...data }
-      params.showCostFlag = this.$hasPermissions('B_isShowCost')
-      params.showAmountFlag = this.$hasPermissions('B_isShowPrice')
+      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
       })
@@ -761,6 +764,10 @@ export default {
       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')
+      }
       printFun(
         allocateBillDetailPrint,
         params,

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

@@ -272,11 +272,11 @@ export default {
         { title: '对单状态', dataIndex: 'checkStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_transferOutList_costPrice')) { //  成本价权限
         arr.splice(8, 0, { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 10 : 9
+      if (this.$hasPermissions('M_transferOutList_salesPrice')) { //  售价权限
+        const ind = this.$hasPermissions('M_transferOutList_costPrice') ? 10 : 9
         arr.splice(ind, 0, { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
@@ -407,6 +407,9 @@ export default {
     handleExport () {
       const _this = this
       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 () {

+ 4 - 2
src/views/allocationManagement/transferReturn/check.vue

@@ -127,13 +127,15 @@ export default {
         { title: '退货数量', dataIndex: 'returnQty', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'backStockQty', width: '10%', align: 'center', scopedSlots: { customRender: 'backStockQty' } },
-        { title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', dataIndex: 'price', align: 'right', width: '10%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       console.log(this.grabFlag)
       if (this.grabFlag == 1) { //  抓单
         arr.splice(1, 0, { title: '调拨单号', dataIndex: 'allocateNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } })
       }
+      if(this.$hasPermissions('M_transferReturnCheck_salesPrice')){
+        arr.splice(this.grabFlag == 1?8:7,0,{ title: '退货单价', dataIndex: 'price', align: 'right', width: '10%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },

+ 11 - 4
src/views/allocationManagement/transferReturn/detail.vue

@@ -48,7 +48,7 @@
             退货总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong> ,
             坏件总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalBadQty || basicInfoData.totalBadQty==0)) ? basicInfoData.totalBadQty : '--' }}</strong> ,
             返库总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalBackStockQty || basicInfoData.totalBackStockQty==0)) ? basicInfoData.totalBackStockQty : '--' }}</strong> ,
-            <span>退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>;
+            <span v-if="showPrice||$hasPermissions('M_transferReturnDetail_salesPrice')">退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>;
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -81,6 +81,10 @@ export default {
       type: [Number, String],
       default: ''
     },
+    showPrice:{
+      type: Boolean,
+      default: false
+    },
     pageType: {
       type: String,
       default: 'pages'
@@ -123,16 +127,19 @@ export default {
         { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '27%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'product.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', dataIndex: 'price', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '退货数量', dataIndex: 'returnQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '返库数量', dataIndex: 'backStockQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额', dataIndex: 'totalReturnPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '返库数量', dataIndex: 'backStockQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
 
       if (this.basicInfoData && this.basicInfoData.grabFlag == '1') {
         arr.splice(1, 0, { title: '调拨单号', dataIndex: 'allocateNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
       }
+      if(this.showPrice||this.$hasPermissions('M_transferReturnDetail_salesPrice')){
+        const ind = this.basicInfoData && this.basicInfoData.grabFlag == '1' ? 1 : 0
+        arr.splice(4+ind,0,{ title: '退货单价', dataIndex: 'price', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8+ind,0,{ title: '退货金额', dataIndex: 'totalReturnPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },

+ 29 - 20
src/views/allocationManagement/transferReturn/edit.vue

@@ -126,7 +126,7 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 退货总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong> ,
-                <span>退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>
+                <span v-if="$hasPermissions('B_transferReturnEdit_salesPrice')">退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>
               </div>
             </a-alert>
             <!-- 筛选条件 -->
@@ -300,25 +300,6 @@ export default {
       },
       loadDataSource: [],
       localDataSource: [],
-      columns: [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
-        { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
-      ],
-      chooseColumns: [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
-        { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
-        { title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
-      ],
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
         this.chooseDisabled = true
@@ -343,6 +324,34 @@ export default {
       allocateTypeVal: []
     }
   },
+  computed:{
+    columns(){
+      const arr = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
+        { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+      ]
+    },
+    chooseColumns(){
+      const _this = this
+      const arr = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
+        { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+      ]
+      if(this.$hasPermissions('B_transferReturnEdit_salesPrice')){
+        arr.splice(6,0,{ title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+    }
+  },
   methods: {
     // 修改备注
     handleEditRemark () {

+ 7 - 3
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -129,7 +129,7 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 退货总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong> ,
-                <span>退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>
+                <span v-if="$hasPermissions('B_transferReturnEdit_salesPrice')">退货总金额:<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? toThousands(basicInfoData.totalPrice) : '--' }}</strong></span>
               </div>
             </a-alert>
             <!-- 筛选条件 -->
@@ -329,13 +329,15 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨单价', dataIndex: 'price', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '调拨数量', dataIndex: 'qty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '剩余可退数量', dataIndex: 'refundableQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'center' },
         { title: '退货数量', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
+      if(this.$hasPermissions('B_transferReturnEdit_salesPrice')){
+        arr.splice(5,0,{ title: '调拨单价', dataIndex: 'price', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     },
     chooseColumns () {
@@ -348,9 +350,11 @@ export default {
         { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'center' },
         { title: '退货数量', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
+      if(this.$hasPermissions('B_transferReturnEdit_salesPrice')){
+        arr.splice(7,0,{ title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },

+ 3 - 1
src/views/allocationManagement/transferReturn/list.vue

@@ -214,11 +214,13 @@ export default {
         { title: '退货总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货总金额', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
+      if(this.$hasPermissions('M_transferReturnList_salesPrice')){
+        arr.splice(11,0,{ title: '退货总金额', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },

+ 4 - 1
src/views/allocationManagement/transferReturn/print.vue

@@ -73,6 +73,7 @@ export default {
         allocateReturnSn: obj.allocateReturnSn || '',
         printType: obj.printType
       }
+      params.showPriceFlag = this.$hasPermissions('B_transferReturnPrint_salesPrice')
       // 打印货位编号
       if (obj.orderBy) {
         params.orderBy = obj.orderBy
@@ -84,7 +85,9 @@ export default {
     handleExcel () {
       const _this = this
       _this.$emit('loading')
-      exportExcel(allocateReturnExcel, { allocateReturnSn: this.params.allocateReturnSn || '' }, '调拨退货单明细', function () {
+      const params = { allocateReturnSn: this.params.allocateReturnSn || '' }
+      params.showPriceFlag = this.$hasPermissions('B_transferReturnExport_salesPrice')
+      exportExcel(allocateReturnExcel, params, '调拨退货单明细', function () {
         _this.$emit('unloading')
       })
     }

+ 1 - 1
src/views/allocationManagement/transfersPrint/list.vue

@@ -250,7 +250,7 @@ export default {
         { title: '打印次数', dataIndex: 'printCount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_transfersPrintList_salesPrice')) { //  售价权限
         arr.splice(7, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(8, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(9, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })

+ 7 - 3
src/views/bnSetting/menu/adminMenus.vue

@@ -205,6 +205,7 @@ export default {
   methods: {
     onPriceChange(val){
       console.log(val,this.authPrice,this.currMenusData)
+      
       const data = this.currMenusData
       if(!data){
         this.$message.warning('请选择一个父级菜单')
@@ -218,9 +219,13 @@ export default {
       const curAuth = []
       child.map(item=>{
         const a = item.code.split('_')
-        curAuth.push(a[a.length-1])
+        const b = a[a.length-1]
+        const c = this.priceOptions.find(item => item.value == b)
+        if(c){
+          curAuth.push(a[a.length-1])
+        }
       })
-       
+ 
       // 添加
       if(val.length > curAuth.length){
         const diff = val.filter(item => !new Set(curAuth).has(item))
@@ -243,7 +248,6 @@ export default {
           const a = item.code.split('_')
           return a[a.length-1] == diff[0]
         })
-         
         console.log(child[idx])
         this.delChildPrice(child[idx].id,function(){
           child.splice(idx,1)

+ 1 - 1
src/views/financialManagement/allocateReturnConfirmation/detailModal.vue

@@ -9,7 +9,7 @@
     @cancel="isShow=false"
     :width="960">
     <div>
-      <detail :outBizSn="itemSn" pageType="modal" ref="detail"></detail>
+      <detail :outBizSn="itemSn" :showPrice="$hasPermissions('M_allocateReturnConfirmationDetail_salesPrice')" pageType="modal" ref="detail"></detail>
       <div class="btn-cont"><a-button id="confirmationDetail-modal-back" @click="isShow = false">返回列表</a-button></div>
     </div>
   </a-modal>

+ 4 - 4
src/views/financialManagement/allocateReturnConfirmation/list.vue

@@ -148,14 +148,14 @@ export default {
         { title: '退货总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        // { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '确认时间', dataIndex: 'financeAuditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-      //   arr.splice(8, 0, { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-      // }
+      if (this.$hasPermissions('M_allocateReturnConfirmationList_salesPrice')) { //  售价权限
+        arr.splice(8, 0, { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
       return arr
     }
   },

+ 20 - 13
src/views/financialManagement/financialCollection/dispatchModal.vue

@@ -58,19 +58,6 @@ export default {
       spinning: false,
       isShow: this.openModal,
       detailData: null,
-      columns: [
-        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '单据类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '单据号', dataIndex: 'bizNo', align: 'center', width: '12%', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '12%', customRender: function (text) { return text || '--' } },
-        { title: '收货客户名称', dataIndex: 'receiverName', align: 'center', width: '12%', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'sendNo', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'totalCategory', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '产品数量', dataIndex: 'totalQty', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '8%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } }
-      ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const params = Object.assign(parameter, { bookSn: this.itemSn })
@@ -110,6 +97,26 @@ export default {
       }
     }
   },
+  computed: {
+    columns () {
+      const arr = [
+        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
+        { title: '单据类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '单据号', dataIndex: 'bizNo', align: 'center', width: '12%', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '12%', customRender: function (text) { return text || '--' } },
+        { title: '收货客户名称', dataIndex: 'receiverName', align: 'center', width: '12%', customRender: function (text) { return text || '--' } },
+        { title: '发货编号', dataIndex: 'sendNo', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '产品款数', dataIndex: 'totalCategory', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
+        { title: '产品数量', dataIndex: 'totalQty', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatusDictValue', align: 'center', width: '8%', customRender: function (text) { return (text == 0 || text) ? text : '--' } }
+      ]
+      if (this.$hasPermissions('B_glDispatch_salesPrice')) { // 价格权限
+        arr.splice(8, 0, { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '8%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
+      return arr
+    }
+  },
   methods: {
     handleCommonCancel () {
       this.$emit('close')

+ 8 - 2
src/views/financialManagement/financialCollection/edit.vue

@@ -308,7 +308,11 @@ export default {
           return data
         })
       },
-      glcolumns: [
+    }
+  },
+  computed:{
+    glcolumns(){
+      const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '单据创建时间', dataIndex: 'createDate', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
@@ -318,11 +322,13 @@ export default {
         { title: '发货编号', dataIndex: 'sendNo', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'totalCategory', align: 'center', width: '6%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
         { title: '产品数量', dataIndex: 'totalQty', align: 'center', width: '6%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '业务状态', dataIndex: 'billStatusDictValue', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', align: 'center', width: '6%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
+      if (this.$hasPermissions('B_glDispatch_salesPrice')) { //  售价权限
+        arr.splice(9, 0, { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
     }
   },
   methods: {

+ 1 - 1
src/views/financialManagement/financialCollection/selectGlAllocatModal.vue

@@ -173,7 +173,7 @@ export default {
         { title: '业务状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_glDispatch_salesPrice')) { //  售价权限
         arr.splice(8, 0, { title: '总售价', dataIndex: 'totalPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 1 - 1
src/views/financialManagement/financialCollection/selectGlSalesModal.vue

@@ -191,7 +191,7 @@ export default {
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_glDispatch_salesPrice')) { //  售价权限
         arr.splice(10, 0, { title: '总售价', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 4 - 4
src/views/financialManagement/inventoryConfirmation/detail.vue

@@ -33,15 +33,15 @@
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message" style="display: flex;">
             盘盈数量:<strong :style="{ color: productTotal && productTotal.profitQty>0?'red':productTotal && productTotal.profitQty<0?'green':'' }">{{ productTotal && (productTotal.profitQty || productTotal.profitQty==0) ? productTotal.profitQty : '--' }}</strong>,
-            <div v-if="$hasPermissions('B_isShowCost')">
+            <div v-if="$hasPermissions('B_inventoryConfirmationDetail_costPrice')">
               盘盈金额:<strong :style="{ color: productTotal && productTotal.profitCost>0?'red':productTotal && productTotal.profitCost<0?'green':'' }">{{ productTotal && (productTotal.profitCost || productTotal.profitCost==0) ? toThousands(productTotal.profitCost) : '--' }}</strong>,
             </div>
             盘亏数量:<strong :style="{ color: productTotal && productTotal.lossQty>0?'red':productTotal && productTotal.lossQty<0?'green':'' }">{{ productTotal && (productTotal.lossQty || productTotal.lossQty==0) ? productTotal.lossQty : '--' }}</strong>,
-            <div v-if="$hasPermissions('B_isShowCost')">
+            <div v-if="$hasPermissions('B_inventoryConfirmationDetail_costPrice')">
               盘亏金额:<strong :style="{ color: productTotal && productTotal.lossCost>0?'red':productTotal && productTotal.lossCost<0?'green':'' }">{{ productTotal && (productTotal.lossCost || productTotal.lossCost==0) ? toThousands(productTotal.lossCost) : '--' }}</strong>,
             </div>
             盈亏总数量:<strong :style="{ color: productTotal && productTotal.profitLossQty>0?'red':productTotal && productTotal.profitLossQty<0?'green':'' }">{{ productTotal && (productTotal.profitLossQty	|| productTotal.profitLossQty ==0) ? productTotal.profitLossQty : '--' }}</strong>,
-            <div v-if="$hasPermissions('B_isShowCost')">
+            <div v-if="$hasPermissions('B_inventoryConfirmationDetail_costPrice')">
               盈亏总金额:<strong :style="{ color: productTotal && productTotal.profitLossCost>0?'red':productTotal && productTotal.profitLossCost<0?'green':'' }">{{ productTotal && (productTotal.profitLossCost || productTotal.profitLossCost==0) ? toThousands(productTotal.profitLossCost) : '--' }}</strong>
             </div>
           </div>
@@ -161,7 +161,7 @@ export default {
         { title: '盈亏数量', dataIndex: 'profitLossQty', scopedSlots: { customRender: 'profitLossQty' }, width: '6%', align: 'center' }
       // { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
+      if (this.$hasPermissions('B_inventoryConfirmationDetail_costPrice')) { // 成本价权限
         arr.splice(11, 0, { title: '单价', dataIndex: 'checkCost', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(13, 0, { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'right' })
       }

+ 2 - 2
src/views/financialManagement/returnConfirmation/detailModal.vue

@@ -26,7 +26,7 @@
               <a-descriptions-item label="坏件数量">{{ detailData&&(detailData.totalBadQty || detailData.totalBadQty==0) ? detailData.totalBadQty : '--' }}</a-descriptions-item>
               <a-descriptions-item label="良品数量">{{ detailData&&(detailData.totalGoodQty || detailData.totalGoodQty==0) ? detailData.totalGoodQty : '--' }}</a-descriptions-item>
               <a-descriptions-item label="返库数量">{{ detailData&&(detailData.totalBackStockQty || detailData.totalBackStockQty==0) ? detailData.totalBackStockQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="实际退货金额" v-if="$hasPermissions('B_isShowPrice')">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="实际退货金额" v-if="$hasPermissions('B_returnConfirmation_detail_salesPrice')">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -104,7 +104,7 @@ export default {
         { title: '退货原因', dataIndex: 'returnReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '实际退货单价说明', dataIndex: 'priceRemark', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_returnConfirmation_detail_salesPrice')) { //  售价权限
         arr.splice(10, 0, { title: '实际退货单价', dataIndex: 'price', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(11, 0, { title: '实际退货金额', dataIndex: 'totalAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }

+ 1 - 1
src/views/financialManagement/returnConfirmation/list.vue

@@ -153,7 +153,7 @@ export default {
         { title: '状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_returnConfirmationList_salesPrice')) { //  售价权限
         arr.splice(7, 0, { title: '退货金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 1 - 2
src/views/financialManagement/warehousingConfirmation/detailModal.vue

@@ -82,9 +82,8 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '45%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '入库数量(个)', dataIndex: 'putQty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
-        // { title: '入库成本(¥)', dataIndex: 'putCost',width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) {
+      if (this.$hasPermissions('B_warehousingConfirmationDetail_costPrice')) {
         arr.splice(4, 0, { title: '入库成本', dataIndex: 'putCost', width: '14%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 1 - 1
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -151,7 +151,7 @@ export default {
         { title: '备注', dataIndex: 'remark', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
+      if (this.$hasPermissions('M_warehousingConfirmationList_costPrice')) { // 成本价权限
         arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -12,7 +12,7 @@
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
         可用库存总数量:<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}个</strong>;
-        <span v-if="$hasPermissions('B_isShowCost')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
+        <span v-if="$hasPermissions('B_inventoryQuery_detail_costPrice')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
       </div>
     </a-alert>
     <!-- 库存详情 -->
@@ -100,7 +100,7 @@ export default {
         { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量', dataIndex: 'currentQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
+      if (this.$hasPermissions('B_inventoryQuery_detail_costPrice')) { // 成本价权限
         arr.splice(9, 0, { title: '成本单价', dataIndex: 'putCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -71,7 +71,7 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
           可用库存总数量:<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}个</strong>;
-          <span v-if="$hasPermissions('B_isShowCost')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
+          <span v-if="$hasPermissions('M_inventoryQueryList_costPrice')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -214,7 +214,7 @@ export default {
         { title: '可用库存数量', dataIndex: 'currentStockQty', width: '10%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
+      if (this.$hasPermissions('M_inventoryQueryList_costPrice')) { // 成本价权限
         arr.splice(7, 0, { title: '可用库存成本', dataIndex: 'currentStockCost', width: '10%', align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr

+ 3 - 3
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -100,7 +100,7 @@
             当前库存总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}个</strong>;
             入库总数量:<strong>{{ (productTotal&&(productTotal.totalPutQty || productTotal.totalPutQty==0)) ? productTotal.totalPutQty : '--' }}个</strong>;
             出库总数量:<strong>{{ (productTotal&&(productTotal.totalOutQty || productTotal.totalOutQty==0)) ? productTotal.totalOutQty : '--' }}个</strong>;
-            <span v-if="$hasPermissions('B_isShowCost')">当前库存总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong>。</span>
+            <span v-if="$hasPermissions('B_inventoryQuery_rkDetail_costPrice')">当前库存总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong>。</span>
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -212,10 +212,10 @@ export default {
         // { title: '总成本', dataIndex: 'totalCost', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalPrice', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
+      if (this.$hasPermissions('B_inventoryQuery_rkDetail_costPrice')) { // 成本价权限
         arr.splice(13, 0, { title: '总成本', dataIndex: 'totalCost', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { // 售价权限
+      if (this.$hasPermissions('B_inventoryQuery_rkDetail_salesPrice')) { // 售价权限
         arr.splice(arr.length, 0, { title: '总售价', width: '4%', align: 'right', scopedSlots: { customRender: 'totalAmount' } })
       }
       return arr

+ 5 - 7
src/views/productManagement/priceChangeRecord/list.vue

@@ -180,8 +180,7 @@ export default {
         { title: '单位', dataIndex: 'productEntity.unit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '变更原因', dataIndex: 'changeReason', width: 70, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(7, 0, {
+        arr.push({
           title: '省级价',
           dataIndex: 'sdtermindfaldsdPrice',
           align: 'center',
@@ -190,7 +189,7 @@ export default {
             { title: '变更后', scopedSlots: { customRender: 'afterProvincePrice' }, width: 70, align: 'center' }
           ]
         })
-        arr.splice(8, 0, {
+        arr.push({
           title: '市级价',
           dataIndex: 'sdterminaldsdPrice',
           align: 'center',
@@ -199,7 +198,7 @@ export default {
             { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: 70, align: 'center' }
           ]
         })
-        arr.splice(9, 0, {
+        arr.push({
           title: '特约价',
           dataIndex: 'gterminaldsdPrice',
           align: 'center',
@@ -208,7 +207,7 @@ export default {
             { title: '变更后', scopedSlots: { customRender: 'afterSpecialPrice' }, width: 70, align: 'center' }
           ]
         })
-        arr.splice(10, 0, {
+        arr.push({
           title: '终端价',
           dataIndex: 'hterminaldsdPrice',
           align: 'center',
@@ -217,7 +216,7 @@ export default {
             { title: '变更后', scopedSlots: { customRender: 'afterTerminalPrice' }, width: 70, align: 'center' }
           ]
         })
-        arr.splice(11, 0, {
+        arr.push({
           title: '车主价',
           dataIndex: 'sterminaldsdPrice',
           align: 'center',
@@ -226,7 +225,6 @@ export default {
             { title: '变更后', scopedSlots: { customRender: 'afterCarOwnersPrice' }, width: 70, align: 'center' }
           ]
         })
-      }
       return arr
     }
   },

+ 3 - 27
src/views/productManagement/productPricing/list.vue

@@ -214,38 +214,14 @@ export default {
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '7%', align: 'center' },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '定价状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '成本价', scopedSlots: { customRender: 'sterminaldsdPrice' }, width: '7%', align: 'center' },
-        // { title: '省级价', dataIndex: 'provincePrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', scopedSlots: { customRender: 'sterminaldsdPrice' }, width: '7%', align: 'center' },
+        { title: '省级价', dataIndex: 'provincePrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '特约价', dataIndex: 'specialPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '终端价', dataIndex: 'terminalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '车主价', dataIndex: 'carOwnersPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) {
-        arr.splice(9, 0, { title: '成本价', scopedSlots: { customRender: 'sterminaldsdPrice' }, width: '7%', align: 'center' })
-        if (this.$hasPermissions('B_isShowProvincePrice')) {
-          arr.splice(10, 0, { title: '省级价', dataIndex: 'provincePrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-          if (this.$hasPermissions('B_isShowCityPrice')) {
-            arr.splice(11, 0, { title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-          }
-        } else {
-          if (this.$hasPermissions('B_isShowCityPrice')) {
-            arr.splice(10, 0, { title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-          }
-        }
-      } else {
-        if (this.$hasPermissions('B_isShowProvincePrice')) {
-          arr.splice(9, 0, { title: '省级价', dataIndex: 'provincePrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-          if (this.$hasPermissions('B_isShowCityPrice')) {
-            arr.splice(10, 0, { title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-          }
-        } else {
-          if (this.$hasPermissions('B_isShowCityPrice')) {
-            arr.splice(9, 0, { title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-          }
-        }
-      }
 
       return arr
     }

+ 2 - 2
src/views/promotionRulesManagement/orderStatistics/detailModal.vue

@@ -91,13 +91,13 @@ export default {
         // { title: '节省金额小计', dataIndex: 'totalEconomizeAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '促销类型', dataIndex: 'promotionRulesName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+
         arr.splice(3, 0, { title: '原价', dataIndex: 'origPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(4, 0, { title: '促销价', dataIndex: 'price', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(7, 0, { title: '原价小计', dataIndex: 'priceSubtotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(8, 0, { title: '促销价小计', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(9, 0, { title: '节省金额小计', dataIndex: 'totalEconomizeAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
+ 
       return arr
     }
   },

+ 3 - 5
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -55,9 +55,9 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
-          <span v-if="$hasPermissions('B_isShowPrice')">促销品原价总额:<strong>{{ productTotal && (productTotal.totalOrigAmount || productTotal.totalOrigAmount==0) ? toThousands(productTotal.totalOrigAmount) : '--' }}</strong>,</span>
-          <span v-if="$hasPermissions('B_isShowPrice')">促销品促销价总额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong>,</span>
-          <span v-if="$hasPermissions('B_isShowPrice')">节省总额:<strong>{{ productTotal && (productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? toThousands(productTotal.totalEconomizeAmount) : '--' }}</strong>,</span>
+          <span>促销品原价总额:<strong>{{ productTotal && (productTotal.totalOrigAmount || productTotal.totalOrigAmount==0) ? toThousands(productTotal.totalOrigAmount) : '--' }}</strong>,</span>
+          <span>促销品促销价总额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong>,</span>
+          <span>节省总额:<strong>{{ productTotal && (productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? toThousands(productTotal.totalEconomizeAmount) : '--' }}</strong>,</span>
           总单数:<strong>{{ productTotal && (productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--' }}</strong>,
           总款数:<strong>{{ productTotal && (productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong>,
           总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>
@@ -173,11 +173,9 @@ export default {
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '4%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(8, 0, { title: '原价总额', dataIndex: 'promoTotal', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(9, 0, { title: '促销品总额', dataIndex: 'totalPromoAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(10, 0, { title: '节省总额', dataIndex: 'totalEconomizeAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
       return arr
     }
   },

+ 2 - 2
src/views/promotionRulesManagement/productStatistics/detailModal.vue

@@ -92,13 +92,13 @@ export default {
         // { title: '节省金额小计', dataIndex: 'totalEconomizeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '促销类型', dataIndex: 'promotionRulesName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+
         arr.splice(2, 0, { title: '原价', dataIndex: 'origPrice', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(3, 0, { title: '促销价', dataIndex: 'price', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(6, 0, { title: '原价小计', dataIndex: 'priceSubtotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(7, 0, { title: '促销价小计', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(8, 0, { title: '节省金额小计', dataIndex: 'totalEconomizeAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
+   
       return arr
     }
   },

+ 4 - 4
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -55,7 +55,7 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
-          <span v-if="$hasPermissions('B_isShowPrice')">节省总金额:<strong>{{ productTotal && (productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? toThousands(productTotal.totalEconomizeAmount) : '--' }}</strong>,</span>
+          <span>节省总金额:<strong>{{ productTotal && (productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? toThousands(productTotal.totalEconomizeAmount) : '--' }}</strong>,</span>
           总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>
         </div>
       </a-alert>
@@ -164,9 +164,9 @@ export default {
         // { title: '节省金额', dataIndex: 'totalEconomizeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥' + text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(6, 0, { title: '节省金额', dataIndex: 'totalEconomizeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
+
+      arr.splice(6, 0, { title: '节省金额', dataIndex: 'totalEconomizeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+
       return arr
     }
   },

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/auditNoPassModal.vue

@@ -54,7 +54,7 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')) { //  成本价权限
         arr.splice(3, 0, { title: 'OCS成本价', dataIndex: 'verifyCost', width: '15%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(4, 0, { title: '金蝶成本价', dataIndex: 'productCost', width: '15%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }

+ 4 - 5
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -32,7 +32,7 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
-          <span v-if="$hasPermissions('B_isShowCost')">入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
+          <span v-if="$hasPermissions('B_sparePartsDetail_costPrice')">入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong></span>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -106,12 +106,11 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', scopedSlots: { customRender: 'productName' }, width: '40%', align: 'center', ellipsis: true },
         { title: '单位', dataIndex: 'unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库数量', dataIndex: 'productQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '入库单价', dataIndex: 'productCost',width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '小计', dataIndex: 'subtotal', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '入库数量', dataIndex: 'productQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('B_sparePartsDetail_costPrice')) { //  成本价权限
         arr.splice(5, 0, { title: '入库单价', dataIndex: 'productCost', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(6, 0, { title: '小计', dataIndex: 'subtotal', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }

+ 3 - 4
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -34,7 +34,7 @@
           <a-alert type="info" v-if="productTotal">
             <div slot="message">
               入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
-              <span v-if="$hasPermissions('B_isShowCost')">
+              <span v-if="$hasPermissions('B_sparePartsEdit_costPrice')">
                 入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>
               </span>
             </div>
@@ -161,12 +161,11 @@ export default {
         { title: '产品名称', scopedSlots: { customRender: 'productName' }, width: '25%', align: 'center' },
         { title: '单位', dataIndex: 'unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库数量', dataIndex: 'productQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '入库单价', dataIndex: 'productCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '小计', dataIndex: 'subtotal', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('B_sparePartsEdit_costPrice')) { //  成本价权限
         arr.splice(5, 0, { title: '入库单价', dataIndex: 'productCost', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(6,0,{ title: '小计', dataIndex: 'subtotal', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }

+ 2 - 2
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -217,7 +217,7 @@ export default {
 	      { title: '备注', dataIndex: 'remark', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
 	      { title: '操作', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }
 	    ]
-	    if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+	    if (this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')) { //  成本价权限
 	      arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
 	    }
 	    return arr
@@ -233,7 +233,7 @@ export default {
       const _this = this
       _this.exportLoading = true
       _this.spinning = true
-      hdExportExcel(sparePartsDetailExport, _this.queryParam, '散件入库明细', function () {
+      hdExportExcel(sparePartsDetailExport, {showCostFlag:this.$hasPermissions('B_sparePartsExport_costPrice'),..._this.queryParam}, '散件入库明细', function () {
         _this.exportLoading = false
         _this.spinning = false
         _this.showExport = true

+ 2 - 2
src/views/purchasingManagement/purchaseReturn/detailModal.vue

@@ -31,7 +31,7 @@
         <div slot="message">
           <span>产品款数:<strong>{{ statisticsObj&&statisticsObj.totalCategory|| '--' }}</strong>;</span>
           <span>申请退货总数量:<strong>{{ statisticsObj&&statisticsObj.qty||'--' }}</strong>;</span>
-          <span v-if="$hasPermissions('B_isShowCost')">退货金额:<strong>{{ statisticsObj&&statisticsObj.totalCost ? toThousands(statisticsObj.totalCost) : '--' }}</strong></span>
+          <span v-if="$hasPermissions('B_purchaseReturnDetail_costPrice')">退货金额:<strong>{{ statisticsObj&&statisticsObj.totalCost ? toThousands(statisticsObj.totalCost) : '--' }}</strong></span>
         </div>
       </a-alert>
       <s-table
@@ -107,7 +107,7 @@ export default {
         { title: '入库数量', dataIndex: 'putQty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '申请退货数量', dataIndex: 'qty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  售价权限
+      if (this.$hasPermissions('B_purchaseReturnDetail_costPrice')) { //  售价权限
         arr.splice(7, 0, { title: '退货单价', dataIndex: 'cost', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(9, 0, { title: '退货金额', dataIndex: 'totalCost', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }

+ 2 - 2
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -213,7 +213,7 @@ export default {
         { title: '审核状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  售价权限
+      if (this.$hasPermissions('M_purchaseReturnList_costPrice')) { //  售价权限
         arr.splice(6, 0, { title: '退货金额', dataIndex: 'totalCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
       return arr
@@ -230,7 +230,7 @@ export default {
       const _this = this
       _this.exportLoading = true
       _this.spinning = true
-      _this.queryParam.showCostFlag = this.$hasPermissions('B_isShowCost') ? 1 : 0
+      _this.queryParam.showCostFlag = this.$hasPermissions('B_purchaseReturnExport_costPrice') ? 1 : 0
       hdExportExcel(sparePartsReturnExportDetail, _this.queryParam, '采购退货', function () {
         _this.exportLoading = false
         _this.spinning = false

+ 2 - 2
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -50,7 +50,7 @@
           <div slot="message" class="total-bar">
             <div v-if="statisticsObj">
               <span>申请退货数量:{{ statisticsObj && (statisticsObj.qty || statisticsObj.qty == 0) ? statisticsObj.qty : '--' }};</span>
-              <span v-if="$hasPermissions('B_isShowCost')">退货金额:{{ statisticsObj && statisticsObj.totalCost || statisticsObj.totalCost == 0 ? statisticsObj.totalCost : '--' }};</span>
+              <span v-if="$hasPermissions('B_purchaseReturnEdit_costPrice')">退货金额:{{ statisticsObj && statisticsObj.totalCost || statisticsObj.totalCost == 0 ? statisticsObj.totalCost : '--' }};</span>
             </div>
           </div>
         </a-alert>
@@ -247,7 +247,7 @@ export default {
         { title: '申请退货数量', align: 'center', width: '13%', scopedSlots: { customRender: 'qty' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) {
+      if (this.$hasPermissions('B_purchaseReturnEdit_costPrice')) {
         arr.splice(6, 0, {
           title: '退货单价',
           dataIndex: 'cost',

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/queryPart.vue

@@ -160,7 +160,7 @@ export default {
         { title: '申请退货数量', width: '9%', align: 'center', scopedSlots: { customRender: 'qty' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) {
+      if (this.$hasPermissions('B_purchaseReturnEdit_costPrice')) {
         arr.splice(6, 0, { title: '入库单价', dataIndex: 'productCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } })
       }
       return arr

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

@@ -126,7 +126,7 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">实售销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <a-col span="6">实售销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -409,7 +409,7 @@ export default {
         }
         // { title: '实售销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_actualSalesReportList_salesPrice')) { //  售价权限
         arr.splice(arr.length, 0, { title: '实售销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
       }
       return arr

+ 21 - 13
src/views/reportData/allocationDetails/list.vue

@@ -137,9 +137,9 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? toThousands(totalData.totalGrossProfit) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">总售价:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_allocationDetailsList_costPrice')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_allocationDetailsList_salesPrice')&&$hasPermissions('M_allocationDetailsList_costPrice')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? toThousands(totalData.totalGrossProfit) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_allocationDetailsList_salesPrice')">总售价:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -274,6 +274,20 @@ export default {
         // { title: '售价', dataIndex: 'price', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总成本价', dataIndex: 'totalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+      ]
+      if (this.$hasPermissions('M_allocationDetailsList_costPrice')) { //  成本价权限
+        arr.push({ title: '成本价', dataIndex: 'cost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_allocationDetailsList_salesPrice')) { //  售价权限
+        arr.push({ title: '售价', dataIndex: 'price', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_allocationDetailsList_costPrice')) { //  成本价权限
+        arr.push({ title: '总成本价', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        if (this.$hasPermissions('M_allocationDetailsList_salesPrice')) {
+         arr.push({ title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        }
+      }
+      arr.concat([
         { title: '仓库', dataIndex: 'warehouseName', width: 90, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 90, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '操作员', dataIndex: 'creatorName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -284,16 +298,7 @@ export default {
         { title: '费用归属品类(二级)', dataIndex: 'costProductTypeName2', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用归属品类(三级)', dataIndex: 'costProductTypeName3', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用归属部门', dataIndex: 'departmentName', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
-      ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(12, 0, { title: '成本价', dataIndex: 'cost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(14, 0, { title: '总成本价', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(15, 0, { title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 13 : 12
-        arr.splice(ind, 0, { title: '售价', dataIndex: 'price', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
+      ])
       return arr
     }
   },
@@ -377,6 +382,9 @@ 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.showExport = true
           _this.exportLoading = true
           _this.spinning = true

+ 3 - 3
src/views/reportData/allocationOrderTotal/list.vue

@@ -75,8 +75,8 @@
         <template slot="footer" slot-scope="currentPageData">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? toThousands(totalData.totalGrossProfit) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_allocationOrderTotalList_costPrice')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_allocationOrderTotalList_costPrice')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? toThousands(totalData.totalGrossProfit) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -160,7 +160,7 @@ export default {
         // { title: '毛利', dataIndex: 'totalGrossProfit', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作员', dataIndex: 'creatorName', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_allocationOrderTotalList_costPrice')) { //  成本价权限
         arr.splice(4, 0, { title: '成本价', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(5, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }

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

@@ -235,9 +235,9 @@ export default {
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } }
       ]
       arr = arr.concat(this.atypeColList)
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(arr.length, 0, { title: '调拨单合计金额', width: 90, dataIndex: 'totalCost', align: 'right', customRender: function (text) { return (text || text == 0) ? text : '--' } })
-      }
+      // }
       return arr
     }
   },

+ 4 - 3
src/views/reportData/billingReturnReport/list.vue

@@ -124,7 +124,8 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <a-col span="6">开单退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <!-- <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col> -->
               </a-row>
             </a-col>
           </a-row>
@@ -386,9 +387,9 @@ export default {
         }
         // { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(arr.length, 0, { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
-      }
+      // }
       return arr
     }
   },

+ 8 - 7
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -110,12 +110,13 @@
         :scroll="{ x: 1850 }"
         bordered>
         <template slot="footer">
+          <!-- v-if="$hasPermissions('B_isShowPrice')" -->
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">分公司金额:{{ (totalData && (totalData.wholesalePrice1 || totalData.wholesalePrice1==0)) ? toThousands(totalData.wholesalePrice1) : '--' }}</a-col>
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">加盟商金额:{{ (totalData && (totalData.wholesalePrice2 || totalData.wholesalePrice2==0)) ? toThousands(totalData.wholesalePrice2) : '--' }}</a-col>
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">特约加盟店金额:{{ (totalData && (totalData.wholesalePrice3 || totalData.wholesalePrice3==0)) ? toThousands(totalData.wholesalePrice3) : '--' }}</a-col>
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">直接差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
-            <a-col :md="6" :sm="24" v-if="$hasPermissions('B_isShowPrice')">间接差价金额:{{ (totalData && (totalData.indirectRebateAmount || totalData.indirectRebateAmount==0)) ? toThousands(totalData.indirectRebateAmount) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" >分公司金额:{{ (totalData && (totalData.wholesalePrice1 || totalData.wholesalePrice1==0)) ? toThousands(totalData.wholesalePrice1) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" >加盟商金额:{{ (totalData && (totalData.wholesalePrice2 || totalData.wholesalePrice2==0)) ? toThousands(totalData.wholesalePrice2) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" >特约加盟店金额:{{ (totalData && (totalData.wholesalePrice3 || totalData.wholesalePrice3==0)) ? toThousands(totalData.wholesalePrice3) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" >直接差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
+            <a-col :md="6" :sm="24" >间接差价金额:{{ (totalData && (totalData.indirectRebateAmount || totalData.indirectRebateAmount==0)) ? toThousands(totalData.indirectRebateAmount) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -233,13 +234,13 @@ export default {
         // { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '类型', dataIndex: 'bizTypeValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(11, 0, { title: '分公司金额', dataIndex: 'wholesalePrice1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(12, 0, { title: '加盟商金额', dataIndex: 'wholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(13, 0, { title: '特约加盟店金额', dataIndex: 'wholesalePrice3', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(14, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(15, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
+      // }
       return arr
     }
   },

+ 6 - 5
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -67,17 +67,18 @@
         :defaultLoadData="false"
         bordered>
         <template slot="footer">
+          <!-- v-if="$hasPermissions('B_isShowPrice')" -->
           <table>
             <tr>
               <td width="51%" colspan="4"></td>
               <td width="8%">
-                <div v-if="$hasPermissions('B_isShowPrice')">实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</div>
+                <div>实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</div>
               </td>
               <td width="8%">
-                <div v-if="$hasPermissions('B_isShowPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</div>
+                <div>开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</div>
               </td>
               <td width="8%">
-                <div v-if="$hasPermissions('B_isShowPrice')">差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</div>
+                <div>差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</div>
               </td>
               <td width="25%" colspan="2"></td>
             </tr>
@@ -161,11 +162,11 @@ export default {
         { title: '产品品牌+二级分类', dataIndex: 'productBrandAndType2', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '类型', dataIndex: 'bizType', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(4, 0, { title: '实售金额', dataIndex: 'totalRealAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(5, 0, { title: '开单金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(6, 0, { title: '差价金额', dataIndex: 'rebateAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
+      // }
       return arr
     }
   },

+ 4 - 3
src/views/reportData/returnGoodsPresentation/list.vue

@@ -132,7 +132,8 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <!-- v-if="$hasPermissions('B_isShowPrice')" -->
+                <a-col span="6">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -420,9 +421,9 @@ export default {
         }
         // { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
-      }
+      // }
       return arr
     }
   },

+ 4 - 3
src/views/reportData/returnSlipReport/list.vue

@@ -132,7 +132,8 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单退货单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <!-- v-if="$hasPermissions('B_isShowPrice')" -->
+                <a-col span="6">开单退货单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -428,9 +429,9 @@ export default {
         }
         // { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(arr.length, 0, { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
-      }
+      // }
       return arr
     }
   },

+ 4 - 3
src/views/reportData/salesAmountReport/list.vue

@@ -124,7 +124,8 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <!-- v-if="$hasPermissions('B_isShowPrice')" -->
+                <a-col span="6">开单销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -387,9 +388,9 @@ export default {
         }
         // { title: '开单销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(arr.length, 0, { title: '开单销售合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
-      }
+      // }
       return arr
     }
   },

+ 24 - 16
src/views/reportData/salesDetails/list.vue

@@ -146,11 +146,11 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">数量:{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">成本:{{ (totalData && (totalData.totalRealCost || totalData.totalRealCost==0)) ? toThousands(totalData.totalRealCost) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折后金额:{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? toThousands(totalData.discountedAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折扣金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_costPrice')">成本:{{ (totalData && (totalData.totalRealCost || totalData.totalRealCost==0)) ? toThousands(totalData.totalRealCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">折后金额:{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? toThousands(totalData.discountedAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">折扣金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -265,21 +265,24 @@ export default {
         // { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '折后单价', dataIndex: 'discountedPrice', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作员', dataIndex: 'operatorName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_salesDetailsList_costPrice')) { //  成本价权限
         arr.splice(15, 0, { title: '成本价', dataIndex: 'totalRealCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 16 : 15
-        arr.splice(ind, 0, { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 1, 0, { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 2, 0, { title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 3, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 4, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 5, 0, { title: '折后单价', dataIndex: 'discountedPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 6, 0, { title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      if (this.$hasPermissions('M_salesDetailsList_salesPrice')) { //  售价权限
+        arr.push({ title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      } 
+      if (this.$hasPermissions('M_salesDetailsList_cityPrice')) { //  市级价权限
+        arr.push({ title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
+      if (this.$hasPermissions('M_salesDetailsList_salesPrice')) { //  售价权限  
+        arr.push({ title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '折后单价', dataIndex: 'discountedPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      arr.push({ title: '操作员', dataIndex: 'operatorName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
       return arr
     }
   },
@@ -355,6 +358,11 @@ 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.showExport = true
           _this.exportLoading = true
           _this.spinning = true

+ 38 - 24
src/views/reportData/salesOrderTotal/list.vue

@@ -108,13 +108,13 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? toThousands(totalData.totalDiscountAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">折后金额:{{ (totalData && (totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0)) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')">成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')&&$hasPermissions('M_salesOrderTotalList_salesPrice')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? toThousands(totalData.totalDiscountAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折后金额:{{ (totalData && (totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0)) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -214,26 +214,35 @@ export default {
         // { title: '返利', dataIndex: 'rebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作员', dataIndex: 'operatorName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        const ind = this.$hasPermissions('B_isShowPrice') ? 10 : 8
-        arr.splice(ind, 0, { title: '成本价', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 1, 0, { title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      if(this.$hasPermissions('M_salesOrderTotalList_salesPrice')){
+          arr.push({ title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+          arr.push({ title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 12 : 10
-        arr.splice(8, 0, { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(9, 0, { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind, 0, { title: '省级价', dataIndex: 'totalProvinceAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 1, 0, { title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 2, 0, { title: '特约加盟店价', dataIndex: 'totalSpecialAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 3, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 4, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 5, 0, { title: '返利', dataIndex: 'rebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 6, 0, { title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 7, 0, { title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      if (this.$hasPermissions('M_salesOrderTotalList_costPrice')) { //  成本价权限
+        arr.push({ title: '成本价', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        if(this.$hasPermissions('M_salesOrderTotalList_salesPrice')){
+           arr.push({ title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        }
+      }
+      if(this.$hasPermissions('M_salesOrderTotalList_provincePrice')){
+        arr.push({ title: '省级价', dataIndex: 'totalProvinceAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if(this.$hasPermissions('M_salesOrderTotalList_cityPrice')){
+        arr.push({ title: '市级价', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if(this.$hasPermissions('M_salesOrderTotalList_specialPrice')){
+        arr.push({ title: '特约加盟店价', dataIndex: 'totalSpecialAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if(this.$hasPermissions('M_salesOrderTotalList_salesPrice')){
+        arr.push({ title: '直接差价', dataIndex: 'directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '间接差价', dataIndex: 'indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '返利', dataIndex: 'rebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
+      arr.push({ title: '操作员', dataIndex: 'operatorName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       return arr
     }
   },
@@ -300,6 +309,11 @@ 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.showExport = true
           _this.exportLoading = true
           _this.spinning = true

+ 4 - 3
src/views/reportData/salesPresentation/list.vue

@@ -132,7 +132,8 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <!-- v-if="$hasPermissions('B_isShowPrice')" -->
+                <a-col span="6">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -421,9 +422,9 @@ export default {
         }
         // { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(arr.length, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
-      }
+      // }
       return arr
     }
   },

+ 26 - 21
src/views/reportData/salesReturnDetailReport/list.vue

@@ -145,16 +145,16 @@
         bordered>
         <template slot="footer">
           <a-row :gutter="15">
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单退货金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">开单退货金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24">仓库实收数量:{{ (totalData && (totalData.receiveQty || totalData.receiveQty==0)) ? totalData.receiveQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">坏件数量:{{ (totalData && (totalData.totalBadQty || totalData.totalBadQty==0)) ? totalData.totalBadQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">良品数量:{{ (totalData && (totalData.goodQty || totalData.goodQty==0)) ? totalData.goodQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">返库数量:{{ (totalData && (totalData.totalBackStockQty || totalData.totalBackStockQty==0)) ? totalData.totalBackStockQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">正常退货数量:{{ (totalData && (totalData.totalNormalQty || totalData.totalNormalQty==0)) ? totalData.totalNormalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">正常退货金额:{{ (totalData && (totalData.totalNormalPrice || totalData.totalNormalPrice==0)) ? toThousands(totalData.totalNormalPrice) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">正常再入库金额:{{ (totalData && (totalData.totalNormalCost || totalData.totalNormalCost==0)) ? toThousands(totalData.totalNormalCost) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">正常退货入库差额:{{ (totalData && (totalData.totalNormalBalance || totalData.totalNormalBalance==0)) ? toThousands(totalData.totalNormalBalance) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">正常退货金额:{{ (totalData && (totalData.totalNormalPrice || totalData.totalNormalPrice==0)) ? toThousands(totalData.totalNormalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">正常再入库金额:{{ (totalData && (totalData.totalNormalCost || totalData.totalNormalCost==0)) ? toThousands(totalData.totalNormalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">正常退货入库差额:{{ (totalData && (totalData.totalNormalBalance || totalData.totalNormalBalance==0)) ? toThousands(totalData.totalNormalBalance) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -277,28 +277,31 @@ export default {
         // { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '再入库单价', dataIndex: 'cost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '正常退货数量', dataIndex: 'normalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        // { title: '正常退货数量', dataIndex: 'normalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
 
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 29 : 28
-        arr.splice(20, 0, { title: '退货开单价', dataIndex: 'price', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(21, 0, { title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(22, 0, { title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(23, 0, { title: '退货实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(24, 0, { title: '市级价金额', dataIndex: 'totalWholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(25, 0, { title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(26, 0, { title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind, 0, { title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) { //  售价权限
+        arr.push({ title: '退货开单价', dataIndex: 'price', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '退货开单金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '退货实售价', dataIndex: 'realPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '退货实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      } 
+      if (this.$hasPermissions('M_salesReturnDetailReportList_cityPrice')) { 
+        arr.push({ title: '市级价金额', dataIndex: 'totalWholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        const ind = this.$hasPermissions('B_isShowPrice') ? 27 : 20
-        arr.splice(ind, 0, { title: '再入库单价', dataIndex: 'cost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 3, 0, { title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(ind + 4, 0, { title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) {   
+        arr.push({ title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '再入库单价', dataIndex: 'cost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      arr.push({ title: '正常退货数量', dataIndex: 'normalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) {  //  价权限
+        arr.push({ title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -375,6 +378,8 @@ 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.showExport = true
           _this.exportLoading = true
           _this.spinning = true

+ 4 - 3
src/views/reportData/salesReturnReport/list.vue

@@ -126,7 +126,8 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">实售退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <!-- v-if="$hasPermissions('B_isShowPrice')" -->
+                <a-col span="6">实售退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -407,9 +408,9 @@ export default {
           ] }
         // { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(arr.length, 0, { title: '实售退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'right', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
-      }
+      // }
       return arr
     }
   },

+ 30 - 15
src/views/reportData/salesReturnsReport/list.vue

@@ -112,11 +112,11 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">开单退货金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">经销商金额:{{ (totalData && (totalData.totalWholesalePrice2 || totalData.totalWholesalePrice2==0)) ? toThousands(totalData.totalWholesalePrice2) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">服务中心金额:{{ (totalData && (totalData.totalWholesalePrice1 || totalData.totalWholesalePrice1==0)) ? toThousands(totalData.totalWholesalePrice1) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">特约加盟店金额:{{ (totalData && (totalData.totalWholesalePrice3 || totalData.totalWholesalePrice3==0)) ? toThousands(totalData.totalWholesalePrice3) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_salesPrice')">开单退货金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_salesPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_provincePrice')">经销商金额:{{ (totalData && (totalData.totalWholesalePrice2 || totalData.totalWholesalePrice2==0)) ? toThousands(totalData.totalWholesalePrice2) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_cityPrice')">服务中心金额:{{ (totalData && (totalData.totalWholesalePrice1 || totalData.totalWholesalePrice1==0)) ? toThousands(totalData.totalWholesalePrice1) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_specialPrice')">特约加盟店金额:{{ (totalData && (totalData.totalWholesalePrice3 || totalData.totalWholesalePrice3==0)) ? toThousands(totalData.totalWholesalePrice3) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -212,18 +212,28 @@ export default {
         // { title: '实售退货金额', dataIndex: 'totalRealAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '直接差价', dataIndex: 'totalDirectRebate', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '间接差价', dataIndex: 'totalIndirectRebate', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '坏件数量', dataIndex: 'totalBadQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作员', dataIndex: 'operatorName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(7, 0, { title: '开单退货金额', dataIndex: 'totalAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(8, 0, { title: '经销商价', dataIndex: 'totalWholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(9, 0, { title: '服务中心价', dataIndex: 'totalWholesalePrice1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(10, 0, { title: '特约加盟店价', dataIndex: 'totalWholesalePrice3', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(11, 0, { title: '实售退货金额', dataIndex: 'totalRealAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(12, 0, { title: '直接差价', dataIndex: 'totalDirectRebate', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(13, 0, { title: '间接差价', dataIndex: 'totalIndirectRebate', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      if (this.$hasPermissions('M_salesReturnsReportList_salesPrice')) { //  售价权限
+        arr.push({ title: '开单退货金额', dataIndex: 'totalAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_salesReturnsReportList_provincePrice')) {
+        arr.push({ title: '经销商价', dataIndex: 'totalWholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_salesReturnsReportList_cityPrice')) {
+        arr.push({ title: '服务中心价', dataIndex: 'totalWholesalePrice1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_salesReturnsReportList_specialPrice')) {
+        arr.push({ title: '特约加盟店价', dataIndex: 'totalWholesalePrice3', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
+      if (this.$hasPermissions('M_salesReturnsReportList_salesPrice')) {
+        arr.push({ title: '实售退货金额', dataIndex: 'totalRealAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '直接差价', dataIndex: 'totalDirectRebate', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '间接差价', dataIndex: 'totalIndirectRebate', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      arr.concat([
+        { title: '坏件数量', dataIndex: 'totalBadQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作员', dataIndex: 'operatorName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+      ])
       return arr
     }
   },
@@ -234,6 +244,11 @@ 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.showExport = true
           _this.exportLoading = true
           _this.spinning = true

+ 4 - 3
src/views/reportData/salesSlipReport/list.vue

@@ -132,7 +132,8 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? toThousands(totalData.lbstAmount) : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? toThousands(totalData.defAmount) : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? toThousands(totalData.bndAmount) : '--' }}</a-col>
-                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+                <!-- v-if="$hasPermissions('B_isShowPrice')" -->
+                <a-col span="6">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -428,9 +429,9 @@ export default {
           ] }
         // { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ?  _this.toThousands(text) : '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(7, 0, { title: '开单销售单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } })
-      }
+      // }
       return arr
     }
   },

+ 10 - 8
src/views/reportData/transferReturnDetailReport/list.vue

@@ -141,8 +141,8 @@
             <a-col :md="4" :sm="24">退货总数量:{{ (totalData && (totalData.returnQty || totalData.returnQty==0)) ? totalData.returnQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">坏件总数量:{{ (totalData && (totalData.badQty || totalData.badQty==0)) ? totalData.badQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">返库总数量:{{ (totalData && (totalData.backStockQty || totalData.backStockQty==0)) ? totalData.backStockQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_transferReturnDetailReportList_salesPrice')">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_transferReturnDetailReportList_costPrice')">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -267,14 +267,15 @@ export default {
         { title: '退货数量', dataIndex: 'returnQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'backStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货单价', dataIndex: 'price', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '退货金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.push({ title: '退货入库成本', dataIndex: 'totalCost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      if (this.$hasPermissions('M_transferReturnDetailReportList_salesPrice')) { //  售价权限
+        arr.push({ title: '退货单价', dataIndex: 'price', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '退货金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_transferReturnDetailReportList_costPrice')) { //  成本价权限
+        arr.push({ title: '退货入库成本', dataIndex: 'totalCost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
+      
       return arr
     }
   },
@@ -358,7 +359,8 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showCostFlag = this.$hasPermissions('B_isShowCost')
+          params.showPriceFlag = this.$hasPermissions('M_transferReturnDetailReportExport_salesPrice')
+          params.showCostFlag = this.$hasPermissions('M_transferReturnDetailReportExport_costPrice')
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true

+ 9 - 5
src/views/reportData/transferReturnReport/list.vue

@@ -100,8 +100,8 @@
             <a-col :md="4" :sm="24">退货总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">坏件总数量:{{ (totalData && (totalData.totalBadQty || totalData.totalBadQty==0)) ? totalData.totalBadQty : '--' }}</a-col>
             <a-col :md="4" :sm="24">返库总数量:{{ (totalData && (totalData.totalBackStockQty || totalData.totalBackStockQty==0)) ? totalData.totalBackStockQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_transferReturnReportList_salesPrice')">退货总金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_transferReturnReportList_costPrice')">退货总成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -189,10 +189,13 @@ export default {
         { title: '退货总数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货总金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        // { title: '退货总金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
         // { title: '退货总成本', dataIndex: 'totalCost', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_transferReturnReportList_salesPrice')) { //  金额权限
+        arr.push({ title: '退货总金额', dataIndex: 'totalPrice', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_transferReturnReportList_costPrice')) { //  成本价权限
         arr.push({ title: '退货总成本', dataIndex: 'totalCost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
@@ -211,7 +214,8 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
-          params.showCostFlag = this.$hasPermissions('B_isShowCost')
+          params.showPriceFlag = this.$hasPermissions('M_transferReturnReportExport_salesPrice')
+          params.showCostFlag = this.$hasPermissions('M_transferReturnReportExport_costPrice')
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true

+ 4 - 4
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -151,7 +151,7 @@
           </span>
           <span v-else>--</span>
         </template>
-        <!-- <template slot="footer" v-if="totalData && $hasPermissions('B_isShowCost')">
+        <!-- <template slot="footer" v-if="totalData && $hasPermissions('M_urchaseDetailReturnList_costPrice')">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
@@ -187,7 +187,7 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">申请退货数量:{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost,2) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_urchaseDetailReturnList_costPrice')">退货金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost,2) : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -300,7 +300,7 @@ export default {
         { title: '操作员', dataIndex: 'submitorName', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
 
-      if (_this.$hasPermissions('B_isShowCost')) {
+      if (_this.$hasPermissions('M_urchaseDetailReturnList_costPrice')) {
         arr.splice(15, 0, { title: '入库单价', dataIndex: 'cost', width: 60, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
         arr.splice(19, 0, { title: '退货金额', dataIndex: 'totalCost', width: 60, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
@@ -378,7 +378,7 @@ export default {
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
-          params.showCostFlag = _this.$hasPermissions('B_isShowCost') ? 1 : 0
+          params.showCostFlag = _this.$hasPermissions('B_urchaseDetailReturn_export_costPrice') ? 1 : 0
           hdExportExcel(sparePartsReturnReportExportDetail, params, '采购退货明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false

+ 3 - 3
src/views/reportData/urchaseReturn/list.vue

@@ -83,7 +83,7 @@
         <template slot="footer">
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">申请退货数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">退货金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0))?totalData.totalCost : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_urchaseReturnList_costPrice')">退货金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0))?totalData.totalCost : '--' }}</a-col>
           </a-row>
         </template>
       </s-table>
@@ -161,7 +161,7 @@ export default {
         { title: '申请退货数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作员', dataIndex: 'submitorName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  售价权限
+      if (this.$hasPermissions('M_urchaseReturnList_costPrice')) { //  售价权限
         arr.splice(8, 0, { title: '退货金额', dataIndex: 'totalCost', width: 60, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
       return arr
@@ -177,7 +177,7 @@ export default {
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
-          params.showCostFlag = _this.$hasPermissions('B_isShowCost') ? 1 : 0
+          params.showCostFlag = _this.$hasPermissions('B_urchaseReturn_Export_costPrice') ? 1 : 0
           hdExportExcel(sparePartsReturnReportExport, params, '采购退货单报表', function () {
             _this.exportLoading = false
             _this.spinning = false

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

@@ -92,7 +92,7 @@
             <a-col :md="4" :sm="24">
               总数量:{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}
             </a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_warehousingOrderList_costPrice')">
               总金额:{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}
             </a-col>
           </a-row>
@@ -171,7 +171,7 @@ export default {
         { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_warehousingOrderList_costPrice')) { //  成本价权限
         arr.splice(4, 0, { title: '入库金额', dataIndex: 'productTotalCost', width: '11%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
@@ -232,6 +232,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          params.showCostFlag = this.$hasPermissions('B_warehousingOrderExport_costPrice')
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true

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

@@ -102,7 +102,7 @@
             <a-col :md="4" :sm="24">
               总数量:{{ (totalData && (totalData.totalPutQty || totalData.totalPutQty==0)) ? totalData.totalPutQty : '--' }}
             </a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowCost')">
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_warehousingOrderDetailList_costPrice')">
               总金额:{{ (totalData && (totalData.totalPutAmount || totalData.totalPutAmount==0)) ? totalData.totalPutAmount : '--' }}
             </a-col>
           </a-row>
@@ -187,7 +187,7 @@ export default {
         { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '完成日期', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_warehousingOrderDetailList_costPrice')) { //  成本价权限
         arr.splice(7, 0, { title: '进价', dataIndex: 'putCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(8, 0, { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
@@ -250,6 +250,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = this.queryParam
+          params.showCostFlag = this.$hasPermissions('B_warehousingOrderDetailExport_costPrice')
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true

+ 2 - 2
src/views/salesManagement/backorder/detailModal.vue

@@ -29,7 +29,7 @@
           <div slot="message">
             缺货总款数:<strong>{{ detailData && (detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }}</strong>,
             缺货总数量:<strong>{{ detailData && (detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>,
-            <span v-if="$hasPermissions('B_isShowPrice')">缺货总售价:<strong>{{ detailData && (detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong></span>
+            <span v-if="$hasPermissions('B_oosDetail_salesPrice')">缺货总售价:<strong>{{ detailData && (detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong></span>
           </div></a-alert>
         <!-- 列表 -->
         <s-table
@@ -105,7 +105,7 @@ export default {
         { title: '单位', dataIndex: 'productEntity.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_oosDetail_salesPrice')) { //  售价权限
         arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 1 - 1
src/views/salesManagement/backorder/list.vue

@@ -107,7 +107,7 @@ export default {
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_backorderList_salesPrice')) { //  售价权限
         arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 2 - 2
src/views/salesManagement/examineVerify/list.vue

@@ -80,7 +80,7 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
-          <span v-if="$hasPermissions('B_isShowPrice')">总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
+          <span v-if="$hasPermissions('M_examineVerifyList_salesPrice')">总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
           总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
           总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
           总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
@@ -225,7 +225,7 @@ export default {
         { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_examineVerifyList_salesPrice')) { //  售价权限
         arr.splice(8, 0, { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

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

@@ -81,7 +81,6 @@
                       <Area id="matchSoo-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                     </a-form-model-item>
                   </a-form-model-item>
-                  </a-form-model-item>
                 </a-col>
               </template>
               <a-col :md="6" :sm="24">
@@ -229,7 +228,7 @@ export default {
         { title: '对单时间', dataIndex: 'checkDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_matchSendOutOrderList_salesPrice')) { //  售价权限
         arr.splice(9, 0, { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 1 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -252,7 +252,7 @@ export default {
         { title: '发货状态', dataIndex: 'sendFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_outboundOrderList_salesPrice')) { //  售价权限
         arr.splice(7, 0, { title: '售价', dataIndex: 'productTotalPrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 12 - 12
src/views/salesManagement/priceInquiry/list.vue

@@ -195,20 +195,20 @@ export default {
         { title: '产品名称', dataIndex: 'name', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '省级价', dataIndex: 'provincePrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '终端价', dataIndex: 'terminalPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '车主价', dataIndex: 'carOwnersPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(4, 0, { title: '省级价', dataIndex: 'provincePrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(5, 0, { title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(6, 0, { title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(7, 0, { title: '终端价', dataIndex: 'terminalPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(8, 0, { title: '车主价', dataIndex: 'carOwnersPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      if (this.$hasPermissions('M_priceInquiryList_provincePrice')) { //  售价权限
+        arr.push({ title: '省级价', dataIndex: 'provincePrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
+      if (this.$hasPermissions('M_priceInquiryList_cityPrice')) { //  售价权限
+        arr.push({ title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
+      if (this.$hasPermissions('M_priceInquiryList_specialPrice')) { //  售价权限
+        arr.push({ title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
+       
+        arr.push({ title: '终端价', dataIndex: 'terminalPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.push({ title: '车主价', dataIndex: 'carOwnersPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.push({ title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '8%', align: 'center' })
       return arr
     }
   },

+ 4 - 3
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -73,8 +73,8 @@
               总销售数量:<strong>{{ detailData&&(detailData.totalSalesQty || detailData.totalSalesQty==0) ? detailData.totalSalesQty : '--' }}</strong>;
             </span>
             本次下推数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
-            <span v-if="$hasPermissions('B_isShowPrice')">本次下推金额:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;</span>
-            <span v-if="$route.params.type!='stockOut'">
+            <span v-if="$hasPermissions('B_dispatchDetail_salesPrice')">本次下推金额:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;</span>
+            <span v-if="$route.params.type!='stockOut'&&$hasPermissions('B_dispatchDetail_cityPrice')">
               本次下推市级价金额:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? toThousands(detailData.totalCityAmount) : '--' }}</strong>;
             </span>
           </div>
@@ -199,7 +199,7 @@ export default {
         { title: '本次下推数', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '本次下推金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_dispatchDetail_salesPrice')) { //  售价权限
         arr.splice(5, 0, { title: '销售价格', dataIndex: 'price', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(6, 0, { title: '市级销售价格', dataIndex: 'cityPrice', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(9, 0, { title: '本次下推金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
@@ -228,6 +228,7 @@ export default {
       const params = {
         dispatchBillSn: this.outBizSubSn || this.bizSn || this.$route.params.sn,
         printType: priceType,
+        showPriceFlag: this.$hasPermissions('B_dispatchExport_salesPrice'),
         ...data
       }
       this.spinning = true

+ 2 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -106,7 +106,7 @@
         <div slot="message">
           下推总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
           下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
-          <span v-if="$hasPermissions('B_isShowPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
+          <span v-if="$hasPermissions('M_pushOrderManagementList_salesPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -285,7 +285,7 @@ export default {
         { title: '出库时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_pushOrderManagementList_salesPrice')) { //  售价权限
         arr.splice(10, 0, { title: '总售价', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 2 - 2
src/views/salesManagement/salesCollection/list.vue

@@ -192,7 +192,7 @@
         @ok="handleSaveColle"
       >
         <div style="text-align: center;line-height: 24px;">
-          <div v-if="handlePlData.length">{{ handlePlData[0].settleClientName }},共 {{ handlePlData && handlePlData.length }} 个备货单,合计 {{ toThousands(totalAmount) }} 元</div>
+          <div v-if="handlePlData.length">{{ handlePlData[0].settleClientName }},共 {{ handlePlData && handlePlData.length }} 个备货单,合计 {{ $hasPermissions('B_salesCollection_receipt_salesPrice') ? toThousands(totalAmount) : '--' }} 元</div>
           <div style="padding: 15px 0;font-weight: bold;font-size:14px;">请确认收款类型变更为标记收款吗?</div>
         </div>
       </commonModal>
@@ -323,7 +323,7 @@ export default {
         { title: '对单状态', dataIndex: 'checkStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '4%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_salesCollectionList_salesPrice')) { //  售价权限
         arr.splice(9, 0, { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 1 - 1
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -38,7 +38,7 @@
               {{ detail.qty }}
             </a-descriptions-item>
             <a-descriptions-item label="总售价">
-              {{ toThousands(detail.totalAmount) }}
+              {{ $hasPermissions('B_salesCollection_record_salesPrice') ? toThousands(detail.totalAmount) : '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="业务状态">
               {{ detail.billStatusDictValue || '--' }}

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -182,7 +182,7 @@
         <a-alert type="info" style="margin-bottom: 10px;">
           <div slot="message" class="total-bar">
             <div>
-              <span v-if="$hasPermissions('B_isShowCost')">总成本:<strong>{{ detailData&&(detailData.totalPromoCost || detailData.totalPromoCost==0) ? toThousands(detailData.totalPromoCost) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions('B_salesEdit_costPrice')">总成本:<strong>{{ detailData&&(detailData.totalPromoCost || detailData.totalPromoCost==0) ? toThousands(detailData.totalPromoCost) : '--' }}</strong>;</span>
               总款数:<strong>{{ detailData&&(detailData.totalPromoCategory || detailData.totalPromoCategory==0) ? detailData.totalPromoCategory : '--' }}</strong>;
               总数量:<strong>{{ detailData&&(detailData.totalPromoQty || detailData.totalPromoQty==0) ? detailData.totalPromoQty : '--' }}</strong>;
             </div>

+ 7 - 5
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -108,14 +108,14 @@
             总单数:<strong>{{ productTotal && (productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--' }}</strong>,
             缺货总款数:<strong>{{ productTotal && (productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong>,
             缺货总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
-            <span v-if="$hasPermissions('B_isShowPrice')">缺货总金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong></span>
+            <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">缺货总金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong></span>
           </div>
           <div>
             本页客户数:<strong>{{ currentTotal && (currentTotal.totalBuyerQty || currentTotal.totalBuyerQty==0) ? currentTotal.totalBuyerQty : '--' }}</strong>,
             本页总单数:<strong>{{ currentTotal && (currentTotal.totalRecord || currentTotal.totalRecord==0) ? currentTotal.totalRecord : '--' }}</strong>,
             本页缺货总款数:<strong>{{ currentTotal && (currentTotal.totalCategory || currentTotal.totalCategory==0) ? currentTotal.totalCategory : '--' }}</strong>,
             本页缺货总数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
-            <span v-if="$hasPermissions('B_isShowPrice')">本页缺货总金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong></span>
+            <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">本页缺货总金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong></span>
           </div>
         </div></a-alert>
       <!-- 列表 -->
@@ -239,11 +239,11 @@ export default {
         { title: '缺货说明', dataIndex: 'productEntity.offlineReasonType', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '通用编码', dataIndex: 'productEntity.commonCode', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      if (this.$hasPermissions('M_shortageStatisticsCList_costPrice')) { //  成本价权限
         arr.splice(13, 0, { title: '缺货成本金额', dataIndex: 'totalCostAmount', width: 90, align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        const ind = this.$hasPermissions('B_isShowCost') ? 14 : 13
+      if (this.$hasPermissions('M_shortageStatisticsCList_salesPrice')) { //  售价权限
+        const ind = this.$hasPermissions('M_shortageStatisticsCList_costPrice') ? 14 : 13
         arr.splice(ind, 0, { title: '缺货实售金额', dataIndex: 'totalSalesAmount', width: 90, align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 1, 0, { title: '缺货开单金额', dataIndex: 'totalAmount', width: 90, align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
@@ -311,6 +311,8 @@ export default {
     handleExport () {
       const _this = this
       const params = this.queryParam
+      params.showCostFlag = this.$hasPermissions('M_shortageStatisticsCList_costPrice')
+      params.showPriceFlag = this.$hasPermissions('M_shortageStatisticsCList_salesPrice')
       this.exportLoading = true
       _this.spinning = true
       oosDetailExport(params).then(res => {

+ 8 - 3
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -52,11 +52,15 @@
         <div slot="message">
           <div>
             总缺货数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
-            总缺货金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong>
+            <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
+              总缺货金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong>
+            </span>
           </div>
           <div>
             本页缺货数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
-            本页缺货金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong>
+            <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
+              本页缺货金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong>
+            </span>
           </div>
         </div></a-alert>
       <!-- 列表 -->
@@ -145,7 +149,7 @@ export default {
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '客户名称', dataIndex: 'buyerName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_shortageStatisticsPList_salesPrice')) { //  售价权限
         arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
@@ -181,6 +185,7 @@ export default {
     handleExport () {
       const _this = this
       const params = this.queryParam
+      params.showPriceFlag = this.$hasPermissions('M_shortageStatisticsPList_salesPrice')
       this.exportLoading = true
       _this.spinning = true
       oosDetailExportByProduct(params).then(res => {

+ 1 - 1
src/views/salesManagement/stockPrint/list.vue

@@ -283,7 +283,7 @@ export default {
         { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('M_stockPrintList_salesPrice')) { //  售价权限
         arr.splice(9, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(10, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(11, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })

+ 9 - 9
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -63,12 +63,12 @@
         已取消数量:<strong>{{ detailData&&(detailData.totalCancelQty || detailData.totalCancelQty==0) ? detailData.totalCancelQty : '--' }}</strong>;
         已下推数量:<strong>{{ detailData&&(detailData.totalPushedQty || detailData.totalPushedQty==0) ? detailData.totalPushedQty : '--' }}</strong>;
         待下推数量:<strong>{{ detailData&&(detailData.totalUnpushedQty || detailData.totalUnpushedQty==0) ? detailData.totalUnpushedQty : '--' }}</strong>;<br/>
-        <span v-if="$hasPermissions('B_isShowPrice')">总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;</span>
-        <span v-if="$hasPermissions('B_isShowCost')">总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;</span>
-        <span v-if="$hasPermissions('B_isShowCost')">总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;</span>
-        <span v-if="$hasPermissions('B_isShowPrice')">已取消金额:<strong>{{ detailData&&(detailData.totalCancelAmount || detailData.totalCancelAmount==0) ? toThousands(detailData.totalCancelAmount) : '--' }}</strong>;</span>
-        <span v-if="$hasPermissions('B_isShowPrice')">已下推金额:<strong>{{ detailData&&(detailData.totalPushedAmount || detailData.totalPushedAmount==0) ? toThousands(detailData.totalPushedAmount) :'--' }}</strong>;</span>
-        <span v-if="$hasPermissions('B_isShowPrice')">待下推金额:<strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? toThousands(detailData.totalUnpushedAmount) : '--' }}</strong>;</span>
+        <span v-if="$hasPermissions('B_salesDispatch_salesPrice')">总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;</span>
+        <span v-if="$hasPermissions('B_salesDispatch_costPrice')">总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;</span>
+        <span v-if="$hasPermissions('B_salesDispatch_costPrice')&&$hasPermissions('B_salesDispatch_salesPrice')">总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;</span>
+        <span v-if="$hasPermissions('B_salesDispatch_salesPrice')">已取消金额:<strong>{{ detailData&&(detailData.totalCancelAmount || detailData.totalCancelAmount==0) ? toThousands(detailData.totalCancelAmount) : '--' }}</strong>;</span>
+        <span v-if="$hasPermissions('B_salesDispatch_salesPrice')">已下推金额:<strong>{{ detailData&&(detailData.totalPushedAmount || detailData.totalPushedAmount==0) ? toThousands(detailData.totalPushedAmount) :'--' }}</strong>;</span>
+        <span v-if="$hasPermissions('B_salesDispatch_salesPrice')">待下推金额:<strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? toThousands(detailData.totalUnpushedAmount) : '--' }}</strong>;</span>
       </div>
     </a-alert>
 
@@ -216,11 +216,11 @@ export default {
         { title: '取消数量', dataIndex: 'cancelNums', scopedSlots: { customRender: 'nums' }, width: '7%', align: 'center' },
         { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_salesDispatch_salesPrice')) { //  售价权限
         arr.splice(3, 0, { title: '销售价', dataIndex: 'price', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
-      if (this.$hasPermissions('B_isShowCost')) {
-        const ind = this.$hasPermissions('B_isShowPrice') ? 4 : 3
+      if (this.$hasPermissions('B_salesDispatch_costPrice')) {
+        const ind = this.$hasPermissions('B_salesDispatch_salesPrice') ? 4 : 3
         arr.splice(ind, 0, { title: '成本价', dataIndex: 'showCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 1 - 1
src/views/salesReturnManagement/custConfirm/list.vue

@@ -287,7 +287,7 @@ export default {
         { title: '退货原因', dataIndex: 'returnReason', width: '20%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_salesReturnConfirm_salesPrice')) { //  售价权限
         arr.splice(9, 0, { title: '实际退货单价', dataIndex: 'price', align: 'right', width: '10%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(10, 0, { title: '实际退货金额', dataIndex: 'totalAmount', align: 'right', width: '10%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }

+ 2 - 2
src/views/salesReturnManagement/salesReturn/detail.vue

@@ -72,7 +72,7 @@
                   <span>坏件数量:{{ detailData&&(detailData.totalBadQty || detailData.totalBadQty==0) ? detailData.totalBadQty : '--' }};</span>
                   <span>良品数量:{{ detailData&&(detailData.totalGoodQty || detailData.totalGoodQty==0) ? detailData.totalGoodQty : '--' }};</span>
                   <span>返库数量:{{ detailData&&(detailData.totalBackStockQty || detailData.totalBackStockQty==0) ? detailData.totalBackStockQty : '--' }};</span>
-                  <span v-if="$hasPermissions('B_isShowPrice')">
+                  <span v-if="$hasPermissions('B_salesReturnDetail_salesPrice')">
                     参考退货金额:{{ detailData&&(detailData.initialAmount || detailData.initialAmount==0) ? toThousands(detailData.initialAmount) : '--' }};
                     实际退货金额:{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }};
                   </span>
@@ -205,7 +205,7 @@ export default {
         { title: '退货原因', dataIndex: 'returnReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '实际退货单价说明', dataIndex: 'priceRemark', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowPrice') && this.showFlag != 0) { //  售价权限
+      if (this.$hasPermissions('B_salesReturnDetail_salesPrice') && this.showFlag != 0) { //  售价权限
         arr.splice(10, 0, { title: '参考退货单价', dataIndex: 'initialPrice', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(11, 0, { title: '参考退货金额', dataIndex: 'initialAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(12, 0, { title: '实际退货单价', dataIndex: 'price', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })

+ 5 - 2
src/views/salesReturnManagement/salesReturn/list.vue

@@ -103,7 +103,9 @@
             坏件数量:{{ countData&&countData.totalBadQty||0 }};
             良品数量:{{ countData&&countData.totalGoodQty||0 }};
             返库数量:{{ countData&&countData.totalBackStockQty||0 }};
+            <span v-if="$hasPermissions('M_salesReturnList_salesPrice')">
             实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
+            </span>
           </div>
         </a-alert>
       </div>
@@ -295,12 +297,13 @@ export default {
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '良品数量', dataIndex: 'totalGoodQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '实际退货金额', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
-        { title: '审核时间', dataIndex: 'auditTime', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提货单', dataIndex: 'pickUpSalesReturnNum', scopedSlots: { customRender: 'pickUpSalesReturnNum' }, width: '4%', align: 'center' },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
+      if(this.$hasPermissions('M_salesReturnList_salesPrice')){
+        arr.splice(12,0,{ title: '实际退货金额', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
       return arr
     }
   },

+ 1 - 1
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -177,7 +177,7 @@ export default {
         { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       let i = 5
-      if (this.$hasPermissions('B_isShowPrice') && this.isShowPrice) { //  售价权限
+      if (this.$hasPermissions('B_salesReturnEdit_salesPrice') && this.isShowPrice) { //  售价权限
         arr.splice(4, 0, { title: '当前售价', dataIndex: 'productPrice', width: '9%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         i = 6
       }

+ 2 - 2
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -45,7 +45,7 @@
           <div slot="message" class="total-bar">
             <div>
               <span>申请退货数量:{{ ordeDetail&&(ordeDetail.totalInitialQty || ordeDetail.totalInitialQty==0) ? ordeDetail.totalInitialQty : '--' }};</span>
-              <span v-if="$hasPermissions('B_isShowPrice')">参考退货金额:{{ ordeDetail&&(ordeDetail.totalAmount || ordeDetail.totalAmount==0) ? toThousands(ordeDetail.totalAmount) : '--' }};</span>
+              <span v-if="$hasPermissions('B_salesReturnEdit_salesPrice')">参考退货金额:{{ ordeDetail&&(ordeDetail.totalAmount || ordeDetail.totalAmount==0) ? toThousands(ordeDetail.totalAmount) : '--' }};</span>
             </div>
           </div>
         </a-alert>
@@ -253,7 +253,7 @@ export default {
         { title: '退货原因', dataIndex: 'returnReason', align: 'center', width: '13%', scopedSlots: { customRender: 'returnReason' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_salesReturnEdit_salesPrice')) { //  售价权限
         arr.splice(4, 0, { title: '参考退货单价', dataIndex: 'price', align: 'right', width: '8%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(7, 0, { title: '参考退货金额', align: 'right', dataIndex: 'totalAmount', width: '8%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }

+ 0 - 3
src/views/supplierManagement/associatedProduct/add.vue

@@ -163,9 +163,6 @@ export default {
         // { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '13%', align: 'center' }
       ]
-      // if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-      //   arr.splice(6, 0, { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-      // }
       return arr
     }
   },

+ 1 - 4
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -123,12 +123,9 @@ export default {
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '18%', align: 'center' },
         { title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '成本价(¥)', dataIndex: 'cost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', dataIndex: 'cost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(6, 0, { title: '成本价(¥)', dataIndex: 'cost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
       return arr
     }
   },

+ 3 - 4
src/views/supplierManagement/costSetting/list.vue

@@ -187,10 +187,9 @@ export default {
         { title: '审核状态', dataIndex: 'auditStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(7, 0, { title: '当前成本价', dataIndex: 'cost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(8, 0, { title: '变更成本价', dataIndex: 'modifyCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
+
+      arr.splice(7, 0, { title: '当前成本价', dataIndex: 'cost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      arr.splice(8, 0, { title: '变更成本价', dataIndex: 'modifyCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       return arr
     }
   },