景昱审核

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

@@ -220,7 +220,7 @@
                 personnelValue: '',
                 personnelAll: [],
                 personnelAllPlly: [],
-                yAxisValue: localStorage.yAxisValue?localStorage.yAxisValue:'1',
+                yAxisValue: '1',
                 parentDeptStack:[],
                 parentDeptId:null,
                 hasReportUserList:[],
@@ -266,7 +266,6 @@
             },
             //Y轴点击改变显示的数据
             onYAxisChange() {
-                localStorage.yAxisValue = this.yAxisValue;
                 this.jieliu();
             },
             jutishez() {

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -739,7 +739,7 @@
         },
         data() {
             return {
-                reportAuditTypeArray:['项目审核人审核','分组负责人审核','先分组负责人审核再项目经理审核','员工自由选择审批人','项目所属BU审核','直属审核人或部门负责人审核','直属或部门负责人审核->项目日报审核人审核'],
+                reportAuditTypeArray:['项目审核人审核','分组负责人审核','先分组负责人审核再项目经理审核','员工自由选择审批人','项目所属BU审核','直属审核人或部门负责人审核','直属或部门负责人审核->项目日报审核人审核','部门和项目日报审核人并行审核'],
                 expandedKeys: [],
                 checkStrictly: false,
                 checkedKeys:[],

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

@@ -92,32 +92,38 @@
                                 <el-card shadow="never">
                                     <p>{{ $t('other.project') + '：' }}<b>{{item.projectCode+'/'+item.project}}<span v-if="item.subProjectName != null"> / {{item.subProjectName}}</span>
                                     <span style="margin-left:15px;color:#DAA520;" >[ 
-                                                    <span v-if="item.isDeptAudit==0">
-                                                        <span v-if="item.projectAuditState==0">
-                                                            {{ $t('other.waitForTheProjectReviewer') }}<span v-if="item.projectAuditorName != null">(
-                                                                <!-- {{item.projectAuditorName}} -->
-                                                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
-                                                                <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
-                                                                )</span>{{ $t('other.audit') }}
-                                                        </span>
-                                                        <span style="color:#32CD32;" v-else-if="item.projectAuditState==1">
-                                                            {{ $t('other.projectAuditor') }}<span v-if="item.projectAuditorName != null">(
-                                                                <!-- {{item.projectAuditorName}} -->
-                                                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
-                                                                <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
-                                                            )</span>{{ $t('state.approved') }}
-                                                        </span>
-                                                    </span>
-                                                    <span v-else-if="item.isDeptAudit==1">
-                                                        <!-- {{($t('other.await') +item.auditDeptName+('('+item.deptAuditorName+')')+ $t('other.audit'))}} -->
-                                                        ({{$t('other.await')}}
-                                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='item.auditDeptName'></TranslationOpenDataText></span>
-                                                        <span v-if="user.userNameNeedTranslate != '1'">{{item.auditDeptName}}</span>
-                                                        (<span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.deptAuditorName'></TranslationOpenDataText></span>
-                                                        <span v-if="user.userNameNeedTranslate != '1'">{{item.deptAuditorName}}</span>)
-                                                        {{$t('other.audit')}})
-                                                    </span>
-                                                    ]
+                                        <span v-if="user.timeType.reportAuditType == 7">
+                                            {{$t('other.reviewer')}}：<TranslationOpenData :configurationItems="{ openType: 'userName', openId: item.projectAuditorName, renderIndex: 0 }" /><span v-if="item.projectAuditState==1">√</span>
+                                            <span v-if="item.deptAuditorName">、</span>
+                                            <TranslationOpenData :configurationItems="{ openType: 'userName', openId: item.deptAuditorName, renderIndex: 0 }" /><span v-if="item.departmentAuditState==1">√</span>
+                                        </span>
+                                        <span v-else>
+                                            <span v-if="item.isDeptAudit==0">
+                                                <span v-if="item.projectAuditState==0">
+                                                    {{ $t('other.waitForTheProjectReviewer') }}<span v-if="item.projectAuditorName != null">(
+                                                        <!-- {{item.projectAuditorName}} -->
+                                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
+                                                        <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
+                                                        )</span>{{ $t('other.audit') }}
+                                                </span>
+                                                <span style="color:#32CD32;" v-else-if="item.projectAuditState==1">
+                                                    {{ $t('other.projectAuditor') }}<span v-if="item.projectAuditorName != null">(
+                                                        <!-- {{item.projectAuditorName}} -->
+                                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
+                                                        <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
+                                                    )</span>{{ $t('state.approved') }}
+                                                </span>
+                                            </span>
+                                            <span v-else-if="item.isDeptAudit==1">
+                                                <!-- {{($t('other.await') +item.auditDeptName+('('+item.deptAuditorName+')')+ $t('other.audit'))}} -->
+                                                ({{$t('other.await')}}
+                                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='item.auditDeptName'></TranslationOpenDataText></span>
+                                                <span v-if="user.userNameNeedTranslate != '1'">{{item.auditDeptName}}</span>
+                                                (<span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.deptAuditorName'></TranslationOpenDataText></span>
+                                                <span v-if="user.userNameNeedTranslate != '1'">{{item.deptAuditorName}}</span>)
+                                                {{$t('other.audit')}})
+                                            </span>
+                                        </span>]
                                     </span>
                                     </b></p>
                                     <p v-if="user.timeType.reportAuditType == 6" >审核流程：<span v-if="item.auditorList && item.auditorList.length == 1">一层审核(<span style="color:#20A0ff;">{{ item.auditorList[0].name }}</span>)</span>
@@ -231,21 +237,24 @@
                 <el-table-column prop="state" :label="$t('state.states')" sortable>
                     <template slot-scope="scope">
                         <span v-if="scope.row.state == 0" style="color:#DAA520;">
-                            <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'))}}
-                                </span>
-                                <span v-else>
-                                    待审核
+                            <span v-if="user.timeType.reportAuditType == 7">待审核</span>
+                            <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'))}}
+                                    </span>
+                                    <span v-else>
+                                        待审核
+                                    </span>
                                 </span>
-                            </span>
-                            <span v-if="user.userNameNeedTranslate == '1'">
-                                <span v-if="scope.row.isDeptAudit==0">{{$t('other.Tobereviewedbytheprojectreviewer')}}</span>
-                                <span v-else>
-                                    {{$t('other.await')}}
-                                    <TranslationOpenDataText type='departmentName' :openid='scope.row.auditDeptName'></TranslationOpenDataText>
-                                    (<TranslationOpenDataText type='userName' :openid='scope.row.deptAuditorName'></TranslationOpenDataText>)
-                                    {{$t('other.audit')}}
+                                <span v-if="user.userNameNeedTranslate == '1'">
+                                    <span v-if="scope.row.isDeptAudit==0">{{$t('other.Tobereviewedbytheprojectreviewer')}}</span>
+                                    <span v-else>
+                                        {{$t('other.await')}}
+                                        <TranslationOpenDataText type='departmentName' :openid='scope.row.auditDeptName'></TranslationOpenDataText>
+                                        (<TranslationOpenDataText type='userName' :openid='scope.row.deptAuditorName'></TranslationOpenDataText>)
+                                        {{$t('other.audit')}}
+                                    </span>
                                 </span>
                             </span>
                         </span>