Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

h5app/src/views/pages/work/log/edit.vue

@@ -24,7 +24,7 @@
                 <ion-datetime id="workTime" placeholder="日期"
                               v-model="dataModel.workTime"  :prefer-wheel="true"
                               dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
-                              :show-default-buttons="true">
+                              :show-default-buttons="true" @ion-change="workTimeChange">
                 </ion-datetime>
               </ion-modal>
             </div>
@@ -166,6 +166,12 @@ export default defineComponent({
       loading.value = false;
     };
 
+    // 日期选择器选择当天日期，值为null bug
+    function workTimeChange(value: any) {
+      if (value.detail.value == null) {
+        workLogData.dataModel.workTime = dayjs(new Date().toLocaleDateString()).format("YYYY-MM-DD") + "T00:00:00.000+08:00";
+      }
+    }
 
     const reload = (doWorkID: any) => {
       workLogData.dataModel = {};
@@ -190,7 +196,8 @@ export default defineComponent({
       router,
       loading,
       workLogValid,
-      recordsCount
+      recordsCount,
+      workTimeChange
     }
   }
 });

h5app/src/views/pages/work/log/list.vue

@@ -35,7 +35,7 @@
         <ion-button slot="end" style="height: 33px;width:70px;margin-left: 10px;--box-shadow: none;--border-radius: 14px;" @click="onSearch">搜索</ion-button>
       </ion-item>
       <!-- 滑动数据列表 -->
-      <div class="bw-vue-list">
+      <div class="bw-vue-list" v-if="!delLoading">
         <div class="list-content">
           <ion-list>
             <div v-for="(record,key) in dataList" :key="key">
@@ -196,7 +196,7 @@ export default defineComponent({
 
     const loadData = async function () {
       loading.value = true;
-      searchParamsState.userId = userInfo.value.userID==null?"":userInfo.value.userID;
+      searchParamsState.userId = userInfo.value.userID == null ? "" : userInfo.value.userID;
       const result: any = await getWorkLogList(searchParamsState);
       dataList.value = dataList.value.concat(result.list);
       searchParamsState.total = result.total;
@@ -268,13 +268,13 @@ export default defineComponent({
       infoAlertOpen.value = value;
     }
 
-    // onIonViewDidEnter(() => {
-    //   reload();
-    // });
-
-    onMounted(() => {
+    onIonViewDidEnter(() => {
       reload();
-    })
+    });
+
+    // onMounted(() => {
+    //   reload();
+    // })
 
     return {
       router,

src/main/resources/mapping/cquery/DoWorkCQuery.xml

@@ -44,5 +44,6 @@
         <if test="userId!='' and userId!=null">
             and workLog.createUserID = #{userId}
         </if>
+        order by workLog.createTime desc
     </select>
 </mapper>