2022.6.2

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,8 +2,8 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '192.168.2.39'
-// var ip = '192.168.2.10'
-var ip = '192.168.2.39'
+var ip = '192.168.2.10'
+// var ip = '192.168.2.39'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

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

@@ -150,7 +150,7 @@ export default {
     gantt.config.drag_links = false
     gantt.config.drag_resize = false
     gantt.config.drag_progress = false
-    
+    gantt.config.details_on_dblclick = false
     gantt.config.lightbox.sections = [
       {name:"description", height:76, map_to:"text", type:"textarea",focus:true}
     ];

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

@@ -443,6 +443,13 @@ export default {
                                     delete this.tasks.data[i].end_date
                                     this.tasks.data[i].type = 'milestone'
                                   }
+                                  if(this.tasks.data[i].end_date){
+                                    let date = new Date(this.tasks.data[i].end_date)
+                                    let date2 = new Date(date.getFullYear(),date.getMonth(),date.getDate() + 1)
+                                    let dmonth = date2.getMonth() + 1
+                                    let dday = date2.getDate()
+                                    this.tasks.data[i].end_date = date2.getFullYear() + '-' + (dmonth < 10 ? '0' + dmonth : dmonth) + '-' + (dday < 10 ? '0' + dday : dday)
+                                  }
                                 }
                                 this.$nextTick(()=>{
                                   this.updatakey1 += 1

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

@@ -152,7 +152,7 @@
             
             <el-form-item label="用时占比">
                 <!-- <el-col span="6">用时占比： </el-col> -->
-                <el-col span="12" style="padding-left:0;padding-right:0;"><el-slider v-model="progress" :step="10" style="width:100px;" ></el-slider></el-col>
+                <el-col span="12" style="padding-left:0;padding-right:0;"><el-slider v-model="progress" :step="5" style="width:100px;" ></el-slider></el-col>
                 <el-col span="2" style="padding-left:0;padding-right:0;"><span style="margin-left:10px;"><span style="margin-right:10px;">{{progress}}%</span>{{(progress*8/100).toFixed(1)}}小时</span></el-col>
             </el-form-item>
             </el-form>

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

@@ -44,7 +44,7 @@
                         <el-option value="3" label="待提交">待提交</el-option>
                         </el-select></div>
                     <div>
-                        <el-tree :data="data"  @node-click="handleNodeClick" >
+                        <el-tree :data="data"  @node-click="handleNodeClick" node-key="id" :default-expanded-keys="expandDate">
                             <span class="custom-tree-node" slot-scope="{ node, data}">
                             <span>{{ node.label }}</span>
                             <span v-if="data.membCount != null && data.isUser == null">({{data.membCount}})</span>
@@ -390,7 +390,7 @@
                     <el-form-item v-if="reportTimeType.type == 3" label="用时占比" :prop="'domains.' + index + '.'+timeFields[reportTimeType.type]"
                         :rules="{ required: true, message: '请设置用时占比', trigger: 'blur' }">
                         <div style="width:300px;">
-                            <el-col span="14"><el-slider :disabled="!canEdit" v-model="domain.progress" :min="10" :show-tooltip="false" :step="10" style="width:180px;" @input="domain.workingTime = (reportTimeType.allday*domain.progress/100).toFixed(1)" @change="seleChn(0)"></el-slider></el-col>
+                            <el-col span="14"><el-slider :disabled="!canEdit" v-model="domain.progress" :min="5" :show-tooltip="false" :step="5" style="width:180px;" @input="domain.workingTime = (reportTimeType.allday*domain.progress/100).toFixed(1)" @change="seleChn(0)"></el-slider></el-col>
                             <el-col span="10"><span style="margin-left:10px;float:right;"><span style="margin-right:10px;">{{domain.progress}}%</span>{{domain.workingTime}}小时</span></el-col>
                         </div>
                         <div class="overtime" v-if="user.timeType.fillOvertime"><el-checkbox :disabled="!canEdit" v-model="domain.isOvertime">加班</el-checkbox>
@@ -1456,7 +1456,8 @@
                 isFlag: false,
                 isMore: false,
 
-                stateKey: '0'
+                stateKey: '0',
+                expandDate: []
             };
         },
         watch: {
@@ -3024,6 +3025,7 @@
                         //设置员工到部门下面
                         this.setUserToDept(list);
                         this.data = list;
+                        this.expandDate = [this.data[1].id]
                         this.allData = list;
                         
                         // if (noAllData.length > 0) {