Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -207,7 +207,7 @@
                 <el-form-item><el-checkbox v-model="dialogData.projectWithDept">项目是否有所属部门</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.financeJobnumEnabled">财务导入薪资是否支持工号</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.noWorkToReport">是否开启填报不超过考勤工时</el-checkbox></el-form-item>
+                <el-form-item><el-checkbox v-model="dialogData.noWorkToReport">是否开启考勤为0不可填报</el-checkbox></el-form-item>
                 <!-- <el-form-item><el-checkbox v-model="dialogData.noWorkToReport">是否开启填报不超过考勤工时</el-checkbox></el-form-item> -->
                 <el-form-item>
                     日报审核模式：

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

@@ -1030,10 +1030,27 @@
                     <el-table-column type="selection"></el-table-column>
                     <el-table-column prop="label" :label="$t('lable.name')" >
                         <template slot-scope="scope">
-                            <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(' + $t('other.AskForLeave') +scope.row.leaveDays + $t('time.day') +')' : '(' + $t('other.AskForLeave') + scope.row.leaveTimes + 'h)') : scope.row.label}}</span>
+                            <span>
+                                <!-- {{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(' + $t('other.AskForLeave') +scope.row.leaveDays + $t('time.day') +')' : '(' + $t('other.AskForLeave') + scope.row.leaveTimes + 'h)') : scope.row.label}} -->
+                                <span v-if="scope.row.leaveDays || scope.row.leaveTimes">
+                                    <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                                    <span>{{scope.row.leaveDays ? '(' + $t('other.AskForLeave') +scope.row.leaveDays + $t('time.day') +')' : '(' + $t('other.AskForLeave') + scope.row.leaveTimes + 'h)'}}</span>
+                                </span>
+                                <span v-else>
+                                    <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                                </span>
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="deptName" :label="$t('lable.department')" >
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.deptName}}</span>
+                            </div>
+                        </template>
                     </el-table-column>
                     </el-table>
                 </el-tab-pane>
@@ -1042,18 +1059,46 @@
                     <el-table-column prop="label" :label="$t('lable.name')" >
                         <template slot-scope="scope">
                             <!-- <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(请假' + scope.row.leaveDays + '天 - ' + leaveTypeName[scope.row.leaveType] + ')' : '(请假' + scope.row.leaveTimes + 'h - ' + leaveTypeName[scope.row.leaveType] + ')') : scope.row.label}}</span> -->
-                            <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(' + leaveTypeName[scope.row.leaveType] + ')' : '(' + leaveTypeName[scope.row.leaveType] + ')') : scope.row.label}}</span>
+                            <!-- <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(' + leaveTypeName[scope.row.leaveType] + ')' : '(' + leaveTypeName[scope.row.leaveType] + ')') : scope.row.label}}</span> -->
+                            <span v-if="scope.row.leaveDays || scope.row.leaveTimes">
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                                <span>{{scope.row.leaveDays ? '(' + leaveTypeName[scope.row.leaveType] + ')' : '(' + leaveTypeName[scope.row.leaveType] + ')'}}</span>
+                            </span>
+                            <span v-else>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="deptName" :label="$t('lable.department')" >
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.deptName}}</span>
+                            </div>
+                        </template>
                     </el-table-column>
                     </el-table>
                 </el-tab-pane>
             </el-tabs>
             <el-table :show-header="true" :data="fillMembList" highlight-current-row :height="400" style="width: 100%;" @selection-change="notifySel" v-else>
             <el-table-column type="selection"></el-table-column>
-            <el-table-column prop="label" :label="$t('lable.name')" ></el-table-column>
+            <el-table-column prop="label" :label="$t('lable.name')" >
+                <template slot-scope="scope">
+                    <div>
+                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='scope.row.label'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
+                    </div>
+                </template>
+            </el-table-column>
             <el-table-column prop="deptName" :label="$t('lable.department')" >
+                <template slot-scope="scope">
+                    <div>
+                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.deptName}}</span>
+                    </div>
+                </template>
             </el-table-column>
 
             </el-table>
@@ -1403,7 +1448,14 @@
             <div style="height: 452px">
                 <el-table :data="toViewList" stripe style="width: 100%;" height="400" :loading="toViewLoading">
                     <el-table-column prop="indate" :label="$t('other.ImportTime')"> </el-table-column>
-                    <el-table-column prop="userName" :label="$t('other.operator')"> </el-table-column>
+                    <el-table-column prop="userName" :label="$t('other.operator')">
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate != 1">{{scope.row.userName}}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="datel" :label="$t('other.document')">
                         <template slot-scope="scope">
                             <div>
@@ -1465,7 +1517,14 @@
                 <el-table-column prop="createDate" :label="$t('screening.workingDate')"  >
                 </el-table-column>
                 <el-table-column prop="weekDayTxt" :label="$t('weekDay.Week')"  ></el-table-column>
-                <el-table-column prop="username" :label="$t('screening.employeename')"  ></el-table-column>
+                <el-table-column prop="username" :label="$t('screening.employeename')"  >
+                    <template slot-scope="scope">
+                        <div>
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='scope.row.username'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate != 1">{{scope.row.username}}</span>
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="startTime" :label="$t('screening.workinghoursss')"  ></el-table-column>
                 <el-table-column prop="endTime" :label="$t('screening.off-dutytime')" ></el-table-column>
                 <el-table-column prop="workHours" :label="$t('other.actualworkinghours')"  align="right">
@@ -1516,7 +1575,14 @@
                 :key="timeStamp"
                 style="width: 100%;margin-top:5px;" ref="tab">
                 <el-table-column prop="createDate" :label="$t('screening.workingDate')"  width="100px" fixed="left"></el-table-column>
-                <el-table-column prop="username" :label="$t('screening.employeename')"   width="80px" fixed="left"></el-table-column>
+                <el-table-column prop="username" :label="$t('screening.employeename')"   width="80px" fixed="left">
+                    <template slot-scope="scope">
+                        <div>
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='scope.row.username'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate != 1">{{scope.row.username}}</span>
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="startTime" :label="$t('screening.workinghoursss')"  width="80px" fixed="left"></el-table-column>
                 <el-table-column prop="endTime" :label="$t('screening.off-dutytime')"  width="80px" fixed="left"></el-table-column>
                 <el-table-column prop="workHours" :label="$t('screening.workTime')" width="80px" align="right" fixed="left">
@@ -5576,7 +5642,14 @@
                         for (var t=0;t<this.workForm.domains.length; t++) {
                             totalTime += parseFloat(this.workForm.domains[t].workingTime);
                         }
-                        if (this.reportTimeType.type == 1 && this.workForm.time && this.user.timeType.noWorkToReport == 1) {
+                        if (this.reportTimeType.type == 1 && this.workForm.time) {
+                            if (this.workForm.time.workHours && this.user.timeType.noWorkToReport == 1){
+                                this.$message({
+                                    message: '无考勤记录不可填报',
+                                    type: 'error'
+                                })
+                                return
+                            }
                             if (this.workForm.time.workHours && totalTime > parseFloat(this.workForm.time.workHours)) {
                                 this.$message({
                                         message: this.$t('message.Fillinthesumofworkinghours')+(totalTime)+"h"+this.$t('message.Cannotexceedthetotalworkinghoursofattendance')+"("+this.workForm.time.workHours.toFixed(1)+"h)",