2022.10.19

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

@@ -191,7 +191,7 @@
         </el-dialog>
         <!-- 其他设置 -->
         <el-dialog v-if="editDialogG" :visible.sync="editDialogG" title="其他设置">
-            <el-form label-width="100px">
+            <el-form label-width="100px" class="otherForm">
                 <el-form-item><el-checkbox v-model="dialogData.reportWorkflow">是否开启审批流设置</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.needEvaluate">审核通过需输入评价</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.mainProjectState">是否启用主项目模式</el-checkbox></el-form-item>
@@ -803,4 +803,11 @@
     margin-left: 10px;
     margin-bottom: 5px;
 }
+</style>
+<style>
+.otherForm .el-form-item{
+    float: left;
+    width: 50%;
+    margin: 0;
+}
 </style>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -12,7 +12,7 @@
                     </div>
                 </van-grid-item>
             </van-grid>
-            <van-grid :column-num="weekIndex" :border="false" style="position:relative">
+            <van-grid :column-num="weekIndex == 7 ? weekIndex : weekIndex + 1" :border="false" style="position:relative">
                 <van-grid-item v-for="item,index in dateRange" :key="index" :class="index == inbtn ? 'inbtn' : ''">
                     <van-button
                     class="selectgxbtn"
@@ -21,6 +21,9 @@
                     @click="switchWeek(item,index)"
                     :disabled="canSelect(item)">{{weekArr[index]}}</van-button>
                 </van-grid-item>
+                <van-grid-item v-if="weekIndex != 7">
+                    <van-button type="default" size="mini" class="selectgxbtn" @click="addWeekIndex()" icon="plus"></van-button>
+                </van-grid-item>
                 <div class="kaoqin" v-if="kaoqinText"><span>当日考勤记录：</span><span>{{kaoqinText}}</span></div>
                 <div class="kaoqin" v-if="workTimeText"><span>已填报工时：</span><span>{{workTimeText}}小时</span></div>
                 <div class="submitClear">
@@ -429,7 +432,7 @@
 
                 dateRange: [],  //周时间数组
                 dateText: [],   //时间段字符串
-                weekArr: ['周一','周二','周三','周四','周五','周六'],
+                weekArr: ['周一','周二','周三','周四','周五','周六','周日'],
                 inbtn: 0,
                 weekIndex: 5,
                 weekSwitchIndex: 1,
@@ -524,23 +527,6 @@
             },
             // 切换星期
             switchWeek(item,index){
-                // if(this.user.timeType.notAllowedNoAttendance == 1){
-                //     let havework = false
-                //     for(let i in this.currentForm.domains){
-                //         if(this.currentForm.domains[i].projectId){
-                //             havework = true
-                //         }
-                //     }
-                //     if(havework){
-                //         if(this.kaoqinText){
-                //             if(this.currentForm.cardtime == 0){
-                //                 this.$toast.fail('无考勤记录' + this.weekArr[this.inbtn] +'不可填报')
-                //             }
-                //         }else{
-                //             this.$toast.fail('无考勤记录' + this.weekArr[this.inbtn] +'不可填报')
-                //         }
-                //     }
-                // }
                 this.form[this.inbtn] = this.currentForm
                 this.inbtn = index
                 this.currentForm = this.form[this.inbtn]
@@ -552,6 +538,37 @@
                 this.getKaoqin()
                 this.getWorkTime()
             },
+            addWeekIndex(){
+                console.log(this.weekIndex, this.dateRange);
+                if(this.dateRange.length < 7){
+                    this.weekIndex += 1
+                    let time = this.dateRange[this.dateRange.length - 1]
+                    this.dateRange.push(new Date(time.getFullYear(),time.getMonth(),time.getDate()+1))
+                    let time2 = new Date(this.dateText[1])
+                    let time3 = new Date(time2.getFullYear(),time2.getMonth(),time2.getDate()+1)
+                    this.dateText[1] = this.format(time3,'yyyy-MM-dd')
+                    this.form.push({
+                            createDate: this.format(this.dateRange[this.dateRange.length - 1],"yyyy-MM-dd"),
+                            domains: [{
+                                id: null,
+                                projectId: "",
+                                projectName: "",
+                                workingTime: this.user.timeType.allday,
+                                content: "",
+                                progress: 100,
+                                state: 2,
+                                multiWorktime:0,
+                                worktimeList:[{}],
+                                degreeId: '',
+
+                                auditorFirst: {name:'',id:''},
+                                auditorSec: {name:'',id:''},
+                                auditorThird: {name:'',id:''},
+                                ccUserid: {name:'',id:''}
+                            }],
+                        })
+                }
+            },
             
             // 获取日考勤记录
             getKaoqin(){
@@ -602,6 +619,8 @@
             getDateRange(){
                 if(this.user.companyId == 817){
                     this.weekIndex = 6
+                }else{
+                    this.weekIndex = 5
                 }
                 let nowDate = new Date()
                 let nowWeekday = nowDate.getDay()
@@ -1926,7 +1945,6 @@
         },
         
         mounted() {
-            this.user.timeType.notAllowedNoAttendance = 1
             this.timeRange = []
             for(let i=0.5; i<=20; i+=0.5){
                 this.timeRange.push(i)

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/projectInside.vue

@@ -400,6 +400,7 @@ export default {
         }
     }
     .addtaskicon{
+        opacity: 0.5;
         position: fixed;
         z-index: 1000;
         font-size: 50px;