2022.6.1

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.2'
-var ip = '192.168.2.39'
+var ip = '192.168.2.2'
+// 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/projectInside.vue

@@ -172,7 +172,7 @@
                                                     <el-link class="sub_task_num" @click.stop.native="showSubTaskList(element)"><i class="iconfont firerock-icontree" ></i><span style="margin-left:5px;">{{element.finishRefTaskCount}}/{{element.refTaskList.length}}</span></el-link>
                                                     </el-tooltip>
                                                 </div> -->
-                                                <div v-if="element.taskType == 1 && element.refTaskList != null"  class="taskCardCircleBox">
+                                                <div v-if="element.taskType == 1 && element.refTaskList.length != 0"  class="taskCardCircleBox">
                                                     <el-progress type="circle" :percentage="(element.finishRefTaskCount/element.refTaskList.length) * 100" width="16" :show-text="false" stroke-linecap="butt" stroke-width="8"></el-progress>
                                                     <span style="margin-left:5px;font-size:12px">{{element.finishRefTaskCount}}/{{element.refTaskList.length}}</span>
                                                 </div>

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

@@ -233,7 +233,7 @@
                         icon="plus" color="#ffffff" ><span style="color:#999;text-align:center;padding: 0 5px;"> 添加工时  </span></van-tag>
                     </div>
                     
-                    <div class="overtime" >
+                    <div class="overtime" v-if="!user.timeType.lockWorktime">
                         <div class="overTimeClas">
                             <van-checkbox :disabled="!canEdit" v-model="item.isOvertime" style="width: 4.3rem;">含加班</van-checkbox>
                             <van-field v-model="item.overtimeHours" type="number" :disabled="!canEdit || item.isOvertime==null||item.isOvertime==0"

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

@@ -218,7 +218,7 @@
                         icon="plus" color="#ffffff" ><span style="color:#999;text-align:center;padding: 0 5px;"> 添加工时  </span></van-tag>
                     </div>
                     
-                    <div class="overtime" >
+                    <div class="overtime" v-if="!user.timeType.lockWorktime">
                         <div class="overTimeClas">
                             <van-checkbox  v-model="item.isOvertime" style="width: 4.3rem;">加班</van-checkbox>
                             <van-field v-model="item.overtimeHours" type="number" :disabled="item.isOvertime==null||item.isOvertime==0"

fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/index.vue

@@ -4,10 +4,10 @@
         
         <div class="login_form">
             <div class="formBatch">
-                <van-checkbox v-model="isAllChecked" @click="allChecked" shape="square" style="padding-left:3vw"></van-checkbox>
+                <van-checkbox v-model="isAllChecked" :disabled="report.length == 0" @click="allChecked" shape="square" style="padding-left:3vw"></van-checkbox>
                 <div style="padding:1vh 2vw">
-                <van-button @click="batchAgree(true)" :disabled="!isCanAgree" type="info" size="small">批量通过</van-button>
-                <van-button @click="batchAgree(false)" :disabled="!isCanAgree" type="danger" size="small" style="margin-left:2vw">批量驳回</van-button>
+                <van-button @click="batchAgree(true)" :disabled="!isCanAgree || report.length == 0" type="info" size="small">批量通过</van-button>
+                <van-button @click="batchAgree(false)" :disabled="!isCanAgree || report.length == 0" type="danger" size="small" style="margin-left:2vw">批量驳回</van-button>
                 </div>
             </div>
             <van-skeleton  v-for="(item,index) in report" :key="index" title avatar :row="3" :loading="false">
@@ -247,6 +247,10 @@
                     if(res.code == "ok") {
                         this.$toast.clear();
                         this.report = res.data;
+                        // this.isAllChecked = this.report.length == 0 ? false : true
+                        if(this.report.length == 0){
+                            this.isAllChecked = false
+                        }
                         for(let i in this.report){
                             this.$set(this.report[i],'checked',false)
                         }