daily

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

@@ -163,6 +163,20 @@
         </div>
         </el-col>
         </el-row>
+
+        <template v-if="timeType.reportAuditType == 3">
+        <p style="margin-left:10px;color:#666;">审批层级设置</p>
+        <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
+            <el-col :span="24">
+                <el-select v-model="timeType.auditLevel">
+                    <el-option :value="1" label="1层"></el-option>
+                    <el-option :value="2" label="2层"></el-option>
+                    <el-option :value="3" label="3层"></el-option>
+                </el-select>
+            </el-col>
+        </el-row>
+        </template>
+
         <!--设置时长样式内容-->
         <p style="margin-left:10px;color:#666;">{{ $t('reminderSettings') }}</p>
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">

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

@@ -119,7 +119,7 @@
                                     <!-- 未填写 -->
                                     {{$t('state.DidNotFillIn')}}
                                     <el-link :underline="false" @click="showMembList(0)"><span style="margin-left:5px;margin-right:5px;color:red;">{{(depData == null?data[0].membCount:(depData.isUser == 1?1:depData.membCount))-reportList.length | numbers}}</span></el-link>{{$t('other.people')}}
-                                    <span v-if="leaveAllNum">{{'(全天请假' + leaveAllNum + '人)'}}</span>
+                                    <span v-if="leaveAllNum" @click="test()">{{'(全天请假' + leaveAllNum + '人)'}}</span>
                                     </span>
                                     </span>
                                 </span>
@@ -450,6 +450,28 @@
                         <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="domain.auditUserList" :idx="index" :subjectId="domain.projectAuditorId" ref="selectCat" :flg="true" @selectCatCli="selectCatCli"></selectCat>
 
                     </el-form-item>
+                    <!-- 111111 -->
+                    <!-- <el-form-item label="审核人" v-if="user.timeType.reportAuditType == 3">
+                        <el-select v-model="domain.auditorSettingArray.auditorFirst">
+                            <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        </el-select>
+
+                        <i class="el-icon-right"></i>
+                        <el-select v-model="domain.auditorSettingArray.auditorSec">
+                            <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        </el-select>
+
+                        <i class="el-icon-right"></i>
+                        <el-select v-model="domain.auditorSettingArray.auditorThird">
+                            <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="抄送人" v-if="user.timeType.reportAuditType == 3">
+                        <el-select v-model="domain.auditorSettingArray.ccUserid">
+                            <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item> -->
+
                     <!-- 相关维度/自定义维度 -->
                     <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1" :rules="user.timeType.customDegreeStatus == 1 && domain.wuduList != undefined && domain.wuduList.length != 0 ? { required: true, message: $t('defaultText.pleaseChoose') + yonghuUser.customDegreeName, trigger: ['change','blur'] } : null" :prop="'domains.' + index + '.degreeId'">
                         <el-select v-model="domain.degreeId" clearable :placeholder="$t('defaultText.pleaseChoose')" :disabled="!domain.canEdit">
@@ -1550,6 +1572,7 @@
                 membCount:0,
                 selectState:"-1",
                 user: JSON.parse(sessionStorage.getItem("user")),
+                allUsersList: [],
                 showAddMore:false,
                 allDate: [],
                 typeList:[this.$t('other.allDay'),this.$t('other.morning'),this.$t('other.afternoon')],
@@ -1742,6 +1765,9 @@
             
         },
         methods: {
+            test(){
+                console.log('test',this.depData,this.data[0].membCount,this.reportList.length);
+            },
             weeklyFilledTimeClick(parameterDate){ //按周填报-已填工时-点击
                 this.weeklyFilledTimeDialog = true
                 this.weeklyFilledTimeLoading = true
@@ -3998,7 +4024,7 @@
                     });
                 
             },
-            // 获取个人某天的日报 000000
+            // 获取个人某天的日报 111111
             getReport() {
                 this.http.post( this.port.report.getPort, {
                     date: this.workForm.createDate
@@ -5206,7 +5232,7 @@
                 return true
             },
 
-            // 保存日报
+            // 保存日报111111
             submitReport(isDraft) {
                 this.isDraft = isDraft;
                 this.$refs.workForm.validate(valid => {
@@ -5738,6 +5764,25 @@
                 this.toViewForm.pageSize = val;
                 this.getToView();
             },
+
+            getAllUsersList(){
+                this.http.post('/user/getSimpleActiveUserList',{
+                },res => {
+                    if(res.code == 'ok'){
+                        this.allUsersList = res.data
+                    }else{
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        })
+                    }
+                },err => {
+                    this.$message({
+                        message: err,
+                        type: 'error'
+                    })
+                })
+            }
         },
         created() {
             let height = window.innerHeight;
@@ -5797,6 +5842,9 @@
             this.getDepartment();
             this.scrollFunction()
             this.userssHu();
+            if(this.user.timeType.reportAuditType == 3){
+                this.getAllUsersList()
+            }
             if (this.user.company.packageProject == 1) {
                 this.getBasecostItemList();
             }