优化工作报告功能模块

src/api/system/user.js

@@ -60,7 +60,16 @@ export function appDel(data) {
 export function deptUserTreeSelect(query) {
   return request({
     url: '/system/dept/deptUserTreeSelect',
-    method: 'get',
+    method: 'GET',
     params: query
   })
 }
+
+// 微信用户验证
+export function getPageAuthorization(data) {
+  return request({
+    url: '/service-iot/weChat/getPageAuthorization',
+    method: 'GET',
+    data: data,
+  })
+}

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

@@ -6,11 +6,11 @@
         <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']"
+          :class="[item.children && item.children.length >= 0 ? '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-department-pic" v-if="item.children && item.children.length >= 0"><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
@@ -93,11 +93,13 @@ export default {
       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);
-      });
+      if (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);
@@ -114,6 +116,8 @@ export default {
             }
           });
         });
+      } else {
+        this.$modal.msg("该部门下暂无可选择人员！");
       }
       // this.$emit("change", item);
     },

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

@@ -62,7 +62,7 @@
             </view>
           </view>
           <view class="mb5">
-            <u-text :text="el.contentText.slice(0, 100) + '···'" color="#666666" size="14"></u-text>
+            <u-text :text="el.contentText.length >= 100 ? el.contentText.slice(0, 100) + '···' : el.contentText" color="#666666" size="14"></u-text>
           </view>
           <view class="flex">
             <u-tag class="mr10" type="info" text="已读" size="mini" plain v-if="el.readFlag === 1" style="margin: 0 auto"></u-tag>

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

@@ -22,7 +22,10 @@
             v-model="item.workContent"
             placeholder="请输入工作内容"
             placeholderStyle="color:#909399;font-size:12px"
+            confirmType="return"
             :autoHeight="true"
+            :maxlength="-1"
+            :height="'100%'"
             border="none"
             style="padding: 0px; margin: 10px 0"
             @change="realTimeSaving()"
@@ -38,7 +41,10 @@
         v-model="form.tomorrowPlan"
         placeholder="请输入"
         placeholderStyle="color:#909399;font-size:12px"
+        confirmType="return"
         :autoHeight="true"
+        :maxlength="-1"
+        :height="'100%'"
         border="none"
         style="padding: 0px"
         @change="realTimeSaving()"
@@ -50,7 +56,10 @@
         v-model="form.coordinateWork"
         placeholder="请输入"
         placeholderStyle="color:#909399;font-size:12px"
+        confirmType="return"
         :autoHeight="true"
+        :maxlength="-1"
+        :height="'100%'"
         border="none"
         style="padding: 0px"
         @change="realTimeSaving()"
@@ -287,7 +296,7 @@ function handleSubmit() {
   projectApi()
     .Insert(state.form)
     .then((requset) => {
-      proxy.$tab.navigateBack(1); //返回到需要执行方法的页面
+      proxy.$tab.redirectTo("/pages/business/common/projectMange/record/index"); //返回到需要执行方法的页面
       storageSystem.remove("project");
     });
 }
@@ -324,6 +333,11 @@ onUnload(() => {
   padding: 10px 0px !important;
 }
 
+:deep(.u-collapse-item__content) {
+  overflow: auto;
+  height: auto !important;
+}
+
 :deep(.u-collapse-item__content__text) {
   padding: 0;
 }

src/store/modules/user.js

@@ -3,7 +3,7 @@ import { storage, storageSystem } from "@/utils/storage";
 import { getToken, setToken, removeToken } from "@/utils/auth";
 // 接口引用
 import { login, logout, getInfo, getMobileTenantConfig, getCodeImg } from "@/api/login";
-import { getUserProfile, appAdd, appDel } from "@/api/system/user";
+import { getUserProfile, appAdd, appDel, getPageAuthorization } from "@/api/system/user";
 import { phoneVerify } from "@/api/common/index.js";
 // 组件引用
 import config from "@/config";
@@ -211,8 +211,8 @@ const useStores = defineStore("useStores", {
         return;
       }
 
-      if (data.newPassword.length < 6 && data.newPassword.length > 20) {
-        modal.showToast("长度在 6 到 20 个字符");
+      if (data.newPassword.length < 6 || data.newPassword.length > 20) {
+        modal.showToast("密码长度在 6 到 20 个字符");
         return;
       }