调整相关日报

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -1481,5 +1481,6 @@
   "xuan-ze-nian-fen": "Choose the Month",
   "zheng-shi-xiang-mu-gong-shi": "Official project hours",
   "lai-zi-ri-bao": "From Daily",
-  "tian-bao-ren": "Applicant"
+  "tian-bao-ren": "Applicant",
+  "xiang-guan-ri-bao": "Related Daily News"
 }

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1481,5 +1481,6 @@
   "ge-fen-zu-jie-duan-gong-shi-biao": "各分组阶段工时表",
   "di": "第",
   "lai-zi-ri-bao": "来自日报",
-  "tian-bao-ren": "填报人"
+  "tian-bao-ren": "填报人",
+  "xiang-guan-ri-bao": "相关日报"
 }

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -783,7 +783,7 @@
                     <div class="subject">
                         <div class="sub-all">
                             <div :class="dynamicTab ? 'subOn' : ''" @click="dynamicTab = true">{{ $t('alldynamic') }}</div>
-                            <div :class="dynamicTab ? '' : 'subOn'" @click="dynamicTab = false">{{ $t('lai-zi-ri-bao') }}</div>
+                            <div :class="dynamicTab ? '' : 'subOn'" @click="dynamicTab = false">{{ $t('xiang-guan-ri-bao') }}</div>
                         </div>
                         <div class="sub-details" ref="main" v-if="dynamicTab">
                             <ul class="infinite-list" v-infinite-scroll="load" ref="contRoll">
@@ -840,7 +840,7 @@
                                     </p>
                                     <p>{{ $t('other.approvalStatus') }}：
                                         <span v-if="user.company.packageEngineering == 0">
-                                            <span style="margin-left:15px;color:#DAA520;"  v-if="item2.state == 0">[ 
+                                            <span style="margin-left:15px;color:#DAA520;"  v-if="item2.state == 0">
                                                 <span v-if="item2.isDeptAudit==0">
                                                     <span v-if="item2.projectAuditState==0">
                                                         <!-- 待项目审核人 --> {{$t('other.waitForTheProjectReviewer')}}
@@ -872,20 +872,20 @@
                                                     <span v-if="user.userNameNeedTranslate != '1'">{{item2.auditDeptName}}</span>
                                                     {{$t('other.audit')}})
                                                 </span>
-                                                ]</span> 
-                                            <span style="margin-left:15px;color:#DAA520;" v-else-if="item2.state == -1">[ {{$t('other.importWaitingForReview')}} ]</span>
-                                            <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">[ {{$t('state.alreadyPassed')}} ]
+                                                </span> 
+                                            <span style="margin-left:15px;color:#DAA520;" v-else-if="item2.state == -1">{{$t('other.importWaitingForReview')}}</span>
+                                            <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">{{$t('state.alreadyPassed')}}
                                                 <span style="color:#c7e944" v-if="item2.reportAutoApprove == 1">{{$t('other.automaticReview')}}</span>
                                             </span>
                                             
-                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">[ {{$t('state.rejected')}} ] {{$t('other.reason')}}:{{item2.rejectReason}}</span>
-                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">[ {{$t('state.waitingsubmit')}} ]</span>
+                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">{{$t('state.rejected')}} {{$t('other.reason')}}:{{item2.rejectReason}}</span>
+                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">{{$t('state.waitingsubmit')}}</span>
                                         </span>
                                         <span v-if="user.company.packageEngineering == 1">
-                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == -1">[ {{$t('other.importWaitingForReview')}} ]</span>
-                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == -1">[ {{$t('other.waitingForProfessionalReview')}} ]</span>
-                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 0">[ {{$t('other.waitingForDepartmentReview')}} ]</span>
-                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 1">[ {{$t('other.waitForTheProjectReviewer')}}<span v-if="item2.projectAuditorName != null">
+                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == -1">{{$t('other.importWaitingForReview')}}</span>
+                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == -1">{{$t('other.waitingForProfessionalReview')}}</span>
+                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 0">{{$t('other.waitingForDepartmentReview')}}</span>
+                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 1">{{$t('other.waitForTheProjectReviewer')}}<span v-if="item2.projectAuditorName != null">
                                                 (
                                                     <span v-if="user.userNameNeedTranslate != 1">
                                                         {{item2.projectAuditorName}}
@@ -894,10 +894,10 @@
                                                         <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
                                                     </span>
                                                 )
