lilei il y a 2 ans
Parent
commit
baee2c0661

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -52,7 +52,7 @@
       </a-layout-footer>
 
       <!-- Setting Drawer (show in development mode) -->
-      <setting-drawer v-if="!production"></setting-drawer>
+      <!-- <setting-drawer v-if="!production"></setting-drawer> -->
     </a-layout>
   </a-layout>
 

+ 1 - 3
src/views/reportData/allocationPresentation/list.vue

@@ -214,9 +214,7 @@ export default {
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } }
       ]
       arr = arr.concat(this.atypeColList)
-      // 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 : '--' } })
-      // }
+      arr.splice(arr.length, 0, { title: '调拨单合计金额', width: 90, dataIndex: 'totalCost', align: 'right', customRender: function (text) { return (text || text == 0) ? text : '--' } })
       return arr
     }
   },

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

@@ -109,7 +109,6 @@
         :scroll="{ x: 1850 }"
         bordered>
         <template slot="footer">
-          <!-- v-if="$hasPermissions('B_isShowPrice')" -->
           <a-row :gutter="15">
             <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>
@@ -236,13 +235,11 @@ 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')) { //  售价权限
         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
     }
   },

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

@@ -66,7 +66,6 @@
         :defaultLoadData="false"
         bordered>
         <template slot="footer">
-          <!-- v-if="$hasPermissions('B_isShowPrice')" -->
           <table>
             <tr>
               <td width="51%" colspan="4"></td>