工作报告图片和附件上传代码完善+项目列表，报告详情优化

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

@@ -64,20 +64,20 @@
 
       </view>      		
       <view class="menu-list m0">
-        <view class="list-cell" style="color: #666666; line-height: 25px" v-for="(base, index) in dataList" :key="index">
+        <view class="list-cell" style="color: #666666; line-height: 25px;margin:10px;width:auto;border-radius:10px" v-for="(base, index) in dataList" :key="index">
           <view class="content-area-top menu-item">
-            <view class="content-area-top-name" style="color: #559AFF;" @click="toProjectMange(base.id)">{{ base.projectName }} </view>
+            <view class="content-area-top-name" style="color: #559AFF;" @click="toProjectMange(base.id)">{{ base.projectName }} 
+            </view>
+            <view class="content-area-top-status" :style='{backgroundColor:proxy.$common.mapping("elTagClass", "value", base.projectStatus, project_status)}' style="margin-left:10px" > {{ proxy.$common.mapping("label", "value", base.projectStatus, project_status) }} </view>
+
             <u-icon class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(base)"></u-icon>
           </view>
           <view class="content-area-row_wrap menu-item">
-            <view class="content-area-row_wrap-view"> 负责人： {{ proxy.$common.mapping("nickName", "userId", base.projectHead, userDate) }} </view>
-            <view class="content-area-row_wrap-view">
-              状态：
-			  <span :style='{color:proxy.$common.mapping("elTagClass", "value", base.projectStatus, project_status)}'>{{ proxy.$common.mapping("label", "value", base.projectStatus, project_status) }}</span>
+            <view class="content-area-row_wrap-view"> 负责人： {{ proxy.$common.mapping("nickName", "userId", base.projectHead, userDate) }} 
             </view>
             <view class="content-area-row_wrap-view">
               类型：
-			  {{ proxy.$common.mapping("label", "value", base.projectStatus, project_type) }}
+			        {{ proxy.$common.mapping("label", "value", base.projectStatus, project_type) }}
             </view>
             <view class="content-area-row_wrap-view" style="display: block">
               成员：<span>{{ proxy.$common.mapping("nickName", "userId", base.projectMember, userDate) }} </span>
@@ -408,6 +408,9 @@ onLoad((options) => {});
   font-size: 14px;
   justify-content: left;
 }
