替换全局用户列表接口/优化项目列表样式

src/App.vue

@@ -18,7 +18,8 @@ function initApp() {
   proxy.$settingStore.systemHeightTop(); //初始化获取安全区高度
 
   //#ifdef APP-PLUS
-  plus.screen.lockOrientation("portrait-primary"); //设置不可横屏
+  plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+  plus.screen.lockOrientation("portrait-primary"); //设置屏幕方向（1.竖屏正方向：portrait-primary 2.竖屏反方向：portrait-secondary 3.横屏正方向：landscape-primary 4.横屏反方向：landscape-secondary 5.自然方向：default）
   proxy.$settingStore.pushListener(); //开启消息推送监听
   // JKeyListen.startListen(true); //开启物理按钮监听
   //#endif

src/api/system/user.js

@@ -74,6 +74,15 @@ export function UserList(query) {
   })
 }
 
+// 用户列表（无数据权限）
+export function dUserList(query) {
+  return request({
+    url: '/system/user/dUserList',
+    method: 'GET',
+    params: query
+  })
+}
+
 // 微信用户验证
 export function getPageAuthorization(data) {
   return request({

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

@@ -117,7 +117,7 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarBut
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
-import { UserList } from "@/api/system/user.js";
+import { dUserList } from "@/api/system/user.js";
 /*----------------------------------组件引入-----------------------------------*/
 import avatarList from "../components/avatarList.vue";
 /*----------------------------------store引入-----------------------------------*/
@@ -333,7 +333,7 @@ function handleSubmit(value) {
 }
 
 onLoad((options) => {
-  UserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
+  dUserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
     state.userDate = res.data.rows;
   });
 

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

@@ -87,6 +87,7 @@
         size="normal"
         text="加入项目"
         :customStyle="{
+          height: '50px',
           color: '#3c9cff',
           borderWidth: 0,
           borderRadius: 0,
@@ -101,6 +102,7 @@
         size="normal"
         text="退出项目"
         :customStyle="{
+          height: '50px',
           color: '#f9ae3d',
           borderWidth: 0,
           borderRadius: 0,
@@ -115,6 +117,7 @@
         size="normal"
         text="编辑项目"
         :customStyle="{
+          height: '50px',
           color: '#3c9cff',
           borderWidth: 0,
           borderRadius: 0,
@@ -129,6 +132,7 @@
         size="normal"
         text="删除项目"
         :customStyle="{
+          height: '50px',
           color: '#f56c6c',
           borderWidth: 0,
           borderRadius: 0,
@@ -143,6 +147,7 @@
         size="normal"
         text="取消"
         :customStyle="{
+          height: '50px',
           color: '#3c9cff',
           border: 'none',
           borderRadius: 0,
@@ -169,7 +174,7 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, on
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
-import { UserList } from "@/api/system/user.js";
+import { dUserList } from "@/api/system/user.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 import { useStores } from "@/store/modules/index";
@@ -210,7 +215,7 @@ const { tabsList, tabsCurrent, dataList, pageSize, current, total, userDate, pop
  * @页面初始化
  */
 function init() {
-  UserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
+  dUserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
     state.userDate = res.data.rows;
   });
   selectListApi();
@@ -238,13 +243,9 @@ function handleSubmit(type, item) {
       .ProjectsDelete(item.id)
       .then(() => {
         proxy.$modal.msg("项目删除成功！");
-        state.modal.show = false;
-        state.popup.show = false;
         selectListApi();
       })
       .catch((errors) => {
-        state.modal.show = false;
-        state.popup.show = false;
         proxy.$modal.msg(errors);
       });
   } else if (type === "exit") {
@@ -252,13 +253,9 @@ function handleSubmit(type, item) {
       .ProjectsExit(item.id)
       .then(() => {
         proxy.$modal.msg("项目退出成功！");
-        state.modal.show = false;
-        state.popup.show = false;
         selectListApi();
       })
       .catch((errors) => {
-        state.modal.show = false;
-        state.popup.show = false;
         proxy.$modal.msg(errors);
       });
   } else if (type === "join") {
@@ -267,16 +264,15 @@ function handleSubmit(type, item) {
       .ProjectsJoin(item.id)
       .then(() => {
         proxy.$modal.msg("项目加入成功！");
-        state.modal.show = false;
-        state.popup.show = false;
         selectListApi();
       })
       .catch((errors) => {
-        state.modal.show = false;
-        state.popup.show = false;
         proxy.$modal.msg(errors);
       });
   }
+
+  state.modal.show = false;
+  state.popup.show = false;
 }
 
 /** 更多按钮点击事件 */
@@ -341,9 +337,7 @@ onShow(() => {
   proxy.$settingStore.systemThemeColor([1]);
 });
 
-onLoad((options) => {
-  init();
-});
+onLoad((options) => {});
 </script>
 <style lang="scss" scoped>
 :deep(.u-modal__content) {

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

@@ -146,7 +146,7 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarBut
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject, watchEffect, watch } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
-import { UserList } from "@/api/system/user.js";
+import { dUserList } from "@/api/system/user.js";
 /*----------------------------------组件引入-----------------------------------*/
 import avatarList from "../../components/avatarList.vue";
 /*----------------------------------store引入-----------------------------------*/
@@ -193,7 +193,7 @@ const { form, projectsCheck, projectsList, userList, userDate, saveTime } = toRe
  * @初始化
  */
 function init() {
-  UserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
+  dUserList({ pageNum: "1", pageSize: "10000" }).then((res) => {
     state.userDate = res.data.rows;
   });
 
@@ -302,14 +302,9 @@ watch(
       state.form[key] = props.projectList[key];
     });
 
-    projectApi()
-      .ProjectsSelect()
-      .then((requset) => {
-        state.projectsList = requset.data;
-        state.form.workContents.forEach((e) => {
-          state.projectsCheck.push(e.projectId);
-        });
-      });
+    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) => {
@@ -331,6 +326,12 @@ watch(
       }
     });
 
+    projectApi()
+      .ProjectsSelect()
+      .then((requset) => {
+        state.projectsList = requset.data;
+      });
+
     storageSystem.set("project", state);
   }
 );

