工作报告功能模块完成/微信公众号代码合并

src/api/business/project.js

@@ -6,6 +6,7 @@ import { request } from "@/utils/request";
  * @method Details 记录详情
  * @method ReadFlag 记录已读
  * @method ProjectsList 项目下拉
+ * @method Insert 项目提交
  */
 export function projectApi() {
     return {
@@ -34,7 +35,14 @@ export function projectApi() {
             return request({
                 url: '/service-iot/pmProject/projects',
                 method: 'get',
-                params: data
+                data: data
+            })
+        },
+        Insert(data) {
+            return request({
+                url: '/service-iot/pmWorkReport/add',
+                method: 'POST',
+                data: data
             })
         }
     };

src/pages.json

@@ -402,10 +402,6 @@
     {
       "root": "pages/business/mhxf/",
       "pages": [
-        //消防督察单模块 开始
-        //消防督察单模块 结束
-
-        //信息查询 开始
         {
           "path": "informationSelect/index",
           "style": {
@@ -413,8 +409,6 @@
             "enablePullDownRefresh": false
           }
         },
-        //信息查询 结束
-        //设备管理 开始
         {
           "path": "deviceManage/index",
           "style": {
@@ -422,8 +416,6 @@
             "enablePullDownRefresh": false
           }
         },
-        //设备管理 结束
-        //协同作战地图 开始
         {
           "path": "coordination/index",
           "style": {
@@ -431,8 +423,6 @@
             "enablePullDownRefresh": false
           }
         },
-        //协同作战地图 结束
-        //单位信息采集 开始
         {
           "path": "unitInfoCollection/index",
           "style": {
@@ -440,8 +430,6 @@
             "enablePullDownRefresh": false
           }
         },
-        //单位信息采集 结束
-        //消防报告 开始
         {
           "path": "fireReport/index",
           "style": {
@@ -463,8 +451,6 @@
             "enablePullDownRefresh": false
           }
         },
-        //消防报告 结束
-        //待办事项 开始
         {
           "path": "needMatter/index",
           "style": {
@@ -472,7 +458,6 @@
             "enablePullDownRefresh": false
           }
         }
-        //待办事项 结束
       ]
     },
     // 智慧消防
@@ -704,6 +689,42 @@
               "titleNView": false
             }
           }
+        },
+        {
+          "path": "projectMange/write/index",
+          "style": {
+            "navigationBarTitleText": "模板选择",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
+        {
+          "path": "projectMange/write/insert",
+          "style": {
+            "navigationBarTitleText": "报告填写",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
+        {
+          "path": "projectMange/mall/index",
+          "style": {
+            "navigationBarTitleText": "选择接收人",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
         }
       ]
     }
@@ -751,4 +772,4 @@
       }
     ]
   }
-}
+}

src/pages/business/common/projectMange/mall/components/mall-head.vue

