新增选择抄送人限制人员数量功能/完善底层框架代码

src/components/oa-tabbar/index.vue

@@ -24,24 +24,27 @@ import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, watch
 const { proxy } = getCurrentInstance();
 /*----------------------------------变量声明-----------------------------------*/
 const props = defineProps({
-  tabbarValue: {
-    type: Number,
-    default: 0,
-  },
+  //数据集
   tabbarList: {
     type: Object,
     default: [],
   },
-  isTabbar: {
+  //选中值
+  tabbarValue: {
+    type: Number,
+    default: 0,
+  },
+  //是否使用tabBar跳转页面
+  isSwitchTab: {
     type: Boolean,
     default: true,
   },
 });
 
-const { tabbarValue, tabbarList, isTabbar } = toRefs(props);
+const { tabbarValue, tabbarList, isSwitchTab } = toRefs(props);
 
 function tabbarChange(e) {
-  if (isTabbar.value) {
+  if (isSwitchTab.value) {
     proxy.$tab.switchTab(tabbarList.value[e].pagePath);
   } else {
     proxy.$tab.redirectTo(tabbarList.value[e].pagePath);

src/pages/business/common/projectMange/components/mall-list.vue → src/pages/business/common/projectMange/mall/components/mall-list.vue

@@ -47,10 +47,12 @@
     <view class="box-foot">
       <view class="box-foot-left" style="justify-self: center">
         <view class="box-foot-left-count" :style="{ color: $settingStore.themeColor.color }">已选择:{{ checkboxUserList.length }}人</view>
-        <view class="box-foot-left-people"> {{ checkboxUserList.toString() || "最多选择200人" }}</view>
+        <view class="box-foot-left-people"> {{ checkboxUserList.toString() || `最多选择${checkBoxNumber}人` }}</view>
       </view>
       <view class="box-foot-right">
-        <u-button class="app-buttom" type="primary" @click="handleSubmit()" shape="square" :color="$settingStore.themeColor.color"> 确定({{ checkboxUserList.length + "/200" }}) </u-button>
+        <u-button class="app-buttom" type="primary" @click="handleSubmit()" shape="square" :color="$settingStore.themeColor.color">
+          确定({{ checkboxUserList.length + "/" + checkBoxNumber }})
+        </u-button>
       </view>
     </view>
   </view>
@@ -70,16 +72,20 @@ export default {
       type: Object,
       default: () => {},
     },
+    checkBoxNumber: {
+      type: Number,
+      default: 200,
+    },
   },
   components: {
     uniMallHead,
   },
   data() {
     return {
-      checkboxList: [],
       currentData: [],
-      checkboxUserData: [],
-      checkboxUserList: [],
+      checkboxList: [], //选中人员id数组
+      checkboxUserData: [], //选中人员数组集合
+      checkboxUserList: [], //选中人员label数组
     };
   },
   mounted() {
@@ -138,6 +144,10 @@ export default {
       }
     },
     handleSubmit() {
+      if (this.checkboxList.length >= this.checkBoxNumber) {
+        this.$modal.msg(`最多选择${this.checkBoxNumber}人！`);
+        return false;
+      }
       this.$emit("submit", this.checkboxUserData);
     },
     checkboxChange(event) {

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

@@ -31,7 +31,7 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-      <uni-mall-list v-if="dataList.length > 0" :dataList="dataList" :defaultHeadList="defaultHeadList" @change="handleChange" @submit="handleSubmit"></uni-mall-list>
+      <uni-mall-list v-if="dataList.length > 0" :dataList="dataList" :defaultHeadList="defaultHeadList" :checkBoxNumber="checkBoxNumber" @change="handleChange" @submit="handleSubmit"></uni-mall-list>
     </template>
   </oa-scroll>
 </template>
@@ -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"; // 公共方法引用
@@ -53,8 +53,9 @@ const { proxy } = getCurrentInstance();
 const state = reactive({
   defaultHeadList: { label: "通讯录", id: "18AF75C3-330A-53AC-270E-EAD060BC0E1A" },
   dataList: [],
+  checkBoxNumber: undefined,
 });
-const { defaultHeadList, dataList } = toRefs(state);
+const { defaultHeadList, dataList, checkBoxNumber } = toRefs(state);
 
 function init() {
   deptUserTreeSelect({ pageNum: "1", pageSize: "10000" }).then((res) => {
@@ -80,6 +81,9 @@ onReady(() => {});
 onShow(() => {});
 
 onLoad((options) => {
+  if ("number" in options) {
+    state.checkBoxNumber = parseInt(options.number);
+  }
   init();
 });
 

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

@@ -1,5 +1,5 @@
 <template>
-  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" :title="state.options.createBy + '的日报'" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff" @leftClick="goRecordDataRefresh()">
+  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" :title="state.options.createBy + '的日报'" :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>
@@ -69,7 +69,7 @@
 
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
-import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { onLoad, onShow, onReady, onHide, onLaunch, onBackPress, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
@@ -114,18 +114,6 @@ function init() {
     });
 }
 
-/** 返回列表页数据刷新 */
-function goRecordDataRefresh() {
-  projectApi()
-    .ReportRecordReadFlag({ reportId: state.options.reportId })
-    .then((requset) => {
-      uni.$emit("projectMange_record", true); //监听器
-    })
-    .catch((err) => {
-      uni.$emit("projectMange_record", true); //监听器
-    });
-}
-
 onReady(() => {});
 
 onShow(() => {
@@ -137,6 +125,17 @@ onLoad((options) => {
   state.options.reportId = options?.reportId;
   init();
 });
+
+onBackPress(() => {
+  projectApi()
+    .ReportRecordReadFlag({ reportId: state.options.reportId })
+    .then((requset) => {
+      uni.$emit("projectMange_record", true); //监听器
+    })
+    .catch((err) => {
+      uni.$emit("projectMange_record", true); //监听器
+    });
+});
 </script>
 
 <style lang="scss" scoped>

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

@@ -74,7 +74,7 @@
     </template>
   </oa-scroll>
 
-  <oa-tabbar :tabbarValue="0" :tabbarList="proxy.$constData.projectTabbar" :isTabbar="false"></oa-tabbar>
+  <oa-tabbar :tabbarValue="0" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oa-tabbar>
 </template>
 
 <script setup>

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

@@ -151,7 +151,7 @@
 
   <u-modal :show="modalShow" title="" :confirmText="'确定'" :cancelText="'取消'" :zoom="false" :showCancelButton="true" @confirm="modalConfirm" @cancel="modalShow = false">
     <view class="slot-content">
-      <u-checkbox-group v-model="projectsCheck" placement="row" :size="14" v-if="projectsList.length > 0">
+      <u-checkbox-group v-model="projectsCheck" placement="row" :size="14" @change="checkboxChange" v-if="projectsList.length > 0">
         <u-checkbox
           :customStyle="{ marginBottom: '8px', width: '50%' }"
           v-for="(item, index) in projectsList"
@@ -187,10 +187,12 @@ const props = defineProps({
   },
 });
 /*----------------------------------变量声明-----------------------------------*/
-const state = reactive({
+const modal = reactive({
   timeShow: false,
   timeValue: Number(new Date()),
   modalShow: false,
+});
+const state = reactive({
   form: {
     reportDate: null,
     tomorrowPlan: "",
@@ -208,7 +210,8 @@ const state = reactive({
   userDate: [],
   saveTime: "",
 });
-const { timeShow, timeValue, modalShow, form, projectsCheck, projectsList, userList, userDate, saveTime } = toRefs(state);
+const { timeShow, timeValue, modalShow } = toRefs(modal);
+const { form, projectsCheck, projectsList, userList, userDate, saveTime } = toRefs(state);
 
 /**
  * @初始化
@@ -225,10 +228,15 @@ function init() {
     });
 }
 
+function checkboxChange(e) {
+  console.log(e);
+  state.projectsCheck = e;
+}
+
 /** 时间选择器确定按钮点击事件 */
-function timeConfirm() {
-  state.form.timingTime = proxy.$time.getFormatterDate(state.timeValue);
-  state.timeShow = false;
+function timeConfirm(e) {
+  state.form.timingTime = proxy.$time.getFormatterDate(e.value);
+  modal.timeShow = false;
 }
 
 /** 开关按钮change事件 */
@@ -242,7 +250,7 @@ function switchChage(e, key) {
 
 /** 添加人员按钮事件 */
 function insertUsers() {
-  proxy.$tab.navigateTo(`/pages/business/common/projectMange/mall/index`);
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/mall/index?number=200`);
 }
 
 /** 删除人员按钮事件 */
@@ -253,7 +261,7 @@ function deleteUsers(index) {
 
 /** 添加项目按钮事件 */
 function insertProjects() {
-  state.modalShow = true;
+  modal.modalShow = true;
 }
 
 /** 实时保存填写数据 */
@@ -298,7 +306,7 @@ function handleSubmit() {
   state.form.ccTo = state.userList.map((obj) => `${obj.id}`).join(",");
   state.form.reportDate = proxy.$time.formatterDate(new Date(), "yyyy-MM-dd");
   state.form.workContents.forEach((e) => {
-    e.workTime = parseInt(e.workTime);
+    e.workTime = Number(e.workTime);
   });
 
   projectApi()
@@ -323,6 +331,10 @@ watchEffect(() => {
       state.form[key] = props.projectList[key];
     });
 
+    state.form.workContents.forEach((e) => {
+      state.projectsCheck.push(e.projectId);
+    });
+
     var ccTo = state.form.ccTo.length > 0 ? state.form.ccTo.split(",").map((num) => Number(num)) : [];
     state.userDate.forEach((e) => {
       if (ccTo.includes(e.userId)) {
@@ -343,10 +355,6 @@ watchEffect(() => {
       }
     });
 
-    state.form.workContents.forEach((e) => {
-      state.projectsCheck.push(e.projectId);
-    });
-
     storageSystem.set("project", state);
   }
 });

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

@@ -49,7 +49,7 @@
     </template>
   </oa-scroll>
 
-  <oa-tabbar :tabbarValue="1" :tabbarList="proxy.$constData.projectTabbar" :isTabbar="false"></oa-tabbar>
+  <oa-tabbar :tabbarValue="1" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oa-tabbar>
 </template>
 
 <script setup>

src/pages/index.vue

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

src/pages/info.vue

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

src/pages/mine.vue

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

src/plugins/common.plugins.js

@@ -34,9 +34,26 @@ export default {
    * @param data 数据集
    */
   mapping(reKey, isKey, value, data) {
-    for (let i = 0; i < data.length; i++) {
-      if (value == data[i][isKey]) {
-        return data[i][reKey];
+    if (typeof value == "string" && value.indexOf(",") > -1) {
+      //value为字符串的id集合
+      let arr = value.split(",");
+      let returnValue = "";
+
+      arr.forEach((e, index) => {
+        data.forEach((f) => {
+          if (e == f[isKey]) {
+
+            returnValue = returnValue ? `${returnValue},${f[reKey]}` : f[reKey];
+          }
+        })
+      })
+
+      return returnValue;
+    } else {
+      for (let i = 0; i < data.length; i++) {
+        if (value == data[i][isKey]) {
+          return data[i][reKey];
+        }
       }
     }
   },
@@ -107,6 +124,10 @@ export default {
    * @returns 
    */
   groupedItems(data, timeKey) {
+    if (data <= 0) {
+      return false
+    }
+
     const grouped = {};
     data.forEach((item) => {
       const date = item[timeKey].split("T")[0];

src/utils/request.js

@@ -17,14 +17,15 @@ function verification(res, resolve, reject) {
   const code = data.code || 200;
 
   if (code === 401) {
-    //#ifdef H5
-    uni.reLaunch({ url: "/pages/login" });
-    //#endif
-
-    //#ifdef APP-PLUS || MP-WEIXIN
-    uni.reLaunch({ url: "/pages/login" });
-    //#endif
+    useStores().LogOut().then(() => {
+      //#ifdef H5
+      uni.reLaunch({ url: "/pages/login" });
+      //#endif
 
+      //#ifdef APP-PLUS || MP-WEIXIN
+      uni.reLaunch({ url: "/pages/login" });
+      //#endif
+    });
     modal.closeLoading();
     reject("无效的会话，或者会话已过期，请重新登录。");
   } else if (code === 404 || res.statusCode === 404) {