解决冲突

src/assets/common/lang/zh.js

@@ -1391,7 +1391,17 @@ export const adm={
   adm_time:"时间",
   adm_Jobnumber:"工号",
   adm_Attendancedate:"考勤日期",
-   
+  adm_sbkqshijian:"上班考勤时间",
+  adm_sbdkshijian:"上班打卡时间",
+  adm_sbdkjieguo:"上班打卡结果",
+  adm_sbdkdizhi:"上班打卡地址",
+  adm_xbkqshijian:"下班考勤时间",
+  adm_xbdkshijian:"下班打卡时间",
+  adm_xbdkjieguo:"下班打卡结果",
+  adm_xbdkdizhi:"下班打卡地址",
+  adm_dkshebei:"打卡设备",
+  adm_timenomorethan:"时间跨度不能超过31天!",
+  
   
 }
 export const visaT = {

src/components/FinancialModule/BasicDocuments.vue

@@ -964,7 +964,7 @@
                   <button class="hollowFixedBtn" @click="ReturnBack()">返回</button>
                   <!--<template v-if="AuditOrRefundMsg.Status !== '3'" v-for="step in GetDetail.AuditSteps">-->
                   <template v-for="step in GetDetail.AuditSteps">
-                    <template v-if="step.NextStep === 1 && (step.SpecialNode === 2 || step.SpecialNode === 1 || userId==1569)">
+                    <template v-if="step.NextStep === 1 && (step.SpecialNode === 2 || step.SpecialNode === 1 || RB_Post_Id==168)">
                       <button  class="normalBtn" @click="zanCun()" style="position: relative;left: 560px;">暂存</button>
                     </template>
                   </template>
@@ -1102,7 +1102,8 @@ export default {
           loading:false,
           GetFinancLogList:[],
           LogLoading:false,
-          userId:0
+          userId:0,
+          RB_Post_Id: 0,
         }
     },components:{
         "my-FlowChartModule": myFlowChartModule,
@@ -1696,6 +1697,7 @@ export default {
     },mounted(){
         let userInfo=this.getLocalStorage();
         this.userId = userInfo.EmployeeId;
+        this.RB_Post_Id = userInfo.RB_Post_Id
         this.ID = this.$route.query.id;
         this.Financial_post_GetDetail(this.ID);
         this.financeinfo_post_GetList();

src/components/FinancialModule/CashierWork.vue

@@ -245,6 +245,7 @@
                                     reserve-keyword
                                     placeholder="请输入"
                                     :placeholder="$t('pub.pleaseImport')"
+                                    :remote-method="remoteMethod"
                                     @change="$forceUpdate()"
                                     @remove-tag="removeTag"
                                     :loading="loading2">

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1667,9 +1667,9 @@ export default {
         this.msg,
         res => {
           if (res.data.resultCode == 1) {
-            let data = res.data.data.pageData;
+            let data = res.data.data.pmodel.pageData;
             // res.data.data.TotalRevenue
-            this.total = res.data.data.count;
+            this.total = res.data.data.pmodel.count;
             if (this.total == 0) {
               this.DataList = [];
             } else {

src/components/FinancialModule/ReportForm/MonthReport.vue

@@ -997,7 +997,7 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             this.CompanyList = res.data.data;
-            // this.msg.OutBranchId=this.CompanyList[0].Id;
+            this.msg.OutBranchId=this.CompanyList[0].Id;
           } else {
           }
         },