@@ -0,0 +1,179 @@
+<template>
+  <view class="me-tabs">
+    <scroll-view :id="viewId" :scroll-left="scrollLeft" scroll-x scroll-with-animation :scroll-animation-duration="300">
+      <view class="tabs-item tabs-flex tabs-scroll">
+        <view class="tab-item" v-for="(tab, i) in tabs" :key="i" @click="tabClick(i)" :ref="'refTabItem' + i" :style="{ color: $settingStore.themeColor.color }">{{ tab.label }}</view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      tabs: [],
+      viewId: "id_" + Math.random().toString(36).substr(2, 16),
+      scrollLeft: 0,
+      warpWidth: 0,
+    };
+  },
+  computed: {
+    isScroll() {
+      return this.tabWidth && this.tabs.length; // 指定了tabWidth的宽度,则支持水平滑动
+    },
+    tabHeightPx() {
+      return uni.upx2px(this.height);
+    },
+    tabHeightVal() {
+      return 48 + "px";
+    },
+    tabWidthPx() {
+      return uni.upx2px(this.tabWidth);
+    },
+    tabWidthVal() {
+      return this.isScroll ? this.tabWidthPx + "px" : "";
+    },
+    lineLeft() {
+      if (this.isScroll) {
+        return this.tabWidthPx * this.value + this.tabWidthPx / 2 + "px"; // 需转为px (用rpx的话iOS真机显示有误差)
+      } else {
+        return (100 / this.tabs.length) * (this.value + 1) - 100 / (this.tabs.length * 2) + "%";
+      }
+    },
+  },
+  watch: {
+    value() {
+      this.scrollCenter(); // 水平滚动到中间
+    },
+  },
+  methods: {
+    tabClick(i) {
+      this.tabs.splice(i + 1, this.tabs.length);
+      this.$emit("change", this.tabs[i]);
+    },
+    async addTab(item) {
+      this.tabs.push(item);
+      setTimeout(() => {
+        let query = uni.createSelectorQuery();
+        query = query.in(this); // 支付宝小程序不支持in(this),而字节跳动小程序必须写in(this), 否则都取不到值
+        query
+          .select(".tab-item")
+          .boundingClientRect((data) => {
+            this.warpWidth += data.width;
+            this.scrollLeft = this.warpWidth;
+          })
+          .exec();
+      }, 100);
+    },
+    async scrollCenter() {
+      if (!this.isScroll) return;
+      if (!this.warpWidth) {
+        // tabs容器的宽度
+        let rect = await this.initWarpRect();
+        this.warpWidth = rect ? rect.width : uni.getSystemInfoSync().windowWidth; // 某些情况下取不到宽度,暂时取屏幕宽度
+      }
+      let tabLeft = this.tabWidthPx * this.value + this.tabWidthPx / 2; // 当前tab中心点到左边的距离
+      let diff = tabLeft - this.warpWidth / 2; // 如果超过tabs容器的一半,则滚动差值
+      this.scrollLeft = diff;
+      // #ifdef MP-TOUTIAO
+      this.scrollTimer && clearTimeout(this.scrollTimer);
+      this.scrollTimer = setTimeout(() => {
+        // 字节跳动小程序,需延时再次设置scrollLeft,否则tab切换跨度较大时不生效
+        this.scrollLeft = Math.ceil(diff);
+      }, 400);
+      // #endif
+    },
+    initWarpRect() {
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          // 延时确保dom已渲染, 不使用$nextclick
+          let query = uni.createSelectorQuery();
+          // #ifndef MP-ALIPAY
+          query = query.in(this); // 支付宝小程序不支持in(this),而字节跳动小程序必须写in(this), 否则都取不到值
+          // #endif
+          query
+            .select("#" + this.viewId)
+            .boundingClientRect((data) => {
+              resolve(data);
+            })
+            .exec();
+        }, 20);
+      });
+    },
+  },
+  mounted() {
+    this.scrollCenter(); // 滚动到当前下标
+  },
+};
+</script>
+
+<style lang="scss">
+.me-tabs {
+  position: relative;
+  font-size: 12px;
+  background-color: #fff;
+  box-sizing: border-box;
+  overflow-y: hidden;
+  height: 48px;
+  &.tabs-fixed {
+    z-index: 990;
+    position: fixed;
+    top: var(--window-top);
+    left: 0;
+    width: 100%;
+  }
+
+  .tabs-item {
+    position: relative;
+    white-space: nowrap;
+    box-sizing: border-box;
+  }
+
+  // 平分的方式显示item
+  .tabs-flex {
+    display: flex;
+    .tab-item {
+      color: #666;
+      font-size: 14px;
+      margin-right: 10px;
+      position: relative;
+      padding-right: 22px;
+      color: #3173ff;
+      position: relative;
+      text-align: center;
+      box-sizing: border-box;
+      height: 48px;
+      line-height: 48px;
+
+      &::before {
+        content: " ";
+        height: 33px;
+        width: 33px;
+        border-width: 1.5px 1.5px 0 0;
+        border-color: #f2f2f2;
+        border-style: solid;
+        transform: matrix(0.5, 0.7, -0.5, 0.7, 0, 6);
+        position: absolute;
+        top: 0;
+        margin-top: 0;
+        right: 0;
+      }
+
+      &:last-child {
+        margin-right: 0px;
+        color: #999 !important;
+
+        &::before {
+          content: none;
+        }
+      }
+    }
+  }
+  .tabs-scroll {
+    .tab-item {
+      display: inline-block;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,289 @@
+<template>
+  <view>
+    <view class="box-head"><uni-mall-head ref="refUniMallHead" @change="tabChange"></uni-mall-head></view>
+    <view class="box-list">
+      <u-checkbox-group v-model="checkboxList" placement="column" :activeColor="$settingStore.themeColor.color" @change="checkboxChange">
+        <view
+          v-for="item in currentData"
+          class="box-list-item"
+          :class="[item.children && item.children.length ? 'box-list-item-department-icon' : 'box-list-item-user']"
+          :key="item.id"
+          @click="handelClickItem(item)"
+        >
+          <view class="box-list-item-department-pic" v-if="item.children && item.children.length"><image src="@/static/department-icon.png"></image></view>
+          <view class="box-list-item-user-pic flex" v-else>
+            <u-checkbox class="box-list-item-user-pic-checkbox mr9" :name="item.id"> </u-checkbox>
+            <u-avatar
+              class="box-list-item-user-pic-avatar mr10"
+              :src="item.avatar"
+              shape="square"
+              size="40"
+              fontSize="12"
+              color="#ffffff"
+              :bgColor="$settingStore.themeColor.color"
+              v-if="item.avatar"
+            ></u-avatar>
+            <u-avatar
+              class="box-list-item-user-pic-avatar mr10"
+              :text="item.label.length > 2 ? item.label.slice(1, 3) : item.label"
+              shape="square"
+              size="40"
+              fontSize="12"
+              color="#ffffff"
+              :bgColor="$settingStore.themeColor.color"
+              v-else
+            ></u-avatar>
+          </view>
+
+          <view class="box-list-item-right">
+            <view class="box-list-item-text">{{ item.label }} {{ item.children && item.children.length > 0 ? `（${item.children.length}）` : "" }}</view>
+            <view class="box-list-item-user-tag" v-if="!item.children && item.post">
+              <text>{{ item.post }}</text>
+            </view>
+          </view>
+        </view>
+      </u-checkbox-group>
+    </view>
+    <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>
+      <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>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import uniMallHead from "./mall-head.vue";
+import common from "@/plugins/common.plugins.js";
+import { storageSystem } from "@/utils/storage"; // 公共方法引用
+export default {
+  props: {
+    dataList: {
+      type: Array,
+      default: () => [],
+    },
+    defaultHeadList: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  components: {
+    uniMallHead,
+  },
+  data() {
+    return {
+      checkboxList: [],
+      currentData: [],
+      checkboxUserData: [],
+      checkboxUserList: [],
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    init() {
+      if (Object.keys(this.defaultHeadList).length > 0) {
+        this.$refs.refUniMallHead.addTab(this.defaultHeadList);
+      }
+      this.currentData = this.dataList;
+
+      var userList = storageSystem.get("project").userList;
+      userList.forEach((e) => {
+        this.checkboxList.push(e.id);
+        this.checkboxUserData.push(e);
+        this.checkboxUserList.push(e.label);
+      });
+    },
+    tabChange(obj) {
+      this.getCurrentData(obj.id, this.dataList);
+    },
+    handelClickItem(item) {
+      if (item.children && item.children.length > 0) {
+        this.$refs.refUniMallHead.addTab({ label: item.label, id: item.id });
+        this.currentData = item.children;
+
+        this.currentData.forEach((e) => {
+          this.checkboxUserData.forEach((f) => {
+            if (e.id === f.id) {
+              this.checkboxList.push(f.id);
+            }
+          });
+        });
+      }
+      // this.$emit("change", item);
+    },
+    getCurrentData(id, data) {
+      if (id === this.defaultHeadList.id) {
+        this.currentData = this.dataList;
+      } else {
+        if (data.length > 0) {
+          data.map((item) => {
+            if (item.id === id) {
+              this.currentData = item.children;
+            }
+            if (item.children && item.children.length > 0) {
+              this.getCurrentData(id, item.children);
+            }
+          });
+        }
+      }
+    },
+    handleSubmit() {
+      this.$emit("submit", this.checkboxUserData);
+    },
+    checkboxChange(event) {
+      this.currentData.forEach((f) => {
+        if (event.includes(f.id)) {
+          this.checkboxUserData.push(f);
+        } else {
+          this.checkboxUserData.forEach((e, index) => {
+            if (e.id === f.id) {
+              delete this.checkboxUserData[index];
+            }
+          });
+        }
+      });
+
+      this.checkboxUserList = [];
+      this.checkboxUserData = common.uniq(this.checkboxUserData, "id");
+      this.checkboxUserData.forEach((e) => {
+        this.checkboxUserList.push(e.label);
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.box-head {
+  position: fixed;
+  left: 0px;
+  width: 100%;
+  height: 48px;
+  background: #ffffff;
+  padding-left: 17px;
+  box-sizing: border-box;
+  overflow-y: hidden;
+  z-index: 999;
+}
+.box-list {
+  padding-top: 52px;
+  .box-list-item {
+    position: relative;
+    height: 60px;
+    display: flex;
+    align-items: center;
+    padding: 0 15px;
+    box-sizing: border-box;
+    background: #ffffff;
+    margin-bottom: 1px;
+    &:active {
+      background: #f2f3f4;
+    }
+    &:last-child {
+      margin-bottom: 0px;
+    }
+    .box-list-item-department-pic {
+      width: 40px;
+      height: 40px;
+      background: rgba(55, 127, 255, 0.1);
+      border-radius: 4px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-right: 15px;
+      overflow: hidden;
+      image {
+        width: 20px;
+        height: 20px;
+      }
+    }
+    .box-list-item-right {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      flex: 1;
+    }
+    .box-list-item-text {
+      color: #333333;
+      font-size: 14px;
+    }
+    .box-list-item-user-tag {
+      text {
+        box-sizing: border-box;
+        border-radius: 8px;
+        padding: 4px 8px;
+        font-size: 10px;
+        margin-left: 5px;
+        &:first-child {
+          margin-left: 0px;
+        }
+        &:nth-child(1) {
+          background: rgba(49, 210, 144, 0.05);
+          border: 1px solid #31d290;
+          color: #31d290;
+        }
+        &:nth-child(2) {
+          background: rgba(55, 127, 255, 0.05);
+          border: 1px solid #377fff;
+          color: #377fff;
+        }
+      }
+    }
+    &.box-list-item-department-icon {
+      &::before {
+        content: " ";
+        height: 10px;
+        width: 10px;
+        border-width: 2px 2px 0 0;
+        border-color: #c0c0c0;
+        border-style: solid;
+        transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+        position: absolute;
+        top: 50%;
+        margin-top: -6px;
+        right: 14px;
+      }
+    }
+  }
+  .box-list-item-department + .box-list-item-user {
+    margin-top: 10px;
+  }
+}
+
+.box-foot {
+  position: fixed;
+  bottom: 0px;
+  width: 100%;
+  height: 60px;
+  background: #ffffff;
+  z-index: 999;
+  box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
+  display: flex;
+  padding: 0 15px;
+
+  &-left {
+    margin: auto auto auto 0;
+
+    &-count {
+      color: #377fff;
+      font-size: 14px;
+      margin-bottom: 5px;
+    }
+
+    &-people {
+      color: #999;
+      font-size: 12px;
+    }
+  }
+
+  &-right {
+    margin: auto 0 auto 15px;
+  }
+}
+</style>

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

@@ -0,0 +1,89 @@
+<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>
+      <template #right>
+        <view class="u-navbar__content__right__item">
+          <u-icon name="more-dot-fill" size="20" color="#000"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="record-container scroll-height"
+    :isSticky="false"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: 'calc(100vh - 44px)',
+      //#endif
+    }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :lowerThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :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>
+    </template>
+  </oa-scroll>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { deptUserTreeSelect } from "@/api/system/user.js";
+/*----------------------------------组件引入-----------------------------------*/
+import uniMallList from "./components/mall-list.vue";
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+import { storageSystem } from "@/utils/storage"; // 公共方法引用
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  defaultHeadList: { label: "通讯录", id: "18AF75C3-330A-53AC-270E-EAD060BC0E1A" },
+  dataList: [],
+});
+const { defaultHeadList, dataList } = toRefs(state);
+
+function init() {
+  deptUserTreeSelect({ pageNum: "1", pageSize: "10000" }).then((res) => {
+    state.dataList = JSON.parse(JSON.stringify(res.data).replace(/value/g, "id"))[0].children;
+  });
+}
+
+function handleChange(item) {
+  //   if (item.type === "user") {
+  //     uni.navigateTo({
+  //       url: "/pages/datails/datails?user=" + JSON.stringify(item),
+  //     });
+  //   }
+}
+
+function handleSubmit(event) {
+  proxy.$tab.navigateBack(1); //返回到需要执行方法的页面
+  uni.$emit("UserMall", event); //将值存储监听器
+}
+
+onReady(() => {});
+
+onShow(() => {});
+
+onLoad((options) => {
+  init();
+});
+
+onUnload(() => {});
+</script>
+
+<style></style>

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

@@ -0,0 +1,334 @@
+<template>
+  <view class="content-area">
+    <view class="content-area-title font12 mtb5 plr10">实时保存，保存时间 {{ saveTime }}</view>
+
+    <view class="content-area-item p10 bg-white">
+      <view class="font14 weight mb10">工作内容</view>
+
+      <u-collapse v-if="form.workContents.length > 0">
+        <u-collapse-item :title="item.projectName + ' ' + (item.workTime ? item.workTime + 'h' : '0h')" :name="item.projectId" v-for="(item, index) in form.workContents" :key="index">
+          <u-input
+            v-model="item.workTime"
+            placeholder="请输入工作耗时"
+            placeholderStyle="color:#909399;font-size:12px"
+            suffixIcon="h"
+            suffixIconStyle="color:#909399;font-size:12px;width:10px"
+            border="none"
+            type="digit"
+            style="padding: 0px; margin: 10px 0"
+            @change="realTimeSaving()"
+          />
+          <u-textarea
+            v-model="item.workContent"
+            placeholder="请输入工作内容"
+            placeholderStyle="color:#909399;font-size:12px"
+            :autoHeight="true"
+            border="none"
+            style="padding: 0px; margin: 10px 0"
+            @change="realTimeSaving()"
+          ></u-textarea>
+        </u-collapse-item>
+      </u-collapse>
+
+      <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="addProjects()" shape="circle" icon="plus" size="mini"> 选择项目 </u-button>
+    </view>
+    <view class="content-area-item mt20 p10 bg-white">
+      <view class="font14 weight mb10">明日计划</view>
+      <u-textarea
+        v-model="form.tomorrowPlan"
+        placeholder="请输入"
+        placeholderStyle="color:#909399;font-size:12px"
+        :autoHeight="true"
+        border="none"
+        style="padding: 0px"
+        @change="realTimeSaving()"
+      ></u-textarea>
+    </view>
+    <view class="content-area-item mt20 p10 bg-white">
+      <view class="font14 weight mb10">工作协调</view>
+      <u-textarea
+        v-model="form.coordinateWork"
+        placeholder="请输入"
+        placeholderStyle="color:#909399;font-size:12px"
+        :autoHeight="true"
+        border="none"
+        style="padding: 0px"
+        @change="realTimeSaving()"
+      ></u-textarea>
+    </view>
+    <view class="content-area-item mt20 p10 bg-white">
+      <view class="font14 weight mb10">抄送到人</view>
+      <view class="flex flex-wrap">
+        <view class="mb10" v-for="user in userList" :key="user">
+          <u-avatar
+            class="box-list-item-user-pic-avatar mr10"
+            :src="user.avatar"
+            shape="square"
+            size="40"
+            fontSize="12"
+            color="#ffffff"
+            :bgColor="$settingStore.themeColor.color"
+            v-if="user.avatar"
+          ></u-avatar>
+          <u-avatar
+            class="box-list-item-user-pic-avatar mr10"
+            :text="user.label.length > 2 ? user.label.slice(1, 3) : user.label"
+            shape="square"
+            size="40"
+            fontSize="12"
+            color="#ffffff"
+            :bgColor="$settingStore.themeColor.color"
+            v-else
+          ></u-avatar>
+        </view>
+      </view>
+
+      <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="addUsers()" shape="circle" icon="plus" size="mini"> 选择人员 </u-button>
+    </view>
+  </view>
+
+  <view class="content-area-item mt20 p10 bg-white">
+    <view class="flex">
+      <view class="font14 weight">同步钉钉</view>
+      <u-switch
+        style="margin-left: auto"
+        :modelValue="form.sendDingTalk == 0 ? false : true"
+        :ctiveColor="proxy.$settingStore.themeColor.color"
+        size="20"
+        @change="(event) => switchChage(event, 'sendDingTalk')"
+        asyncChange
+      ></u-switch>
+    </view>
+    <view class="flex"> </view>
+  </view>
+
+  <view class="content-area-item mt20 p10 bg-white">
+    <view class="flex">
+      <view class="font14 weight">定时发送</view>
+      <u-switch
+        style="margin-left: auto"
+        :modelValue="form.isRegularlySend == 0 ? false : true"
+        :ctiveColor="proxy.$settingStore.themeColor.color"
+        size="20"
+        @change="(event) => switchChage(event, 'isRegularlySend')"
+        asyncChange
+      ></u-switch>
+    </view>
+    <view class="flex" v-if="form.isRegularlySend == 0 ? false : true" @click="timeInputClick()">
+      <u-input
+        v-model="form.timingTime"
+        placeholder="请选择时间"
+        placeholderStyle="color:#909399;font-size:12px"
+        suffixIcon="arrow-right"
+        suffixIconStyle="color:#909399;font-size:12px;width:10px"
+        border="none"
+        style="padding: 0px; margin: 10px 0"
+        @change="realTimeSaving()"
+        disabledColor="transparent"
+        disabled
+      />
+    </view>
+  </view>
+
+  <view class="app-button">
+    <view class="app-button-padding"></view>
+    <view class="app-button-fixed">
+      <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+    </view>
+  </view>
+
+  <u-datetime-picker :show="timeShow" v-model="timeValue" mode="datetime" :closeOnClickOverlay="true" @cancel="timeShow = false" @confirm="timeConfirm"></u-datetime-picker>
+
+  <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">
+        <u-checkbox
+          :customStyle="{ marginBottom: '8px', width: '50%' }"
+          v-for="(item, index) in projectsList"
+          :key="index"
+          :label="item.projectName"
+          :name="item.id"
+          :activeColor="proxy.$settingStore.themeColor.color"
+        >
+        </u-checkbox>
+      </u-checkbox-group>
+    </view>
+  </u-modal>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+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";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+import { storageSystem } from "@/utils/storage"; // 公共方法引用
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  timeShow: false,
+  timeValue: Number(new Date()),
+  modalShow: false,
+  form: {
+    reportDate: null,
+    tomorrowPlan: "",
+    ccTo: "",
+    coordinateWork: null,
+    workContents: [],
+    sendDingTalk: 0,
+    isRegularlySend: 0,
+    timingTime: null,
+    reportStatus: null,
+  },
+  projectsCheck: [],
+  projectsList: [],
+  userList: [],
+  saveTime: "",
+});
+const { timeShow, timeValue, modalShow, form, projectsCheck, projectsList, userList, saveTime } = toRefs(state);
+
+/**
+ * @初始化
+ */
+function init() {
+  projectApi()
+    .ProjectsList()
+    .then((requset) => {
+      state.projectsList = requset.data;
+    });
+}
+
+/** 定时发送输入框点击事件 */
+function timeInputClick() {
+  state.timeShow = true;
+}
+
+/** 时间选择器确定按钮点击事件 */
+function timeConfirm() {
+  state.form.timingTime = proxy.$common.formatterDateTime(state.timeValue);
+  state.timeShow = false;
+}
+
+/** 开关按钮change事件 */
+function switchChage(e, key) {
+  state.form[key] = e == true ? 1 : 0;
+  if (key === "isRegularlySend") {
+    state.form.timingTime = null;
+  }
+  realTimeSaving();
+}
+
+/** 项目按钮事件 */
+function addUsers() {
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/mall/index`);
+}
+
+/** 项目按钮事件 */
+function addProjects() {
+  state.modalShow = true;
+}
+
+/** 弹窗确定 */
+function modalConfirm() {
+  var newWorkContents = JSON.parse(JSON.stringify(state.form.workContents));
+  state.form.workContents = [];
+
+  state.projectsCheck.forEach((e) => {
+    state.form.workContents.push({
+      projectId: e,
+      projectName: proxy.$common.mapping("projectName", "id", e, state.projectsList),
+      workTime: "",
+      workContent: "",
+    });
+  });
+
+  newWorkContents.forEach((e) => {
+    state.form.workContents.forEach((f) => {
+      if (e.projectId == f.projectId) {
+        f.workTime = e.workTime;
+        f.workContent = e.workContent;
+      }
+    });
+  });
+
+  state.modalShow = false;
+  realTimeSaving();
+}
+
+/** 实时保存填写数据 */
+function realTimeSaving() {
+  state.saveTime = proxy.$common.formatterDate(new Date(), "hh:mm");
+  storageSystem.set("project", state);
+}
+
+/** 提交 */
+function handleSubmit() {
+  if (!state.form.tomorrowPlan) {
+    proxy.$modal.showToast("请输入明日计划");
+  }
+
+  state.form.ccTo = state.userList.map((obj) => `${obj.id}`).join(",");
+  state.form.reportDate = proxy.$common.formatterDate(new Date(), "yyyy-MM-dd");
+  state.form.workContents.forEach((e) => {
+    e.workTime = parseInt(e.workTime);
+  });
+
+  projectApi()
+    .Insert(state.form)
+    .then((requset) => {
+      proxy.$tab.navigateBack(1); //返回到需要执行方法的页面
+      storageSystem.remove("project");
+    });
+}
+
+onReady(() => {});
+
+onShow(() => {
+  //循环将缓存数据遍历
+  var storages = storageSystem.get("project");
+  Object.keys(storages).forEach((key) => {
+    state[key] = storages[key];
+  });
+
+  //监听组件返回数据
+  uni.$on("UserMall", function (value) {
+    state.userList = value;
+    realTimeSaving();
+  });
+});
+
+onLoad((options) => {
+  init();
+});
+
+onUnload(() => {
+  uni.$off("UserMall"); //将值删除监听器
+});
+</script>
+
+<style lang="scss" scoped>
+:deep(.u-cell__body) {
+  color: #000000;
+  font-size: 12px;
+  padding: 10px 0px !important;
+}
+
+:deep(.u-collapse-item__content__text) {
+  padding: 0;
+}
+
+:deep(.u-cell__left-icon-wrap) {
+  margin: 0;
+}
+
+.content-area {
+  &-title {
+    text-align: right;
+    color: #909399;
+  }
+}
+</style>

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

@@ -0,0 +1,115 @@
+<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>
+      <!-- <template #right>
+        <view class="u-navbar__content__right__item">
+          <u-icon name="more-dot-fill" size="19" color="#000"></u-icon>
+        </view>
+      </template> -->
+    </u-navbar>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="record-container scroll-height bg-white"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: 'calc(100vh - 88px)',
+      //#endif
+    }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :lowerThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
+      <view class="content-area p20">
+        <!-- <view class="content-area-title font16 mb20">可使用模板</view> -->
+        <u-row class="content-area-row" gutter="10">
+          <u-col class="content-area-row-col" :span="4" v-for="item in moreData" :key="item">
+            <view class="content-area-row-col-item shadow-default plr10 ptb10" @click="goNavigateTo(item)">
+              <div class="font14 mb10" style="font-weight: 600">{{ item.title }}</div>
+              <div class="font10 mb10" style="line-height: 16px" v-for="child in item.valueData" :key="child">
+                <div style="color: #606266">{{ child.title }}</div>
+                <div style="color: #a8abb2">{{ child.value }}</div>
+              </div>
+            </view>
+          </u-col>
+        </u-row>
+      </view>
+    </template>
+  </oa-scroll>
+
+  <oa-tabbar :tabbarValue="1" :tabbarList="proxy.$constData.projectTabbar" :isTabbar="false"></oa-tabbar>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+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";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  moreData: [
+    {
+      id: 1,
+      title: "项目报告",
+      valueData: [
+        { title: "今日工作内容", value: "请填写" },
+        { title: "明日工作计划", value: "请输入" },
+        { title: "需协调工作", value: "请输入" },
+      ],
+    },
+    // {
+    //   id: 2,
+    //   title: "日志",
+    //   valueData: [
+    //     { title: "今日工作内容", value: "请输入" },
+    //     { title: "明日工作计划", value: "请输入" },
+    //     { title: "需协调工作", value: "请输入" },
+    //   ],
+    // },
+  ],
+});
+
+const { moreData } = toRefs(state);
+
+/**
+ * @跳转详情
+ */
+function goNavigateTo(e) {
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/write/insert?templateId=${e.id}`);
+}
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
+onLoad((options) => {});
+
+onUnload(() => {});
+</script>
+
+<style lang="scss" scoped>
+.content-area {
+  color: #000000;
+}
+</style>

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

@@ -0,0 +1,69 @@
+<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>
+      <template #right>
+        <view class="u-navbar__content__right__item">
+          <u-icon name="more-dot-fill" size="20" color="#000"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="record-container scroll-height"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: 'calc(100vh - 44px)',
+      //#endif
+    }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :lowerThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <template1 v-if="templateId == 1" />
+    </template>
+  </oa-scroll>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+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 template1 from "./components/template1.vue";
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  templateId: 1,
+});
+const { templateId } = toRefs(state);
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
+onLoad((options) => {
+  "templateId" in options ? (state.templateId = parseInt(options.templateId)) : "";
+});
+
+onUnload(() => {});
+</script>

src/pages/index.vue

@@ -114,9 +114,6 @@ const { dialogFlag } = toRefs(state);
  */
 async function init(options) {
   //#ifdef H5
-  // alert("store" + storage.get("wxOpenId"));
-  // alert("store" + storageSystem.get("wxOpenId"));
-  // alert("token" + getToken());
   await useStore.GetWxOpenId(2, options); //调用获取微信公众号openId
   //#endif
 

src/pages/login.vue

@@ -94,7 +94,7 @@ import { reactive, getCurrentInstance, toRefs, inject, nextTick } from "vue";
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 import config from "@/config";
-import { storageSystem } from "@/utils/storage";
+import { storage, storageSystem } from "@/utils/storage";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
@@ -130,12 +130,11 @@ function goSeverConfig() {
 function switchMode(value) {
   if (value == 1) {
     switchText.value = switchText.value == "验证码登录" ? "账号密码登录" : "验证码登录";
-    if(switchText.value == "验证码登录"){
-      phone.value = username.value
-    }else{
-      username.value = phone.value
+    if (switchText.value == "验证码登录") {
+      phone.value = username.value;
+    } else {
+      username.value = phone.value;
     }
-    
   } else if (value == 2) {
     proxy.$tab.navigateTo("/pages/register");
   }

src/store/modules/user.js

@@ -7,6 +7,7 @@ import { getUserProfile, appAdd, appDel } from "@/api/system/user";
 import { phoneVerify } from "@/api/common/index.js";
 // 组件引用
 import config from "@/config";
+import tab from "@/plugins/modal.plugins.js";
 import modal from "@/plugins/modal.plugins.js";
 import common from "@/plugins/common.plugins.js";
 import setting from "@/plugins/setting.plugins.js";
@@ -281,22 +282,31 @@ const useStores = defineStore("useStores", {
      */
     GetWxOpenId(type, options) {
       if (type == 1 && common.isWechatMp()) {
-        if (window.location.href.indexOf("openId=") == -1) {
-          window.location.href = config.baseUrl + "/service-iot/weChat/getFirst1";
+        if (storage.get("wxOpenId") && getToken()) {
+          // alert("已登录");
+          tab.reLaunch("/pages/index?flag=true");
         } else {
-          storage.set("wxOpenId", common.getUrlList().openId)
-          storageSystem.set("wxOpenId", common.getUrlList().openId)
+          // alert("未授权")
+          if (window.location.href.indexOf("openId=") == -1) {
+            // alert("未授权url无openid")
+            window.location.href = config.baseUrl + "/service-iot/weChat/getFirst1";
+          } else {
+            // alert("未授权url有openid")
+            storage.set("wxOpenId", common.getUrlList().openId)
+          }
         }
       } else if (type == 2 && common.isWechatMp()) {
         if (options?.flag === undefined || options?.flag == false) {
-          // alert("store" + storage.get("wxOpenId"))
-          // alert("store" + storageSystem.get("wxOpenId"))
-          // alert("token" + getToken())
-          if (storage.get("wxOpenId")) {
+          // alert("首页无flag",)
+          if (storage.get("wxOpenId") && getToken()) {
+            // alert("首页有openid、token")
             window.location.href = config.baseUrl + "/service-iot/weChat/getPageAuthorization?openId=" + storage.get("wxOpenId");
           } else {
-            window.location.href = config.baseUrl + "/service-iot/weChat/getPageAuthorization";
+            // alert("首页无openid，回登录页")
+            window.location.href = config.baseUrl + "/service-iot/weChat/getFirst1";
           }
+        } else {
+          // alert("首页有flag,结束")
         }
       }
     },

src/utils/storage.js

@@ -22,6 +22,7 @@ const storage = {
 }
 
 const storageSystem = {
+  init: function (key) { },
   set: function (key, value) {
     let tmp = uni.getStorageSync(useStores().userId + "_storage_System")
     tmp = tmp ? tmp : {}