2022.10.14 姓名搜索

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

@@ -207,6 +207,8 @@
                 <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">是否开启填报不超过考勤工时</el-checkbox></el-form-item> -->
                 <el-form-item>
                     日报审核模式：
                     <el-select v-model="dialogData.reportAuditType" size="small">
@@ -365,6 +367,7 @@
                             this.$set(this.dialogData,'projectWithDept',res.data.projectWithDept ? true : false)
                             this.$set(this.dialogData,'financeJobnumEnabled',res.data.financeJobnumEnabled ? true : false)
                             this.$set(this.dialogData,'reportAutoApprove',res.data.reportAutoApprove ? true : false)
+                            this.$set(this.dialogData,'noWorkToReport',res.data.noWorkToReport ? true : false)
                             this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                         }else{
                             this.$message({
@@ -638,6 +641,7 @@
                     projectWithDept: this.dialogData.projectWithDept ? 1 : 0,
                     financeJobnumEnabled: this.dialogData.financeJobnumEnabled ? 1 : 0,
                     reportAutoApprove: this.dialogData.reportAutoApprove ? 1 : 0,
+                    noWorkToReport: this.dialogData.noWorkToReport ? 1 : 0,
                     reportAuditType: this.dialogData.reportAuditType
                 },res => {
                     if(res.code == 'ok'){

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

@@ -27,6 +27,9 @@
                 <div class="grand flex">
                     <div class="left-laowang" style="flex: 0 0 210px;overflow: hidden;" v-if="permissions.reportsCompany || user.manageDeptId != 0 || permissions.reportsDept">
                         <div v-if="permissions.reportsCompany || user.manageDeptId != 0 || permissions.reportsDept" :style="'overflow-x:hidden;overflow-y:auto;height:' + tableHeight + 'px;'">
+                            <el-input placeholder="请输入姓名" size="small" style="width: 100%;box-sizing: border-box;padding-right: 10px;padding-bottom:10px" v-model="seluserText" clearable>
+                                <el-button slot="append" icon="el-icon-search" @click="seluserforText()"></el-button>
+                            </el-input>
                             <div style="width: 100%;box-sizing: border-box;padding-right: 10px;">
                                 <el-select v-model="selectState" size="small" @change="stateChange" style="100%">
                                 <el-option value="-1" :label="$t('state.allState')">{{$t('state.allState')}}</el-option>
@@ -35,7 +38,8 @@
                                 <el-option value="0" :label="$t('state.WaitingAudit')">{{$t('state.WaitingAudit')}}</el-option>
                                 <el-option value="2" :label="$t('state.notThrough')">{{$t('state.notThrough')}}</el-option>
                                 <el-option value="3" :label="$t('state.waitingsubmit')">{{$t('state.waitingsubmit')}}</el-option>
-                                </el-select></div>
+                                </el-select>
+                            </div>
                             <div>
                                 <el-tree :data="data"  @node-click="handleNodeClick" node-key="id" :default-expanded-keys="expandDate">
                                     <span class="custom-tree-node"  style="position: relative;box-sizing: border-box;width: 10%;" slot-scope="{ node, data}">
@@ -1572,6 +1576,7 @@
         },
         data() {
             return {
+                seluserText: '',
                 translation: '1', // 1、文字, 2、部门, 3、人员
                 exportLoad: false,
                 getPickerOptions: {
@@ -1820,6 +1825,7 @@
             }
         },
         filters: {
+            
             // 过滤
             amounts(value) {
                 if(value == NaN || value == undefined || value == 'undefined' || value == null || value == 'null') {
@@ -3426,12 +3432,14 @@
                 }
             },
             stateChange() {
+                console.log(this.allData,'alldate');
                 this.membCount = 0;
                 if (this.selectState == -1) {
                     //全部状态
                     this.data = this.allData;
                 } else {
                     //未填报
+                    this.seluserText = ''
                     var newData = JSON.parse(JSON.stringify(this.allData));
                     this.filterState(this.selectState, newData);
                     this.data = newData;
@@ -3466,6 +3474,36 @@
                     }
                 }
             },
+            //a按名称过滤部门人员
+            
+            seluserforText(){
+                this.membCount = 0;
+                var newData = JSON.parse(JSON.stringify(this.allData));
+                this.seluserforTextin(this.seluserText, newData)
+                this.data = newData;
+                this.calculateMembCount(this.data);
+                this.data[0].membCount = this.membCount;//总人数
+            },
+            seluserforTextin(text, list){
+                for (var i =0;i<list.length; i++) {
+                    var obj = list[i];
+                    if (obj.isUser == 1) {
+                        var match = false;
+                        if (obj.label.indexOf(text) != -1) {
+                            match = true
+                        }
+                        if (!match) {
+                            list.splice(i, 1);
+                            i--;
+                        } else {
+                        }
+                    } else {
+                        if (obj.children != null) {
+                            this.seluserforTextin(text, obj.children);
+                        }
+                    }
+                }
+            },
             // 部门列表点击
             handleNodeClick(data) {
                 // this.dealList = data
@@ -5535,7 +5573,7 @@
                         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) {
+                        if (this.reportTimeType.type == 1 && this.workForm.time && user.timeType.noWorkToReport == 1) {
                             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)",