+:deep(.list-container .content-area-top-name){
+  font-size:16px!important;
+}
 </style>
 <style lang="scss" scoped>
 .projectSearchBox {

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

@@ -54,29 +54,52 @@
         </view>
         <view class="content-area-center mb10">
           <view class="content-area-center-top"> 明日计划 </view>
-          <u-text :text="item.tomorrowPlan" color="#000000" size="14"></u-text>
+          <u-text :text="item.tomorrowPlan?item.tomorrowPlan:'无'" color="#000000" size="14"></u-text>
         </view>
         <view class="content-area-center mb10">
           <view class="content-area-center-top"> 工作协调 </view>
-          <u-text :text="item.coordinateWork" color="#000000" size="14"></u-text>
+          <u-text :text="item.coordinateWork?item.coordinateWork:'无'" color="#000000" size="14"></u-text>
         </view>
         <view class="content-area-center mb10">
           <view class="content-area-center-top">图片 </view>
             <view class="imageBox" v-if="item.reportImage">
               <image class="image" style="width:50px;margin:5px" mode="widthFix" v-for="(a,index) in JSON.parse(item.reportImage)" :key="index" :src="a.url"  @click="previewImage(index)" />
             </view>
+            <view class="imageBox" >无</view>
         </view>
 
         <view class="content-area-center mb10">
           <view class="content-area-center-top">附件 </view>
-          <view v-for="(file, index) in JSON.parse(item.reportFile)" :key="index" style="font-size:12px">
+          <view  v-if="item.reportFile" v-for="(file, index) in JSON.parse(item.reportFile)" :key="index" style="font-size:12px">
             <uni-link :href="file.url" text="file.url" style="color:rgba(0,0,0,.7)">{{file.name}}</uni-link>
           </view>
-      
+          <view v-else>无</view>
         </view>
         <view class="content-area-center mb10">
-          <view class="content-area-center-top">抄送人 </view>
-          <u-text :text='item.ccTo ? proxy.$common.mapping("nickName", "userId", item.ccTo, userData) : "无"' color="#000000" size="14"></u-text>
+          <!-- <view class="content-area-center-top">抄送人 </view> -->
+          <u-tabs
+            :list="tabsList"
+            :current="tabsCurrent"
+            @click="tabsClick"
+            lineColor="#333"
+            :activeStyle="{ color: '#333', fontSize: '14px' }"
+            :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+            :scrollable="false"
+          ></u-tabs>
+          <view class="content-area-header  mt20 mb10 mr5" style="display:inline-block;text-align:center" v-for="(item, index) in reportDetailData.treeSelectNodes" :key="index">
+            <img :src="item.avatar"  class="content-area-header-avatarImg mr10" v-if="item.avatar" style="display:block;width:40px;height:40px"/>
+            <u-avatar
+              v-if="!item.avatar"
+              class="content-area-header-avatar mr10"
+              :text="item.nickName.length > 2 ? item.nickName.slice(1, 3) : item.nickName"
+              shape="square"
+              size="40"
+              fontSize="12"
+              color="#ffffff"
+              :bgColor="proxy.$settingStore.themeColor.color"
+            ></u-avatar>
+            <u-text :text='item.nickName' color="#000000" size="14"></u-text>
+            </view>
         </view>
 
 
@@ -94,12 +117,20 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
 import { dUserList } from "@/api/system/user.js";
+import { deptUserTreeSelect } from "@/api/system/user.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 /*----------------------------------变量声明-----------------------------------*/
+const tree = ref({
+  value: "tree_root",
+  label: "Root",
+  children: [],
+});
+const reportDetailData = ref([]);
+const pmReportReaders =ref([]) //已读未读集合
 const state = reactive({
   loading: true,
   dataList: [],//日报列表
@@ -109,10 +140,23 @@ const state = reactive({
   userData:[],//用户列表
   images:[],//图片列表
   files:[],//附件列表
+  tabsList: [
+    { name: "已读", value: 0 },
+    { name: "未读", value: 1 },
+  ],
+  tabsCurrent: 0,
+
 });
 
-const { dataList, userData} = toRefs(state);
+const { dataList, userData,tabsList,tabsCurrent} = toRefs(state);
 
+/**
+ * @tabs点击事件
+ */
+ function tabsClick(e) {
+  state.tabsCurrent = e.index;
+  reportDetailData.value.treeSelectNodes = proxy.$common.findTreeNodes(tree.value, state.tabsCurrent==0?pmReportReaders.value.readAlready:pmReportReaders.value.readNotAlready);
+}
 function previewImage(index){
   uni.previewImage({
         current: index, // 当前显示图片索引
@@ -127,8 +171,9 @@ function previewImage(index){
 function init() {
   dataList.value = [];
   state.loading = true;
-  dUserList().then(res=>{
-    userData.value = res.data;
+  /** 查询树结构用户列表  回显抄送人*/
+  deptUserTreeSelect({ pageNum: "1", pageSize: "1000" }).then((res) => {
+    tree.value = res.data;
     projectApi()
     .ReportRecord({
       reportId: state.options.reportId,
@@ -138,9 +183,10 @@ function init() {
     .then((requset) => {
       dataList.value = requset.data.records;
       state.loading = false;
+      pmReportReaders.value = requset.data.records[0].pmReportReaders;
+      reportDetailData.value.treeSelectNodes = proxy.$common.findTreeNodes(tree.value, tabsCurrent.value==0?pmReportReaders.value.readAlready:pmReportReaders.value.readNotAlready);
       var imgs = JSON.parse(dataList.value[0].reportImage);
       var files= JSON.parse(dataList.value[0].reportFile);
-      console.log(dataList.value[0].reportImage)
       imgs.forEach(function(item){
         state.images.push(item.url);
       })
@@ -151,8 +197,7 @@ function init() {
     .catch((err) => {
       state.loading = false;
     });
-  })
-
+  });
 }
 /**
  * 跳转项目概览

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

@@ -189,7 +189,7 @@
 import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { projectApi } from "@/api/business/project.js";
+import { projectApi} from "@/api/business/project.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
@@ -308,7 +308,13 @@ function init() {
  * @跳转详情
  */
 function goContentDetails(e) {
-  proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}`);
+  projectApi().ReportRecordReadFlag({ reportId: e.id }).then((res) => {
+      if (res.status == "SUCCESS") {
+        proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}`);
+      } else {
+        proxy.$modal.msgError("读取异常");
+      }
+    });
 }
 
 /**

src/pages/business/common/projectMange/write/components/template1.vue

@@ -67,7 +67,7 @@
     </view>
     <view class="content-area-item mt10 p10 bg-white">
       <view class="font14 weight mb10">图片上传</view>
-      <oa-upload :uploadCount="5" :uploadList="state.form.reportImage" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+      <oa-upload :uploadCount="5" :uploadList="reportImage1" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
     </view>
     <view class="content-area-item mt10 p10 bg-white">
       <view class="font14 weight mb10">附件上传</view>
@@ -82,7 +82,7 @@
       </uni-file-picker>
        <!-- 文件列表回显 -->
        <br>
-      <view v-for="(file, index) in state.form.reportFile" :key="index" style="border-bottom:1px solid #eee;margin:6px;padding:6px;font-size:12px">
+      <view v-for="(file, index) in reportFile1" :key="index" style="border-bottom:1px solid #eee;margin:6px;padding:6px;font-size:12px">
        <uni-link :href="file.url" text="file.url">{{file.name}}</uni-link>
         <uni-icons type="closeempty" size="12" style="float:right" @click="delectFile(file)"></uni-icons>
       </view>
@@ -254,13 +254,10 @@ const state = reactive({
   userDate: [],
   saveTime: "",
 });
+const reportImage1=ref([])//图片
+const reportFile1=ref([])//附件
 const { timeShow, timeValue, modalShow } = toRefs(modal);
-const { form, projectsCheck, projectsList, userList, userDate, saveTime,reportFile } = toRefs(state);
-
-
-
-
-
+const { form, projectsCheck, projectsList, userList, userDate, saveTime } = toRefs(state);
 
 /**
  * @初始化
@@ -355,7 +352,7 @@ function modalConfirm() {
  * @图片上传成功回调
  */
  function uploadSuccessChange(e) {
-  state.form.reportImage.push({
+  reportImage1.value.push({
     name: e.name,
     url: e.url,
   })
@@ -365,14 +362,14 @@ function modalConfirm() {
  * @图片删除回调
  */
  function uploadDeleteChange(e) {
-  state.form.reportImage = e;
+  reportImage1.value = e;
   realTimeSaving()
 }
 /**
  * @文件上传
  */
 function delectFile(param){
-  state.form.reportFile = state.form.reportFile.filter(function (item) {
+  reportFile1.value = reportFile1.value.filter(function (item) {
     return item.name!=param.name;
   });
   realTimeSaving()
@@ -388,7 +385,7 @@ function selectUpload(e) {
         filePath: item,
         name: 'file',
         success: (uploadFileRes) => {
-          state.form.reportFile.push(JSON.parse(uploadFileRes.data).data)
+          reportFile1.value.push(JSON.parse(uploadFileRes.data).data)
           realTimeSaving()
         },
         fail: (err) => {
@@ -418,23 +415,16 @@ function handleSubmit() {
   state.form.workContents.forEach((e) => {
     e.workTime = Number(e.workTime);
   });
-  state.form.reportImage=JSON.stringify(state.form.reportImage);
-  state.form.reportFile=JSON.stringify(state.form.reportFile);
+  state.form.reportImage=JSON.stringify(reportImage1.value);
+  state.form.reportFile=JSON.stringify(reportFile1.value);
   projectApi()
     .ReportInsert(state.form)
     .then((requset) => {
       proxy.$tab.redirectTo("/pages/business/common/projectMange/record/index"); //返回到需要执行方法的页面
-      // state.form.workContents = [];
-      // state.form.tomorrowPlan = "";
-      // state.form.coordinateWork = null;
-      // state.form.isRegularlySend = 0;
-      // state.form.timingTime = null;
-      // state.form.reportImage=[];
-      // state.form.reportFile=[];
+
       // storageSystem.set("project", state);
     }).catch((err) => {
-      state.form.reportImage=JSON.parse(state.form.reportImage)
-      state.form.reportFile=JSON.parse(state.form.reportFile)
+     
     });;
 }
 
@@ -451,8 +441,8 @@ watch(
       state.form[key] = props.projectList[key];
     });
  
-    state.form.reportImage=state.form.reportImage?JSON.parse(state.form.reportImage):[];
-    state.form.reportFile=state.form.reportFile?JSON.parse(state.form.reportFile):[];
+    reportImage1.value=state.form.reportImage?JSON.parse(state.form.reportImage):[];
+    reportFile1.value=state.form.reportFile?JSON.parse(state.form.reportFile):[];
     state.form.workContents.forEach((e) => {
       state.projectsCheck.push(e.projectId);
     });