查看个人所有日报参数调整

src/pages/business/common/projectMange/record/details.vue

@@ -1,5 +1,5 @@
 <template>
-  <u-navbar  :titleStyle="{ color: '#000' }" :autoBack="true" title="日报详情" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+  <u-navbar  :titleStyle="{ color: '#000' }" :autoBack="false" title="日报详情" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
     <template #left>
       <view class="u-navbar__content__left__item">
         <u-icon name="arrow-left" size="20" color="#000" @click="returnTo('business/common/projectMange/record/index')"></u-icon>
@@ -235,18 +235,7 @@ function init() {
         pageSize: 1,
       })
       .then((requset) => {
-        if(requset?.data?.records.length>0){
-          dataRebuild(requset.data.records);
-          if(requset.data.records[0].readFlag == "0"){
-            projectApi()
-            .ReportRecordReadFlag({ reportId: requset.data.records[0].id })
-            .then((res) => {
-              if (res.status != "SUCCESS") {
-                proxy.$modal.msgError("读取异常");
-              }
-            });
-          }
-        }
+        dataRebuild(requset.data.records);
         state.loading = false;
       }).catch((err) => {
         state.loading = false;
@@ -257,7 +246,7 @@ function init() {
  * 
  * @param item 数据重组
 */
-function dataRebuild(item){
+function dataRebuild(item,type){
   for(let i=0;i<item.length;i++){
     item[i].tabsList = [
       { name: "已读(" + item[i].pmReportReaders.read + ")", value: 0, 
@@ -274,7 +263,22 @@ function dataRebuild(item){
     files.forEach(function (val) {
       item[i].files.push(val.url);
     });
-    dataList.value.push(item[i])
+    //数据插入
+    if(type == "refresh"){
+      dataList.value.unshift(item[i])
+    }else{
+      dataList.value.push(item[i])
+    }
+    // 未读状态变更
+    if(item[i].readFlag == "0"){
+      projectApi()
+      .ReportRecordReadFlag({ reportId: item[i].id })
+      .then((res) => {
+        if (res.status != "SUCCESS") {
+          proxy.$modal.msgError("读取异常");
+        }
+      });
+    }
   }
   
 }
@@ -289,16 +293,6 @@ function toProjectMange(id) {
  * @scrollView加载数据
  */
  function load() {
-  //下拉数据前将未读数据修改为已读
-  if(dataList.value.length > 1 && dataList.value[dataList.value.length -1].readFlag == 0){
-    projectApi()
-    .ReportRecordReadFlag({ reportId: dataList.value[dataList.value.length -1].id })
-    .then((res) => {
-      if (res.status != "SUCCESS") {
-        proxy.$modal.msgError("读取异常");
-      }
-    });
-  }
   projectApi().ReportRecord(
     {
       upOrDown:0,
@@ -308,7 +302,7 @@ function toProjectMange(id) {
     }
   ).then((requset) => {
     if(requset?.data?.records.length>0){
-      dataRebuild(requset.data.records);
+      dataRebuild(requset.data.records,"load");
     }
   })
 }
@@ -325,7 +319,7 @@ function toProjectMange(id) {
     }
   ).then((requset) => {
     if(requset?.data?.records.length>0){
-      dataRebuild(requset.data.records);
+      dataRebuild(requset.data.records,"refresh");
     }
   })
 }
@@ -336,8 +330,8 @@ function moreClick(event) {
 }
 /** 编辑、删除日报*/
 function handleSubmit(e) {
-  state.popup.show = true;
-  proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/detailsAll?submitterId=${e.submitterId}`);
+  state.popup.show = false;
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/detailsAll?reportId=${e.id}`);
 }
 onReady(() => {});
 

src/pages/business/common/projectMange/record/detailsAll.vue

@@ -143,7 +143,7 @@ const state = reactive({
   userData: [], //用户列表
   pageSize:1,
   pageNum:0,
-  total:0,
+  total:10,
   submitDate:undefined,
 });
 
@@ -185,25 +185,16 @@ function init() {
     tree.value = res.data;
     projectApi()
       .ReportRecord({
-        pageNum: ++ pageNum.value ,
+        // pageNum: ++ pageNum.value ,
+        // pageSize: 1,
+        // projectAscription:2,
+        // submitterId:state.options.submitterId,
+        reportId:state.options.reportId,
+        pageNum: 1,
         pageSize: 1,
-        projectAscription:2,
-        submitterId:state.options.submitterId,
       })
       .then((requset) => {
-        if(requset?.data?.records.length>0){
-          total.value = requset.data.total;
-          dataRebuild(requset.data.records);
-          if(requset.data.records[0].readFlag == "0"){
-            projectApi()
-            .ReportRecordReadFlag({ reportId: requset.data.records[0].id })
-            .then((res) => {
-              if (res.status != "SUCCESS") {
-                proxy.$modal.msgError("读取异常");
-              }
-            });
-          }
-        }
+        dataRebuild(requset.data.records);
         state.loading = false;
       }).catch((err) => {
         state.loading = false;
@@ -214,7 +205,7 @@ function init() {
  * 
  * @param item 数据重组
 */
-function dataRebuild(item){
+function dataRebuild(item,type){
   for(let i=0;i<item.length;i++){
     item[i].tabsList = [
       { name: "已读(" + item[i].pmReportReaders.read + ")", value: 0, 
@@ -231,7 +222,22 @@ function dataRebuild(item){
     files.forEach(function (val) {
       item[i].files.push(val.url);
     });
-    dataList.value.push(item[i])
+    //数据插入
+    if(type == "refresh"){
+      dataList.value.unshift(item[i])
+    }else{
+      dataList.value.push(item[i])
+    }
+    // 未读状态变更
+    if(item[i].readFlag == "0"){
+      projectApi()
+      .ReportRecordReadFlag({ reportId: item[i].id })
+      .then((res) => {
+        if (res.status != "SUCCESS") {
+          proxy.$modal.msgError("读取异常");
+        }
+      });
+    }
   }
   
 }
@@ -246,26 +252,17 @@ function toProjectMange(id) {
  * @scrollView加载数据
  */
  function load() {
-  //下拉数据前将未读数据修改为已读
-  if(dataList.value.length > 1 && dataList.value[dataList.value.length -1].readFlag == 0){
-    projectApi()
-    .ReportRecordReadFlag({ reportId: dataList.value[dataList.value.length -1].id })
-    .then((res) => {
-      if (res.status != "SUCCESS") {
-        proxy.$modal.msgError("读取异常");
-      }
-    });
-  }
   projectApi().ReportRecord(
     {
-      pageNum: ++ pageNum.value ,
-      pageSize: 1,
+      upOrDown:0,
+      slideSum:1,
+      submitDate:dataList.value[dataList.value.length-1].submitDate,
       projectAscription:2,
-      submitterId:state.options.submitterId,
+      submitterId:dataList.value[0].submitterId,
     }
   ).then((requset) => {
     if(requset?.data?.records.length>0){
-      dataRebuild(requset.data.records);
+      dataRebuild(requset.data.records,"load");
     }
   })
 }
@@ -275,14 +272,15 @@ function toProjectMange(id) {
  function refresh() {
   projectApi().ReportRecord(
     {
-      pageNum: ++ pageNum.value ,
-      pageSize: 1,
+      upOrDown:1,
+      slideSum:1,
+      submitDate:dataList.value[0].submitDate,
       projectAscription:2,
-      submitterId:state.options.submitterId,
+      submitterId:dataList.value[0].submitterId,
     }
   ).then((requset) => {
     if(requset?.data?.records.length>0){
-      dataRebuild(requset.data.records);
+      dataRebuild(requset.data.records,"refresh");
     }
   })
 }
@@ -295,7 +293,7 @@ onShow(() => {
 });
 
 onLoad((options) => {
-  state.options.submitterId = options?.submitterId;
+  state.options.reportId = options?.reportId;
   init();
 });
 </script>

src/pages/business/common/projectMange/record/index.vue

@@ -425,7 +425,7 @@ function handleSubmit(type, item) {
         proxy.$modal.msg(errors);
       });
   }else if (type === "all") {
-    proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/detailsAll?submitterId=${item.submitterId}`);
+    proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/detailsAll?reportId=${item.id}`);
     state.modal.show = false;
   }
 }