新增项目列表功能模块/根据反馈修复问题

src/api/business/project.js

@@ -2,46 +2,48 @@ import { request } from "@/utils/request";
 
 /**
  * 项目管理接口集合
- * @method Record 记录列表
- * @method Details 记录详情
- * @method ReadFlag 记录已读
- * @method ProjectsList 项目下拉
- * @method Insert 项目提交
+ * @method ReportRecord 报告记录列表
+ * @method ReportRecordDetails 报告记录详情
+ * @method ReportRecordReadFlag 报告记录已读
+ * @method ReportInsert 报告提交
+ * @method ProjectsSelect 项目下拉
+ * @method ProjectsWeekList 导入上一篇
+ * @method ProjectsList 项目列表
  */
 export function projectApi() {
     return {
-        Record(data) {
+        ReportRecord(data) {
             return request({
                 url: "/service-iot/pmWorkContent/page",
                 method: "GET",
                 data: data,
             });
         },
-        Details(data) {
+        ReportRecordDetails(data) {
             return request({
                 url: "/service-iot/pmWorkContent/reportRecord",
                 method: "GET",
                 data: data,
             });
         },
-        ReadFlag(data) {
+        ReportRecordReadFlag(data) {
             return request({
                 url: "/service-iot/pmReceive/updateReadFlag",
                 method: "GET",
                 data: data,
             });
         },
-        ProjectsList(data) {
+        ReportInsert(data) {
             return request({
-                url: '/service-iot/pmProject/projects',
-                method: 'GET',
+                url: '/service-iot/pmWorkReport/add',
+                method: 'POST',
                 data: data
             })
         },
-        Insert(data) {
+        ProjectsSelect(data) {
             return request({
-                url: '/service-iot/pmWorkReport/add',
-                method: 'POST',
+                url: '/service-iot/pmProject/projects',
+                method: 'GET',
                 data: data
             })
         },
@@ -51,6 +53,13 @@ export function projectApi() {
                 method: 'GET',
                 data: data
             })
+        },
+        ProjectsList(data) {
+            return request({
+                url: '/service-iot/pmProject/page',
+                method: 'GET',
+                data: data
+            })
         }
     };
 }

src/pages.json

@@ -714,6 +714,18 @@
             }
           }
         },
