Merge branch 'gn3.2' into debug

src/api/modules/reportV2.js

@@ -191,6 +191,15 @@ export const reportPushInterface = {
 	 */
 	getPushList:params => {
 		return http.get('/report/ice_msg/record',params)
+	},
+
+	/**
+	 * 固定某几个分类
+	 * @param {*} params 
+	 * @returns 
+	 */
+	classifyList: params => {
+		return http.get('/report/ice_msg/classify',params)
 	}
 }
 

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -440,7 +440,7 @@ export default {
           'download':checkPermissionBtn(pptPermission.ppt_download)&&((item.State===6&&item.ReportSource===2) || item.ReportSource===1),
           'edit':checkPermissionBtn(pptPermission.ppt_save)&&item.HasAuth&&(([3,5].includes(item.State)&&item.ReportSource===2) || item.ReportSource===1),
           'delete':checkPermissionBtn(pptPermission.ppt_del)&&item.ReportSource===1&&item.AdminId===this.RoleId,
-          'push': [2,6].includes(item.State)&&checkPermissionBtn(pptPermission.ppt_sendMsg)
+          'push': [2,6].includes(item.State)&&checkPermissionBtn(pptPermission.ppt_sendMsg) && item.CanSendMsg
       }
 
       return toolList.filter((i)=>btnAuthMap[i.key]) 

src/views/report_manage/components/reportReceiveSet.vue

@@ -90,7 +90,6 @@
 import mDialog from '@/components/mDialog.vue';
 import { departInterence } from '@/api/modules/setApi';
 import { traverseTree } from "@/utils/commonOptions"
-import { classifylist } from 'api/api.js';
 import {
   reportPushInterface
 } from '@/api/modules/reportV2.js';
@@ -114,7 +113,7 @@ export default {
   },
   methods:{
     async getList(){
-      const res=await classifylist()
+      const res=await reportPushInterface.classifyList()
 
       if(res.Ret!==200) return
       this.list=res.Data.List||[]

src/views/report_manage/components/repotPushRecord.vue

@@ -96,8 +96,8 @@
 
     <div style="height:35px;margin: 20px 0;">
       <m-page
-        :page_no="filterForm.pageNo"
-        :pageSize="filterForm.pageSize"
+        :page_no="pageNo"
+        :pageSize="pageSize"
         :total="total"
         @handleCurrentChange="pageChange"
       />
@@ -106,7 +106,6 @@
 </template>
 <script>
 import {
-  classifylist,
   reportPushInterface
 } from '@/api/modules/reportV2.js';
 import mPage from '@/components/mPage.vue'
@@ -179,7 +178,7 @@ export default {
       //获取分类列表
       let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "" };
 
-      classifylist(params).then((res) => {
+      reportPushInterface.classifyList(params).then((res) => {
         if (res.Ret == 200 && Array.isArray(res.Data.List)) {
           this.classifyOptions = res.Data.List||[];
           

src/views/report_manage/reportV2/list.vue

@@ -1049,7 +1049,7 @@ export default {
               (typeof(but.States)=='boolean' || but.States.includes(row.State) ) &&
               (!row.CanEdit)
         }else if(but.label==='推送消息'){
-          return commonFilterPass && row.MsgIsSend==0 && row.HasAuth
+          return commonFilterPass && row.MsgIsSend==0 && row.HasAuth && row.CanSendMsg
         }else if(but.label==='已推送消息'){
           return commonFilterPass && row.MsgIsSend!==0
         }else if(['音频上传'].includes(but.label)){