h5

fhKeeper/formulahousekeeper/timesheet_h5/src/views/cost/cost.vue

@@ -3,7 +3,7 @@
     <div class="title222">
         <van-sticky offset-top="-0.9rem">
             <van-cell :title="'选择日期：' + costDateTitle" @click="costDateShow = true" class="costDateSel" />
-            <van-calendar v-model="costDateShow" type="range" :show-confirm="false" @confirm="dateConfirm" :min-date="minDate" :max-date="maxDate" />
+            <van-calendar v-model="costDateShow" type="range" :allow-same-day="true" :show-confirm="false" @confirm="dateConfirm" :min-date="minDate" :max-date="maxDate" />
             <van-tabs v-model="active" @change="activeChange" background="#20a0ff" title-active-color="#fff" title-inactive-color="#3c3c45" style="height:1.17333rem;">
                 <van-tab title="项目"></van-tab>
                 <van-tab title="项目分类"></van-tab>

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

@@ -69,7 +69,8 @@
         <!-- 参与人 -->
         <van-field label="全部参与人" @click="userNamesShow = true" readonly clickable v-show="projectDetail.isPublic == 0">
             <template #input>
-                <span v-if="user.userNameNeedTranslate == '1'">
+                <span v-if="!projectDetail.userNames"></span>
+                <span v-else-if="user.userNameNeedTranslate == '1'">
                     <span v-for="item,index in projectDetail.userNames.split(',')" :key="item">
                         <ww-open-data type='userName' :openid='item'></ww-open-data>
                         <span v-if="index != (projectDetail.userNames.split(',').length - 1)">,</span>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue

@@ -15,7 +15,7 @@
                     @cancel="taskType.show = false;$forceUpdate();"/>
                 </van-popup>
                 <!-- 任务内容 -->
-                <van-field v-model="taskform.name" label="任务内容" placeholder="请输入任务内容" :rules="[{ required: true, message: '请输入任务内容' }]" type="textarea" :disabled="!canEdit"></van-field>
+                <van-field v-model="taskform.name" label="任务内容" placeholder="请输入任务内容" :rules="[{ required: true, message: '请输入任务内容' }]" type="textarea" :disabled="!canEdit" :maxlength="40" show-word-limit></van-field>
                 <!-- 开始时间 -->
                 <van-field v-if="taskform.type != 1" v-model="taskform.startDate" label="开始时间" placeholder="请选择开始时间" @click="startDateShow = true" readonly clickable></van-field>
                 <van-popup v-model="startDateShow" position="bottom" v-if="canEdit">