2022.9.8 css。。。

fhKeeper/formulahousekeeper/timesheet/index.html

@@ -71,11 +71,12 @@
             .projectSelectPopperClass .el-select-dropdown__item span:nth-child(1){
                 font-size: 13px;
                 height: 34px;
+                width: 35%;
             }
             .projectSelectPopperClass .el-select-dropdown__item span:nth-child(2){
                 font-size: 13px;
                 height: 34px;
-                width: 70%;
+                width: 65%;
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -62,7 +62,7 @@
           <el-select v-model="cusProJuctId" placeholder="请选择项目" clearable filterable size="small" @change="selcts()" popper-class="projectSelectPopperClass">
             <el-option v-for="(item) in cusProListOvertime" :key="item.id" :label="item.projectName + (item.projectCode ? item.projectCode : '')" :value="item.id">
               <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
-              <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
+              <span style="float: right;font-size: 13px;">{{ item.projectName }}</span>
             </el-option>
           </el-select>
         </template>

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -117,7 +117,7 @@
                 <el-select size="small" v-model="scope.row.projectId" placeholder="项目" style="width: 150px" filterable popper-class="projectSelectPopperClass">
                   <el-option v-for="(item, index) in projectList" :key="index" :label="item.projectName + item.projectCode" :value="item.id" @click="ok(item)">
                     <span style="float: left;color: #8492a6; font-size: 13px">{{ item.projectCode }}</span>
-                    <span style="float: right;margin-left: 20px">{{ item.projectName }}</span>
+                    <span style="float: right;">{{ item.projectName }}</span>
                   </el-option>
                 </el-select>
               </template>

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

@@ -71,7 +71,7 @@
                     <el-select v-model="exportParam.projectId" placeholder="全部项目"  clearable style="width:350px;" filterable="true" popper-class="projectSelectPopperClass">
                         <el-option v-for="item in projectList"  :key="item.id" :label="item.projectName + item.projectCode" :value="item.id">
                             <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
-                            <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
+                            <span style="float: right;font-size: 13px;">{{ item.projectName }}</span>
                         </el-option>
                     </el-select>
                 </el-form-item>

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

@@ -340,7 +340,7 @@
                             @change="iptChang()">
                         </el-time-picker>
                         </span>
-                        <div class="overtime" v-if="user.timeType.fillOvertime || isWeekend">
+                        <div class="overtime" v-if="user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)">
                             <el-checkbox :disabled="!domain.canEdit" v-model="domain.isOvertime">{{$t('other.IncludingOvertime')}}</el-checkbox>
                             <el-input :disabled="!domain.canEdit || domain.isOvertime==null || domain.isOvertime==0 || !domain.isOvertime" v-model="domain.overtimeHours" @blur="triggerCalculateOT(index)" @input="domain.overtimeHours=domain.overtimeHours.replace(/[^\d.]/g,'')" style="width: 100px;"></el-input><span style="margin-left:5px">{{$t('time.hour')}}</span>
                         </div>
@@ -354,7 +354,7 @@
                             <!-- <el-option v-for="item in projectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName" :value="item.id"></el-option> -->
                             <el-option v-for="item in fillProjectList" :disabled="item.status!=1 && item.status!=4" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
                                 <span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
-                                <span style="float: right;margin-left: 20px">{{ item.projectName }}</span>
+                                <span style="float: right;">{{ item.projectName }}</span>
                             </el-option>
                         </el-select>
                         <template v-if="user.timeType.mainProjectState != 1">
@@ -463,7 +463,7 @@
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" popper-class="projectSelectPopperClass">
                                 <el-option v-for="item in fillProjectList" :disabled="item.status!=1 && item.status!=4" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
                                     <span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
-                                    <span style="float: right;margin-left: 20px">{{ item.projectName }}</span>
+                                    <span style="float: right;">{{ item.projectName }}</span>
                                 </el-option>
                             </el-select>
                             <template v-if="user.timeType.mainProjectState != 1">
@@ -482,7 +482,7 @@
                                 <i class="fa fa-trash" style="color: red;;font-size:18px;"></i>
                             </el-link>
 
-                            <div class="overtime" v-if="user.timeType.fillOvertime || isWeekend"><el-checkbox :disabled="!domain.canEdit" v-model="domain.isOvertime">{{$t('other.IncludingOvertime')}}</el-checkbox>
+                            <div class="overtime" v-if="user.timeType.fillOvertime"><el-checkbox :disabled="!domain.canEdit" v-model="domain.isOvertime">{{$t('other.IncludingOvertime')}}</el-checkbox>
                             <el-input :disabled="!domain.canEdit || domain.isOvertime==null || domain.isOvertime==0 || !domain.isOvertime" v-model="domain.overtimeHours" @blur="triggerCalculateOT(index)" @input="domain.overtimeHours=domain.overtimeHours.replace(/[^\d.]/g,'')" style="width: 100px;"></el-input><span style="margin-left:5px">{{$t('time.hour')}}</span>
                             </div>
                             
@@ -4000,7 +4000,7 @@
                                 userNames:null,
                                 time: this.report.time
                             }
