景昱审核

fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/index.vue

@@ -101,26 +101,36 @@
                     <div v-for="(item1,index1) in item.data" :key="index1" class="one_report_data">
                         <div class="project_title">项目：{{item1.project}}
                             [
-                            <span v-if="item1.isDeptAudit==0">
-                                <span v-if="item1.projectAuditState==0">
-                                    待项目审核人<span v-if="item1.projectAuditorName != null">(
-                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
-                                        <span v-else>{{item1.projectAuditorName}}</span>
-                                    )</span>审核
+                            <span v-if="user.timeType.reportAuditType == 7" >
+                                审核人：<span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                                    :openid='item1.projectAuditorName'></TranslationOpenDataText><span v-if="item1.projectAuditState==1">√</span><span v-if="item1.deptAuditorName">、</span>
+                                                <TranslationOpenDataText type='userName'
+                                                    :openid='item1.deptAuditorName'></TranslationOpenDataText><span v-if="item1.departmentAuditState==1">√</span>
+                                        </span>
+                                        <span v-else>{{ item1.projectAuditorName }}<span v-if="item1.projectAuditState==1">√</span><span v-if="item1.deptAuditorName">、</span>{{ item1.deptAuditorName }}<span v-if="item1.departmentAuditState==1">√</span></span>
+                            </span>
+                            <span v-else>
+                                <span v-if="item1.isDeptAudit==0">
+                                    <span v-if="item1.projectAuditState==0">
+                                        待项目审核人<span v-if="item1.projectAuditorName != null">(
+                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
+                                            <span v-else>{{item1.projectAuditorName}}</span>
+                                        )</span>审核
+                                    </span>
+                                    <span style="color:#32CD32;" v-else-if="item1.projectAuditState==1">
+                                        项目审核人<span v-if="item1.projectAuditorName != null">(
+                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
+                                            <span v-else>{{item1.projectAuditorName}}</span>
+                                        )</span>审核通过
+                                    </span>
                                 </span>
-                                <span style="color:#32CD32;" v-else-if="item1.projectAuditState==1">
-                                    项目审核人<span v-if="item1.projectAuditorName != null">(
-                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
-                                        <span v-else>{{item1.projectAuditorName}}</span>
-                                    )</span>审核通过
+                                <span v-else-if="item1.isDeptAudit==1">
+                                    待
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='item1.auditDeptName'></TranslationOpenDataText></span>
+                                    <span v-else>{{item1.auditDeptName}}</span>
+                                    审核
                                 </span>
                             </span>
-                            <span v-else-if="item1.isDeptAudit==1">
-                                待
-                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='item1.auditDeptName'></TranslationOpenDataText></span>
-                                <span v-else>{{item1.auditDeptName}}</span>
-                                审核
-                            </span>
                             ]
 
                         </div>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/view/index.vue

@@ -79,29 +79,39 @@
                                 <div class="project_title" style="font-weight:bold;">项目：{{ item1.project }} <span
                                         :style="'color:' + statusColor[item1.state]">[
                                         <span v-if="item1.state == 0">
-                                            <span v-if="item1.isDeptAudit == 0">
-                                                <span v-if="item1.projectAuditState == 0">
-                                                    待项目审核人<span v-if="item1.projectAuditorName != null">(
-                                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
-                                                                :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
-                                                        <span v-else>{{ item1.projectAuditorName }}</span>
-                                                        )</span>审核
+                                            <span v-if="user.timeType.reportAuditType == 7" >
+                                                审核人：<span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                                                    :openid='item1.projectAuditorName'></TranslationOpenDataText><span v-if="item1.projectAuditState==1">√</span><span v-if="item1.deptAuditorName">、</span>
+                                                                <TranslationOpenDataText type='userName'
+                                                                    :openid='item1.deptAuditorName'></TranslationOpenDataText><span v-if="item1.departmentAuditState==1">√</span>
+                                                        </span>
+                                                        <span v-else>{{ item1.projectAuditorName }}<span v-if="item1.projectAuditState==1">√</span><span v-if="item1.deptAuditorName">、</span>{{ item1.deptAuditorName }}<span v-if="item1.departmentAuditState==1">√</span></span>
+                                            </span>
+                                            <span v-else>
+                                                <span v-if="item1.isDeptAudit == 0">
+                                                    <span v-if="item1.projectAuditState == 0">
+                                                        待项目审核人<span v-if="item1.projectAuditorName != null">(
+                                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                                                    :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
+                                                            <span v-else>{{ item1.projectAuditorName }}</span>
+                                                            )</span>审核
+                                                    </span>
+                                                    <span style="color:#32CD32;" v-else-if="item1.projectAuditState == 1">
+                                                        项目审核人<span v-if="item1.projectAuditorName != null">(
+                                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                                                    :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
+                                                            <span v-else>{{ item1.projectAuditorName }}</span>
+                                                            )</span>审核通过
+                                                    </span>
                                                 </span>
-                                                <span style="color:#32CD32;" v-else-if="item1.projectAuditState == 1">
-                                                    项目审核人<span v-if="item1.projectAuditorName != null">(
-                                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
-                                                                :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
-                                                        <span v-else>{{ item1.projectAuditorName }}</span>
-                                                        )</span>审核通过
+                                                <span v-else-if="item1.isDeptAudit == 1">
+                                                    待
+                                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName'
+                                                            :openid='item1.auditDeptName'></TranslationOpenDataText></span>
+                                                    <span v-else>{{ item1.auditDeptName }}</span>
+                                                    审核
                                                 </span>
                                             </span>
-                                            <span v-else-if="item1.isDeptAudit == 1">
-                                                待
-                                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName'
-                                                        :openid='item1.auditDeptName'></TranslationOpenDataText></span>
-                                                <span v-else>{{ item1.auditDeptName }}</span>
-                                                审核
-                                            </span>
                                         </span>
                                         <span v-else>
                                             {{ statusTxt[item1.state] }}