Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -505,7 +505,9 @@
                     <el-form-item :label="$t('subordinatedepartments')" :prop="user.companyId == 936 ? 'deptId' : false" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.timeType.projectWithDept">
                         <el-cascader v-model="addForm.deptId" :options="departmentList" :placeholder="$t('defaultText.pleaseChoose')" :disabled="canOnlyModParticipator"
                             :props="{ checkStrictly: true, expandTrigger: 'hover' }" clearable filterable @change="cascaderChange" style="width: 100%"
+                            v-if="user.userNameNeedTranslate != 1">
                         ></el-cascader>
+                        <vueCascader :size="'medium'" :widthStr="'430'" :filterable="true" :clearable="true" :subject="departmentList" :subjectId="addForm.deptId" :radios="true" :distinction="'20'" :disabled="canOnlyModParticipator" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1" ></vueCascader>
                     </el-form-item>
 
                     <!-- 供应商 -->
@@ -1777,10 +1779,12 @@ a {
     import projectgantt from "./project_gantt.vue"
     // 自定义select组件
     import selectCat from "@/components/select.vue"
+    import vueCascader from "@/components/cascader.vue"
     export default {
         components:{
             projectgantt,
-            selectCat
+            selectCat,
+            vueCascader,
         },
         data() {
             return {
@@ -5739,6 +5743,8 @@ a {
                     let arr = []
                     arr.push(obj.id)
                     this.addForm.bu = arr.join(",")
+                } else if(obj.distinction == '20') {
+                    this.addForm.deptId = obj.id
                 }
             },
             changSubStatus(subProject) {

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

@@ -419,7 +419,7 @@
                                 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: 5.2rem"></van-field>
+                                placeholder="请输入加班时长" style="width: 5.2rem" @input="$forceUpdate()"></van-field>
                             <span :class="item.canEdit ? 'overListTime' : 'overListTime hoveOver'">小时</span>
                         </div>
                         <van-tag style="position:absolute;right:10px;" v-if="isCorpWX && item.canEdit" type="primary"