Merge remote-tracking branch 'origin/master'

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

@@ -46,7 +46,7 @@
                         <el-button @click="batchApprove(true)" style="margin-left:10px;" :loading="batchApproveLoading" :disabled="multipleSelection.length==0" size="mini">批量通过</el-button>
                         <el-button @click="batchApprove(false)"  :loading="batchDenyLoading"  :disabled="multipleSelection.length==0" size="mini">批量驳回</el-button>
                     </el-form-item>
-                    <el-form-item style="margin-left:20px;" v-if="permissions.importAudit">
+                    <el-form-item style="margin-left:20px;">
                     <el-link type="primary" @click="recordList(),recordDialogVisible = true,pageIndexList = 1,pageSizeList = 20">审核记录</el-link>
                     </el-form-item>
                 <!-- </div> -->

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

@@ -173,7 +173,7 @@
                         </template>
                     </van-cell>
                     <van-field class="form_input" :disabled = "!canEdit"
-                    v-model="item.content" name="content" type="textarea" :label="user.companyId==781?'具体内容与结果':'工作事项'" placeholder="请输入" 
+                    v-model="item.content" name="content" type="textarea" :label="user.companyId==781?'具体内容与结果':'工作事项'" placeholder="请输入" :rules="user.timeType.workContentState == 1 ? [{ required: true, message: '请填写工作事项' }] : null"
                     rows="3" autosize  />
                     </div>
                     
@@ -197,7 +197,7 @@
                             <van-field class="form_input" :disabled="!canEdit" style="color:#333;-webkit-text-fill-color:#646566;"
                             
                                 v-model="timeItem.content" name="content" type="textarea" label="工作事项" placeholder="请输入工作事项" 
-                                :rules="[{ required: true, message: '必填项' }]"
+                                :rules="user.timeType.workContentState == 1 ? [{ required: true, message: '请填写工作事项' }] : null"
                                 rows="1" autosize  />
                         </div>
                         <!--时间选择器 , 做统一处理，不能放到循环里，不然会有多个公用showStartTime,最后一个会现在最上层UI,导致BUG -->

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

@@ -166,7 +166,7 @@
                     </van-cell>
                     <van-field class="form_input"
                     v-model="item.content" name="content" type="textarea" :label="user.companyId==781?'具体内容与结果':'工作事项'" placeholder="请输入" 
-                    rows="3" autosize  />
+                    rows="3" autosize :rules="user.timeType.workContentState == 1 ? [{ required: true, message: user.companyId==781?'具体内容与结果':'工作事项' }] : null" />
                     </div>
                     
                     <!-- 多个时间和工作事项的选择方式 -->
@@ -189,7 +189,7 @@
                             <van-field class="form_input" style="color:#333;-webkit-text-fill-color:#646566;"
                             
                                 v-model="timeItem.content" name="content" type="textarea" label="工作事项" placeholder="请输入工作事项" 
-                                :rules="[{ required: true, message: '必填项' }]"
+                                :rules="user.timeType.workContentState == 1 ? [{ required: true, message: '请填写工作事项' }] : null"
                                 rows="1" autosize  />
                         </div>
                         <!--时间选择器 , 做统一处理，不能放到循环里，不然会有多个公用showStartTime,最后一个会现在最上层UI,导致BUG -->