-                            if(this.isWeekend){
+                            if(this.isWeekend && this.user.timeType.lockWorktime != 1){
                                 this.$set(this.workForm.domains[0],'isOvertime',true)
                                 if(this.reportTimeType.type != 2){
                                     this.$set(this.workForm.domains[0],'overtimeHours',this.reportTimeType.allday.toFixed(0))
@@ -4991,7 +4991,7 @@
                         canEdit: true
                         // degreeId: '',
                 };
-                if(this.isWeekend){
+                if(this.isWeekend && this.user.timeType.lockWorktime != 1){
                     this.$set(addItem,'isOvertime',true)
                     if(this.reportTimeType.type == 3){
                         this.$set(addItem,'overtimeHours',(leftProgress*this.reportTimeType.allday/100).toFixed(0))
@@ -5755,9 +5755,9 @@
         .chooseDate {
             position: absolute;
             bottom: -3px;
-            width: 34px;
+            width: 37px;
             height: 2px;
-            left: 12px;
+            left: 14px;
             background: #20a0ff;
         }
     }

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

@@ -19,7 +19,7 @@
                     <el-select v-model="search.projectId" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="getList()" filterable="true" size="mini" style="width: 175px" popper-class="projectSelectPopperClass">
                         <el-option v-for="item in projectList" :key="item.id" :label="item.projectName + item.projectCode" :value="item.id">
                             <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
-                            <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
+                            <span style="float: right;font-size: 13px;">{{ item.projectName }}</span>
                         </el-option>
                     </el-select>
                 </el-form-item>

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

@@ -239,8 +239,8 @@
                         icon="plus" color="#ffffff" ><span style="color:#999;text-align:center;padding: 0 5px;"> 添加工时  </span></van-tag>
                     </div>
                     
-                    <div class="overtime" v-if="((user.timeType.fillOvertime || isWeekend) || (isCorpWX&&canEdit))">
-                        <div class="overTimeClas" v-if="user.timeType.fillOvertime || isWeekend">
+                    <div class="overtime" v-if="((user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)) || (isCorpWX&&canEdit))">
+                        <div class="overTimeClas" v-if="user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)">
                             <van-checkbox :disabled="!item.canEdit" v-model="item.isOvertime" style="width: 4.3rem;">含加班</van-checkbox>
                             <van-field v-model="item.overtimeHours" type="number" :disabled="!item.canEdit || item.isOvertime==null||item.isOvertime==0 || !item.isOvertime"
                             placeholder="请输入加班时长" style="width: 5rem"></van-field>
@@ -323,6 +323,7 @@
 <script src="//res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
 <script>
     import wx from 'weixin-js-sdk'
+import timetoolVue from '../timetool/timetool.vue';
     // Vue.prototype.$wx = wx
     export default {
         data() {
@@ -1003,7 +1004,7 @@
                                 worktimeList:[{}],  
                                 canEdit: true
                             }]
-                            if(this.isWeekend){
+                            if(this.isWeekend && this.user.timeType.lockWorktime != 1){
                                 this.$set(this.form.domains[0],'isOvertime',true)
                                 if(t.type != 2 && t.type != 0){
                                     this.$set(this.form.domains[0],'overtimeHours',t.allday.toFixed(0))
@@ -1269,7 +1270,7 @@
                     degreeId: null,
                     canEdit: true
                 }
-                if(this.isWeekend){
+                if(this.isWeekend && this.user.timeType.lockWorktime != 1){
                     this.$set(item,'isOvertime',true)
                     if(this.reportTimeType.type == 3){
                         this.$set(item,'overtimeHours',(leftProgress*this.reportTimeType.allday/100).toFixed(1))