2023.11.11

src/components/common/EmployeeSelector.vue

@@ -2,7 +2,7 @@
   <van-popup @open="openPopup" :duration="0.2" :overlay="false" class="employee_selector_popup" v-model="visible_" :position="position" :style="'height:' + com_height">
     <slot name="nav"></slot>
     <van-nav-bar v-if="!$slots.nav" :title="title" left-text="取消" @click-left="close"></van-nav-bar>
-    <van-search v-model="keyword" v-if="can_select_employee" placeholder="请输入姓名搜索" maxlength="20"/>
+    <van-search v-model="keyword" v-if="can_select_employee" show-action placeholder="请输入姓名搜索" maxlength="20"/>
     <div style="height: 0.2rem;" v-else></div>
     <template v-if="isShowDeptsAll">
       <div @click="isShowDeptSelect()" class="sax">

src/components/common/OssUploader.vue

@@ -331,7 +331,6 @@ export default {
         } else {
           this.oss_fileList = JSON.parse(JSON.stringify(this.fileObj))
         }
-        console.log(JSON.stringify(this.filelist))
         this.$toast.clear()
       }).catch(err => {
         this.$toast.clear()

src/components/common/integralApplyItem.vue

@@ -34,7 +34,7 @@
       <van-cell required>
         <Mtextarea v-model="item.remark" name="申请事由" v-validate="'required|max:300'" placeholder="请输入申请事由(最多300字)" :text_max="300" :imgs_max="3" images speech :imgs.sync="item.files"></Mtextarea>
       </van-cell>
-      <DateCell required title="选择日期" v-model="item.event_time"></DateCell>
+      <DateCell required title="发生时间" v-model="item.event_time"></DateCell>
       <div>
         <EmployeeSelectorCell v-show="superior_list.length != 0" required title="审批人" name="审批人" v-validate="'required'" :employee_list="superior_list" use_employee_list v-model="employee_list" :multi="false" ></EmployeeSelectorCell>
 

src/components/integral/integral_application.vue

@@ -88,7 +88,7 @@ export default {
           return false
         }
         if (!self.fromData.items[i].event_time) {
-          self.$notify({ type: 'danger', message: '第' + (parseInt(i) + 1) + '条请选择日期'})
+          self.$notify({ type: 'danger', message: '第' + (parseInt(i) + 1) + '条请选择发生时间'})
           self.subloading = false
           return false
         }

src/components/integral/integral_entry_b.vue

@@ -26,7 +26,7 @@
             <Mtextarea v-model="item.remark" name="申请事由" v-validate="'required|max:100'" placeholder="请输入申请事由(最多100字)" :text_max="100" :imgs_max="3" images speech :imgs.sync="item.files"></Mtextarea>
           </van-cell>
           <van-field v-model="item.point" label="分值" placeholder="请输入分值" required/>
-          <DateCell required title="选择日期" v-model="item.event_time"></DateCell>
+          <DateCell required title="发生时间" v-model="item.event_time"></DateCell>
           <EmployeeSelectorCell title="审批人" use_employee_list v-model="item.reviewer_list" :multi="false" :max="1"></EmployeeSelectorCell>
         </van-cell-group>
 
@@ -42,7 +42,7 @@
           </van-cell>
           <CategorySelectorCell title="选择分类" v-model="item.rule_cate" :max="1" :multi="false" required></CategorySelectorCell>
           <van-field v-model="item.point" label="分值" placeholder="请输入分值" required/>
-          <DateCell required title="选择日期" v-model="item.event_time"></DateCell>
+          <DateCell required title="发生时间" v-model="item.event_time"></DateCell>
           <EmployeeSelectorCell title="审批人" use_employee_list :employee_list="employee_list" v-model="item.reviewer_list" :multi="false" :max="1"></EmployeeSelectorCell>
         </van-cell-group>
 

src/components/integral/integral_entry_n.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <van-nav-bar :title="type==1?'录入A分':'奖扣B分'" left-text="返回" @click-left="$route_back" left-arrow></van-nav-bar>
+    <van-nav-bar :title="type==1?'奖扣A分':'奖扣B分'" left-text="返回" @click-left="$route_back" left-arrow></van-nav-bar>
     <div class="body_com">
       <scroller >
         <van-cell-group>