update

src/assets/common/lang/zh.js

@@ -756,6 +756,12 @@ export const active = {
 }
 
 export const fnc = {
+  fnc_tfsrhj: '团费收入合计',
+  fnc_zksr: '直客收入',
+  fnc_thjksr: '同行交客收入',
+  fnc_plattev: '平台收入',
+  
+  
   acc: '账户',
   accBming: '账户别名：',
   accType: '账户类型：',
@@ -1308,6 +1314,10 @@ export const rule = {
   qtxhkshijian: '请选择汇款时间！',
   qxzjylshuihao: '请选择交易流水号！',
   qxzskzhanghao: '请选择收款账号！',
+  qxzrzshijian: '请选择入职时间!',
+  qsrzqdqq: '请输入正确的qq!',
+  
+  
 }
 
 export const adm={
@@ -1326,7 +1336,62 @@ export const adm={
   adm_ynyyfenqu:"是否应用分区",
   adm_qsrgwname:"请输入岗位名称",
   adm_qxzsfyyfenqu:"请选择是否应用分区",
+  adm_changepd:"修改密码",
+  adm_changeUserInfo:"修改用户信息",
+  adm_bindaccountinfo:"绑定账户信息",
+  adm_newPd:"新密码",
+  adm_Reinput:"再次输入",
+  adm_logintel:"登录手机",
+  adm_Validaccount:"有效账号",
+  adm_logincount:"登录账号",
+  adm_changelogintel:"修改登录手机",
+  adm_staff:"员工",
+  adm_newphone:"新手机号",
+  adm_resetpd:"重置密码",
+  adm_twopdnotsame:"两次密码不一致!",
+  adm_twotelphnotsame:"两次手机号码不一致！",
+  adm_swlizhi:"设为离职",
+  adm_swzaizhi:"设为在职",
+  adm_Rolename:"角色名称",
+  adm_quanxian:"权限",
+  adm_qsrmiaoshu:"请输入描述",
+  adm_qxshezhi:"权限设置", 
+  adm_Bindingattendance:"绑定考勤",
+  adm_title:"标题",
+  adm_Publisher:"发布人",
+  adm_ublicationstatus:"发布情况",
+  adm_tobepublish:"待发布",
+  adm_published:"已发布",
+  adm_Withdrawn:"已撤回",
+  adm_Ceilingsituation:"置顶情况",
+  adm_Noroofset:"未置顶",
+  adm_roofset:"已置顶",
+  adm_theme:"主题",
+  adm_roof:"置顶",
+  adm_exitroof:"取消置顶",
+  adm_shifouroof:"是否置顶?",
   
+  adm_chehui:"撤回",
+  adm_fujian:"附件",
+  adm_download:"下载",
+  adm_content:"内容",
+  adm_content:"上传",
+  adm_fjlist:"附件列表",
+  adm_publish:"发布",
+  adm_qsrgbbiaoti:"请输入公告标题",
+  adm_qsrgbneirong:"请输入公告内容",
+  adm_filenotmoreM:"文件大小不能超过100M！",
+  adm_sfchehui:"是否撤回",
+  adm_chsuccess:"撤回成功",
+  adm_chexit:"取消撤回",
+  adm_xgnotice:"修改公告",
+  adm_noticexiangqing:"公告详情",
+  adm_binded:"已绑定",
+  adm_binding:"未绑定",
+  adm_time:"时间",
+  adm_Jobnumber:"工号",
+  adm_Attendancedate:"考勤日期",
+   
   
 }
 export const visaT = {

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1217,9 +1217,6 @@ export default {
     cW = allW - 90;
     cH = allH - 350;
     this.msg.pageSize = parseInt(cH / 30) - 1;
-    if(this.msg.pageSize<=0){
-      this.msg.pageSize=10;
-    }
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     this.userId = userInfo.EmployeeId;
@@ -1670,9 +1667,9 @@ export default {
         this.msg,
         res => {
           if (res.data.resultCode == 1) {
-            let data = res.data.data.pmodel.pageData;
+            let data = res.data.data.pageData;
             // res.data.data.TotalRevenue
-            this.total = res.data.data.pmodel.count;
+            this.total = res.data.data.count;
             if (this.total == 0) {
               this.DataList = [];
             } else {

src/router/config.js

@@ -1725,6 +1725,7 @@ export default {
                 title: '签证财务单据'
               },
             },
+            
 
             { // 签证中心 签证工作表
               path: '/visaWorksheet',
@@ -2118,7 +2119,16 @@ export default {
               meta: {
                 title: '少价管理'
               }
-          },{ //财务 现金日报表
+          },
+          ,{ // 财务往来单据 收入确认单
+            path: '/priceIncomeConfirmList',
+            name: 'priceIncomeConfirmList',
+            component: resolve => require(['@/components/FinancialModule/priceIncomeConfirmList'], resolve),
+            meta: {
+              title: '收入确认单'
+            },
+          },
+          { //财务 现金日报表
               path: '/CashReport',
               name: 'CashReport',
               component: resolve => require(['@/components/FinancialModule/CashReport'], resolve),