-                                            </span>{{$t('other.audit')}} ]</span>
-                                            <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">[ {{$t('state.alreadyPassed')}} ]</span>
-                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">[ {{$t('state.rejected')}} ] {{$t('other.reason')}}:{{item2.rejectReason}}</span>
-                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">[ {{$t('state.waitingsubmit')}} ]</span>
+                                            </span>{{$t('other.audit')}}</span>
+                                            <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">{{$t('state.alreadyPassed')}}</span>
+                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">{{$t('state.rejected')}} {{$t('other.reason')}}:{{item2.rejectReason}}</span>
+                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">{{$t('state.waitingsubmit')}}</span>
                                         </span>
                                     </p>
                                     <!-- 自定义日报文本 -->

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -434,7 +434,7 @@
                     <div class="subject">
                         <div class="sub-all">
                             <div :class="dynamicTab ? 'subOn' : ''" @click="dynamicTab = true">{{ $t('alldynamic') }}</div>
-                            <div :class="dynamicTab ? '' : 'subOn'" @click="dynamicTab = false">{{ $t('lai-zi-ri-bao') }}</div>
+                            <div :class="dynamicTab ? '' : 'subOn'" @click="dynamicTab = false">{{ $t('xiang-guan-ri-bao') }}</div>
                         </div>
                         <div class="sub-details" ref="main" v-if="dynamicTab">
                             <ul class="infinite-list" v-infinite-scroll="load" ref="contRoll">
@@ -485,7 +485,7 @@
                                     </p>
                                     <p>{{ $t('other.approvalStatus') }}：
                                         <span v-if="user.company.packageEngineering == 0">
-                                            <span style="margin-left:15px;color:#DAA520;"  v-if="item2.state == 0">[ 
+                                            <span style="margin-left:15px;color:#DAA520;"  v-if="item2.state == 0">
                                                 <span v-if="item2.isDeptAudit==0">
                                                     <span v-if="item2.projectAuditState==0">
                                                         <!-- 待项目审核人 --> {{$t('other.waitForTheProjectReviewer')}}
@@ -517,20 +517,20 @@
                                                     <span v-if="user.userNameNeedTranslate != '1'">{{item2.auditDeptName}}</span>
                                                     {{$t('other.audit')}})
                                                 </span>
-                                                ]</span> 
-                                            <span style="margin-left:15px;color:#DAA520;" v-else-if="item2.state == -1">[ {{$t('other.importWaitingForReview')}} ]</span>
-                                            <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">[ {{$t('state.alreadyPassed')}} ]
+                                                </span> 
+                                            <span style="margin-left:15px;color:#DAA520;" v-else-if="item2.state == -1">{{$t('other.importWaitingForReview')}}</span>
+                                            <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">{{$t('state.alreadyPassed')}}
                                                 <span style="color:#c7e944" v-if="item2.reportAutoApprove == 1">{{$t('other.automaticReview')}}</span>
                                             </span>
                                             
-                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">[ {{$t('state.rejected')}} ] {{$t('other.reason')}}:{{item2.rejectReason}}</span>
-                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">[ {{$t('state.waitingsubmit')}} ]</span>
+                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">{{$t('state.rejected')}} {{$t('other.reason')}}:{{item2.rejectReason}}</span>
+                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">{{$t('state.waitingsubmit')}}</span>
                                         </span>
                                         <span v-if="user.company.packageEngineering == 1">
-                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == -1">[ {{$t('other.importWaitingForReview')}} ]</span>
-                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == -1">[ {{$t('other.waitingForProfessionalReview')}} ]</span>
-                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 0">[ {{$t('other.waitingForDepartmentReview')}} ]</span>
-                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 1">[ {{$t('other.waitForTheProjectReviewer')}}<span v-if="item2.projectAuditorName != null">
+                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == -1">{{$t('other.importWaitingForReview')}}</span>
+                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == -1">{{$t('other.waitingForProfessionalReview')}}</span>
+                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 0">{{$t('other.waitingForDepartmentReview')}}</span>
+                                            <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 1">{{$t('other.waitForTheProjectReviewer')}}<span v-if="item2.projectAuditorName != null">
                                                 (
                                                     <span v-if="user.userNameNeedTranslate != 1">
                                                         {{item2.projectAuditorName}}
@@ -539,10 +539,10 @@
                                                         <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
                                                     </span>
                                                 )
-                                            </span>{{$t('other.audit')}} ]</span>
-                                            <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">[ {{$t('state.alreadyPassed')}} ]</span>
-                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">[ {{$t('state.rejected')}} ] {{$t('other.reason')}}:{{item2.rejectReason}}</span>
-                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">[ {{$t('state.waitingsubmit')}} ]</span>
+                                            </span>{{$t('other.audit')}}</span>
+                                            <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">{{$t('state.alreadyPassed')}}</span>
+                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">{{$t('state.rejected')}} {{$t('other.reason')}}:{{item2.rejectReason}}</span>
+                                            <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">{{$t('state.waitingsubmit')}}</span>
                                         </span>
                                     </p>
                                     <!-- 自定义日报文本 -->