提交相关代码

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

@@ -241,14 +241,37 @@
                             <span v-else>
                                 <span v-if="user.userNameNeedTranslate != '1'">
                                     <span v-if="user.company.companyName != '成都明夷电子科技有限公司'">
-                                        {{scope.row.isDeptAudit==0?$t('other.Tobereviewedbytheprojectreviewer'):($t('other.await')+scope.row.auditDeptName+('('+scope.row.deptAuditorName+')')+$t('other.audit'))}}
+                                        <!-- {{scope.row.isDeptAudit==0?$t('other.Tobereviewedbytheprojectreviewer'):($t('other.await')+scope.row.auditDeptName+('('+scope.row.deptAuditorName+')')+$t('other.audit'))}} -->
+                                        <span v-if="scope.row.isDeptAudit==0">
+                                            <span>
+                                                {{ $t('other.waitForTheProjectReviewer') }}<span>(
+                                                    <template v-for="(auditItem, auditindexs) in (scope.row.reviewerNames || [])">
+                                                        <TranslationOpenDataText type='userName' :openid='auditItem'></TranslationOpenDataText>
+                                                        <span v-if="auditindexs < scope.row.reviewerNames.length-1">,</span>
+                                                    </template>
+                                                    )</span>{{ $t('other.audit') }}
+                                            </span>
+                                        </span>
+                                        <span v-else>
+                                            {{ ($t('other.await')+scope.row.auditDeptName+('('+scope.row.deptAuditorName+')')+$t('other.audit')) }}
+                                        </span>
                                     </span>
                                     <span v-else>
                                         待审核
                                     </span>
                                 </span>
                                 <span v-if="user.userNameNeedTranslate == '1'">
-                                    <span v-if="scope.row.isDeptAudit==0">{{$t('other.Tobereviewedbytheprojectreviewer')}}</span>
+                                    <!-- <span v-if="scope.row.isDeptAudit==0">{{$t('other.Tobereviewedbytheprojectreviewer')}}</span> -->
+                                     <span v-if="scope.row.isDeptAudit==0">
+                                        <span>
+                                            {{ $t('other.waitForTheProjectReviewer') }}<span>(
+                                                <template v-for="(auditItem, auditindexs) in (scope.row.reviewerNames || [])">
+                                                    <TranslationOpenDataText type='userName' :openid='auditItem'></TranslationOpenDataText>
+                                                    <span v-if="auditindexs < scope.row.reviewerNames.length-1">,</span>
+                                                </template>
+                                                )</span>{{ $t('other.audit') }}
+                                        </span>
+                                     </span>
                                     <span v-else>
                                         {{$t('other.await')}}
                                         <TranslationOpenDataText type='departmentName' :openid='scope.row.auditDeptName'></TranslationOpenDataText>
@@ -884,7 +907,11 @@
                 res => {
                     this.listLoading = false;
                     if (res.code == "ok") {
+                        for (let entry of res.data) {
+                            entry.reviewerNames = (entry.data || []).map(item => item.projectAuditorName);
+                        }
                         this.listBackup = JSON.parse(JSON.stringify(res.data));
+                        console.log(this.listBackup, "《====== 赋值")
                         this.list = this.currentChangePage(10, 1, res.data);
                         let total = res.data.length || 0
                         this.reviewTableObj = {