src/pages/login.vue

@@ -219,15 +219,6 @@ function submitRes() {
       proxy.$modal.msg("请输入验证码");
       return;
     }
-
-    login({
-      phone: phone.value,
-      verify: verify.value,
-      tenantId: useStore.tenantId,
-      cids: proxy.$settingStore.pushClientId || undefined,
-      type: proxy.$common.isWechatMp() ? "wx" : "app",
-      openId: proxy.$common.isWechatMp() ? localStorage.getItem("wxOpenId") : undefined,
-    });
   } else {
     if (!username.value) {
       proxy.$modal.msg("请输入账户");
@@ -237,16 +228,18 @@ function submitRes() {
       proxy.$modal.msg("请输入密码");
       return;
     }
-
-    login({
-      username: username.value,
-      password: password.value,
-      tenantId: useStore.tenantId,
-      cids: proxy.$settingStore.pushClientId || undefined,
-      type: proxy.$common.isWechatMp() ? "wx" : "app",
-      openId: proxy.$common.isWechatMp() ? localStorage.getItem("wxOpenId") : undefined,
-    });
   }
+
+  login({
+    username: switchText.value == "账号密码登录" ? username.value : undefined,
+    password: switchText.value == "账号密码登录" ? password.value : undefined,
+    phone: switchText.value == "验证码登录" ? phone.value : undefined,
+    verify: switchText.value == "验证码登录" ? verify.value : undefined,
+    tenantId: useStore.tenantId,
+    cids: proxy.$settingStore.pushClientId || undefined,
+    type: proxy.$common.isWechatMp() ? "wx" : "app",
+    openId: proxy.$common.isWechatMp() ? localStorage.getItem("wxOpenId") : undefined,
+  });
 }
 
 /** 获取登录数据 */