+        {
+          "path": "projectMange/list/index",
+          "style": {
+            "navigationBarTitleText": "项目列表",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
         {
           "path": "projectMange/mall/index",
           "style": {
@@ -746,19 +758,22 @@
         "pagePath": "pages/index",
         "iconPath": "/static/images/tabBar/tab-home.png",
         "selectedIconPath": "/static/images/tabBar/tab-home-blue.png",
-        "text": "工作台"
+        "text": "工作台",
+        "visible": false
       },
       {
         "pagePath": "pages/info",
         "iconPath": "/static/images/tabBar/tab-info.png",
         "selectedIconPath": "/static/images/tabBar/tab-info-blue.png",
-        "text": "消息"
+        "text": "消息",
+        "visible": false
       },
       {
         "pagePath": "pages/mine",
         "iconPath": "/static/images/tabBar/tab-my.png",
         "selectedIconPath": "/static/images/tabBar/tab-my-blue.png",
-        "text": "我的"
+        "text": "我的",
+        "visible": false
       }
     ]
   },

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

@@ -0,0 +1,226 @@
+<template>
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" 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"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+    <u-tabs
+      :list="tabsList"
+      :current="tabsCurrent"
+      @click="tabsClick"
+      lineColor="#333"
+      :activeStyle="{ color: '#333', fontSize: '14px' }"
+      :inactiveStyle="{ color: '#909399', fontSize: '14px' }"
+      :scrollable="false"
+    ></u-tabs>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="list-container scroll-height"
+    :pageSize="pageSize"
+    :total="total"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: 'calc(100vh - 132px)',
+      //#endif
+      //#ifdef H5
+      height: 'calc(100vh - 132px)',
+      //#endif
+    }"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :lowerThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="menu-list m0">
+        <view class="list-cell" style="color: #666666; line-height: 25px" v-for="(base, index) in dataList" :key="index" @click="handleToDetails(base)">
+          <view class="content-area-top menu-item">
+            <view class="content-area-top-time">
+              {{ base.createTime ? base.createTime.replace("T", " ") : "" }}
+            </view>
+            <view class="content-area-top-status" v-if="base.projectStatus == 1" style="background-color: #909399"> 未开始 </view>
+            <view class="content-area-top-status" v-if="base.projectStatus == 2" style="background-color: #23dedc"> 进行中 </view>
+            <view class="content-area-top-status" v-if="base.projectStatus == 3" style="background-color: #16bf00"> 已完成 </view>
+            <view class="content-area-top-status" v-if="base.projectStatus == 4" style="background-color: #f9ae3d"> 已暂停 </view>
+            <view class="content-area-top-status" v-if="base.projectStatus == 5" style="background-color: #f56c6c"> 已作废 </view>
+          </view>
+          <view class="content-area-row_wrap menu-item">
+            <view class="content-area-row_wrap-view"> 项目名称：{{ base.projectName }} </view>
+            <view class="content-area-row_wrap-view"> 项目负责人： {{ proxy.$common.mapping("nickName", "userId", base.projectHead, userDate) }} </view>
+            <view class="content-area-row_wrap-view" style="display: block">
+              项目成员：
+              <span v-for="(userId, index) in base.projectMember.length > 0 ? base.projectMember.split(',') : []" :key="userId">
+                {{ proxy.$common.mapping("nickName", "userId", userId, userDate) }}{{ base.projectMember.split(",").length > index + 1 ? "," : "" }}
+              </span>
+            </view>
+          </view>
+        </view>
+      </view>
+    </template>
+  </oa-scroll>
+
+  <oa-tabbar :tabbarValue="2" :tabbarList="proxy.$constData.projectTabbar" :isTabbar="false"></oa-tabbar>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { projectApi } from "@/api/business/project.js";
+import { UserList } from "@/api/system/user.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import { useStores, commonStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const commonStore = commonStores(); //全局公共Store
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  loading: false,
+  tabsList: [
+    { name: "全部", value: "" },
+    { name: "我负责", value: 1 },
+    { name: "我参与", value: 2 },
+  ],
+  tabsCurrent: 0,
+
+  dataList: [],
+  pageSize: 20,
+  current: 1,
+  total: 0,
+  userDate: [],
+});
+
+const { tabsList, tabsCurrent, dataList, pageSize, current, total, userDate } = toRefs(state);
+
+/**
+ * @页面初始化
+ */
+function init() {
+  UserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
+    state.userDate = res.data.rows;
+  });
+
+  selectListApi();
+}
+
+/**
+ * @列表查询
+ * @api接口查询
+ */
+function selectListApi() {
+  state.dataList = [];
+  state.loading = true;
+
+  projectApi()
+    .ProjectsList({
+      projectAscription: state.tabsList[state.tabsCurrent].value,
+      pageNum: state.current,
+      pageSize: state.pageSize,
+    })
+    .then((requset) => {
+      state.dataList = requset.data.records;
+      state.total = requset.data.total;
+      state.loading = false;
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
+}
+
+/**
+ * @scrollView加载数据
+ */
+function load() {
+  state.pageSize += 10;
+  init();
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  state.pageSize = 20;
+  init();
+}
+
+/**
+ * @tabs点击事件
+ */
+function tabsClick(e) {
+  state.tabsCurrent = e.index;
+  init();
+}
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
+onLoad((options) => {
+  init();
+});
+</script>
+
+<style lang="scss" scoped>
+.list-container {
+  .content-area {
+    &-top {
+      font-size: 16px;
+      font-weight: 600;
+      color: #000000;
+
+      &-time {
+        max-width: 70%;
+        margin: auto 0;
+        font-size: 14px;
+        color: rgb(102, 102, 102);
+      }
+
+      &-name {
+        max-width: 70%;
+        color: #000;
+      }
+
+      &-status {
+        max-width: 30%;
+        margin: auto 0 auto auto;
+        font-size: 12px;
+        color: #ffffff;
+        padding: 0 5px;
+        border-radius: 20px;
+        line-height: 20px;
+      }
+    }
+
+    &-row_wrap {
+      font-size: 13px;
+      flex-flow: row wrap;
+
+      &-view {
+        display: flex;
+        min-width: 50%;
+        > .iconfont {
+          font-size: 14px;
+          color: #909399;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+}
+</style>

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

@@ -43,7 +43,7 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 /*----------------------------------接口引入-----------------------------------*/
 import { deptUserTreeSelect } from "@/api/system/user.js";
 /*----------------------------------组件引入-----------------------------------*/
-import uniMallList from "./components/mall-list.vue";
+import uniMallList from "../components/mall-list.vue";
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
 import { storageSystem } from "@/utils/storage"; // 公共方法引用

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

@@ -101,7 +101,7 @@ function init() {
   state.dataList = [];
   state.loading = true;
   projectApi()
-    .Details({
+    .ReportRecordDetails({
       reportId: state.options.reportId,
     })
     .then((requset) => {
@@ -117,7 +117,7 @@ function init() {
 /** 返回列表页数据刷新 */
 function goRecordDataRefresh() {
   projectApi()
-    .ReadFlag({ reportId: state.options.reportId })
+    .ReportRecordReadFlag({ reportId: state.options.reportId })
     .then((requset) => {
       uni.$emit("projectMange_record", true); //监听器
     })

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

@@ -43,7 +43,7 @@
   >
     <template #default>
       <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
-      <view class="content-area" v-for="(group, date) in proxy.$common.groupedItems(state.dataList, 'createTime')" :key="date">
+      <view class="content-area" v-for="(group, date) in proxy.$common.groupedItems(state.dataList, 'submitDate')" :key="date">
         <view class="content-area-time font14">{{ proxy.$time.jktTimes(date, "否") }}</view>
         <view class="content-area-center bg-white" v-for="(el, ind) in group" :key="ind" @click="goContentDetails(el)">
           <view class="flex mb10">
@@ -58,13 +58,13 @@
             ></u-avatar>
             <view>
               <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
-              <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.createTime.replace("T", " ")) }}</view>
+              <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view>
             </view>
           </view>
           <view class="mb5">
             <u-text :text="el.contentText.length >= 100 ? el.contentText.slice(0, 100) + '···' : el.contentText" color="#666666" size="14"></u-text>
           </view>
-          <view class="flex">
+          <view class="flex" v-if="el.createBy != useStore.nickName">
             <u-tag class="mr10" type="info" text="已读" size="mini" plain v-if="el.readFlag === 1" style="margin: 0 auto"></u-tag>
             <u-tag class="mr10" type="error" text="未读" size="mini" plain v-if="el.readFlag === 0" style="margin: 0 auto"></u-tag>
             <u-text text="全文" :color="proxy.$settingStore.themeColor.color" size="14"></u-text>
@@ -85,9 +85,11 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 import { projectApi } from "@/api/business/project.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
+import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
+const useStore = useStores();
 /*----------------------------------变量声明-----------------------------------*/
 const state = reactive({
   tabsList: [
@@ -111,7 +113,7 @@ const { tabsList, tabsCurrent, dataList, pageSize, current, total } = toRefs(sta
  */
 function init() {
   projectApi()
-    .Record({
+    .ReportRecord({
       // startDate: "2024-07-10",
       // endDate: "2024-07-10",
       pageNum: state.current,

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

@@ -124,7 +124,7 @@
         asyncChange
       ></u-switch>
     </view>
-    <view class="flex" v-if="form.isRegularlySend == 0 ? false : true" @click="timeInputClick()">
+    <view class="flex" v-if="form.isRegularlySend == 0 ? false : true" @click="timeShow = true">
       <u-input
         v-model="form.timingTime"
         placeholder="请选择时间"
@@ -219,17 +219,12 @@ function init() {
   });
 
   projectApi()
-    .ProjectsList()
+    .ProjectsSelect()
     .then((requset) => {
       state.projectsList = requset.data;
     });
 }
 
-/** 定时发送输入框点击事件 */
-function timeInputClick() {
-  state.timeShow = true;
-}
-
 /** 时间选择器确定按钮点击事件 */
 function timeConfirm() {
   state.form.timingTime = proxy.$time.getFormatterDate(state.timeValue);
@@ -307,7 +302,7 @@ function handleSubmit() {
   });
 
   projectApi()
-    .Insert(state.form)
+    .ReportInsert(state.form)
     .then((requset) => {
       proxy.$tab.redirectTo("/pages/business/common/projectMange/record/index"); //返回到需要执行方法的页面
       state.form.workContents = [];
@@ -322,6 +317,7 @@ function handleSubmit() {
 watchEffect(() => {
   if (JSON.stringify(props.projectList) != "{}") {
     state.userList = [];
+    state.projectsCheck = [];
 
     Object.keys(props.projectList).forEach((key) => {
       state.form[key] = props.projectList[key];
@@ -347,6 +343,10 @@ watchEffect(() => {
       }
     });
 
+    state.form.workContents.forEach((e) => {
+      state.projectsCheck.push(e.projectId);
+    });
+
     storageSystem.set("project", state);
   }
 });
@@ -385,7 +385,6 @@ onUnload(() => {
 
 :deep(.u-collapse-item__content) {
   overflow: auto;
-  height: auto !important;
 }
 
 :deep(.u-collapse-item__content__text) {

src/pages/index.vue

@@ -341,7 +341,6 @@ function getAppRoutersData() {
 }
 
 onLoad((options) => {
-  uni.hideTabBar(); //隐藏自带tabbar
   init(options);
 });
 

src/pages/info.vue

@@ -140,9 +140,7 @@ onShow(() => {
   init();
 });
 
-onLoad(() => {
-  uni.hideTabBar(); //隐藏自带tabbar
-});
+onLoad(() => {});
 </script>
 
 <style lang="scss" scoped>

src/pages/mine.vue

@@ -256,9 +256,7 @@ onShow(() => {});
 
 onReady(() => {});
 
-onLoad((options) => {
-  uni.hideTabBar(); //隐藏自带tabbar
-});
+onLoad((options) => {});
 
 // 自定义导航事件
 onNavigationBarButtonTap((e) => {

src/pages/register.vue

@@ -9,15 +9,15 @@
     </view>
 
     <view class="bottom-area">
-      <u-input v-model="userName" prefixIcon="account" placeholder="用户名(必填)" border="none" />
       <u-input v-model="phone" prefixIcon="phone" placeholder="手机号(必填)" border="none" />
       <u-input v-model="verify" prefixIcon="chat" placeholder="验证码(必填)" border="none" :maxlength="6">
         <template #suffix>
           <button class="verify" @click="getVerifyCode">{{ !useStore.codeTime ? "获取验证码" : useStore.codeTime + "s" }}</button>
         </template>
       </u-input>
+      <u-input v-model="userName" prefixIcon="account" placeholder="用户名(必填)" border="none" />
       <u-input v-model="email" prefixIcon="email" placeholder="邮箱(必填)" border="none" />
-      <u-input v-model="nickName" prefixIcon="account" placeholder="真实姓名(必填)" border="none" />
+      <u-input v-model="nickName" prefixIcon="coupon" placeholder="真实姓名(必填)" border="none" />
       <u-input v-model="newPassword" prefixIcon="lock" placeholder="密码(必填)" border="none" :password="newPasswordBool">
         <template #suffix>
           <text :class="!newPasswordBool ? 'iconfont oaIcon-eye' : 'iconfont oaIcon-eye-close'" @click="newPasswordBool = !newPasswordBool"></text>

src/plugins/constData.plugins.js

@@ -67,6 +67,7 @@ let xunJianList = [
 let homeTabbar = [
 	{
 		pagePath: "/pages/index",
+		iconClass: "",
 		iconPath: "/static/images/tabBar/tab-home.png",
 		selectedIconPath: "/static/images/tabBar/tab-home-blue.png",
 		text: "工作台",
@@ -80,6 +81,7 @@ let homeTabbar = [
 	// },
 	{
 		pagePath: "/pages/info",
+		iconClass: "",
 		iconPath: "/static/images/tabBar/tab-info.png",
 		selectedIconPath: "/static/images/tabBar/tab-info-blue.png",
 		text: "消息",
@@ -87,6 +89,7 @@ let homeTabbar = [
 	},
 	{
 		pagePath: "/pages/mine",
+		iconClass: "",
 		iconPath: "/static/images/tabBar/tab-my.png",
 		selectedIconPath: "/static/images/tabBar/tab-my-blue.png",
 		text: "我的",
@@ -98,6 +101,7 @@ let homeTabbar = [
 let projectTabbar = [
 	{
 		pagePath: "/pages/business/common/projectMange/record/index",
+		iconClass: "",
 		iconPath: "/static/images/tabBar/tab-home.png",
 		selectedIconPath: "/static/images/tabBar/tab-home-blue.png",
 		text: "报告记录",
@@ -105,11 +109,20 @@ let projectTabbar = [
 	},
 	{
 		pagePath: "/pages/business/common/projectMange/write/index",
+		iconClass: "",
 		iconPath: "/static/images/tabBar/tab-info.png",
 		selectedIconPath: "/static/images/tabBar/tab-info-blue.png",
 		text: "报告填写",
 		dot: false,
 	},
+	{
+		pagePath: "/pages/business/common/projectMange/list/index",
+		iconClass: "",
+		iconPath: "/static/images/tabBar/tab-my.png",
+		selectedIconPath: "/static/images/tabBar/tab-my-blue.png",
+		text: "项目列表",
+		dot: false,
+	},
 	// {
 	// 	pagePath: "/pages/mine",
 	// 	iconPath: "/static/images/tabBar/tab-my.png",

src/store/modules/user.js

@@ -211,6 +211,11 @@ const useStores = defineStore("useStores", {
         return;
       }
 
+      if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[a-zA-Z0-9][a-zA-Z0-9_]{6,}$/.test(data.userName)) {
+        modal.showToast("仅支持英文(a-zA-Z)数字(0-9)和下划线(_)，且至少包含2项");
+        return;
+      }
+
       if (!data.nickName) {
         modal.showToast("昵称不能为空");
         return;

src/uni_modules/uview-plus/components/u-collapse-item/u-collapse-item.vue

@@ -153,7 +153,7 @@
 				// 每次面板打开或者收起时，都查询元素尺寸
 				// 好处是，父组件从服务端获取内容后，变更折叠面板后可以获得最新的高度
 				const rect = await this.queryRect()
-				const height = this.expanded ? rect.height : 0
+				const height = this.expanded ? 'auto' : 0
 				this.animating = true
 				// #ifdef APP-NVUE
 				const ref = this.$refs['animation'].ref