浏览代码

Merge branch 'develop_yh53_1' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh53_1

chenrui 3 月之前
父节点
当前提交
95eafaba3a

+ 14 - 14
src/api/reportData.js

@@ -1390,20 +1390,6 @@ export const subsidyMonthExport = (params) => {
     }
   })
 }
-// 轮胎费用报表   列表
-export const tireFeeReportList = (params) => {
-  const url = `/report/tireFee/queryPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post',
-    headers: {
-      'module': encodeURIComponent('列表查询')
-    }
-  })
-}
 // 增量补贴-分页列表
 export const subsidyStepList = (params) => {
   const url = `/report/subsidyStep/queryPage/${params.pageNo}/${params.pageSize}`
@@ -1442,6 +1428,20 @@ export const subsidyStepExport = (params) => {
   })
 }
 
+// 轮胎费用报表   列表
+export const tireFeeReportList = (params) => {
+  const url = `/report/tireFee/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
+  })
+}
 // 轮胎费用报表  统计
 export const tireFeeReportCount = (params) => {
   return axios({

+ 2 - 2
src/config/report/otherReport.js

@@ -74,7 +74,7 @@ export default {
             meta: {
               title: '轮胎补贴报表',
               icon: 'profile',
-              permission: 'M_tireFeeReportList'
+              permission: 'M_tireSubsidyList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -86,7 +86,7 @@ export default {
                   title: '轮胎补贴报表',
                   icon: 'profile',
                   hidden: true,
-                  permission: 'M_tireFeeReportList'
+                  permission: 'M_tireSubsidyList'
                 }
               }
             ]

+ 2 - 2
src/views/reportData/tireSubsidyReport/incrementalSubsidyList.vue

@@ -59,7 +59,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireFeeExport')"
+                v-if="$hasPermissions('M_tireSubsidyExport')"
                 id="incSubSidy-export">导出</a-button>
             </a-col>
           </a-row>
@@ -115,7 +115,7 @@ export default {
     return {
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
-      advanced: true, // 高级搜索 展开/关闭
+      advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
       timeInfo: [], // 日期

+ 2 - 2
src/views/reportData/tireSubsidyReport/incrementalSubsidyYearList.vue

@@ -69,7 +69,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireFeeExport')"
+                v-if="$hasPermissions('M_tireSubsidyExport')"
                 id="incSubSidyYear-export">导出</a-button>
             </a-col>
           </a-row>
@@ -124,7 +124,7 @@ export default {
     return {
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
-      advanced: true, // 高级搜索 展开/关闭
+      advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
       toYears: new Date().getFullYear(), // 今年

+ 2 - 2
src/views/reportData/tireSubsidyReport/serviceFreightDetailList.vue

@@ -101,7 +101,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireFeeExport')"
+                v-if="$hasPermissions('M_tireSubsidyExport')"
                 id="sfdetail-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
@@ -160,7 +160,7 @@ export default {
     return {
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
-      advanced: true, // 高级搜索 展开/关闭
+      advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
       //  查询条件

+ 2 - 2
src/views/reportData/tireSubsidyReport/serviceFreightList.vue

@@ -65,7 +65,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireFeeExport')"
+                v-if="$hasPermissions('M_tireSubsidyExport')"
                 id="serviceFreight-export">导出</a-button>
             </a-col>
           </a-row>
@@ -120,7 +120,7 @@ export default {
     return {
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
-      advanced: true, // 高级搜索 展开/关闭
+      advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
       monthVal: moment().format('YYYY-MM'), // 初始化月份值