From 9cbfbdbb550376a3e832e6c28b0a719ec29b1037 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Tue, 25 Nov 2025 16:59:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(project):=20=E4=BC=98=E5=8C=96=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改项目详情按钮点击事件，支持编辑和查看两种模式
- 根据项目状态决定打开编辑表单或详情抽屉
- 在订单详情中自动填充当前用户信息
- 修复分页排序参数处理逻辑
- 添加项目创建时默认填充当前用户为支持人员
- 扩展用户状态管理，增加邮箱和电话号码字段
- 登录时同步存储用户邮箱和电话号码信息
---
 oms_web/oms_vue/src/store/modules/user.js       | 10 ++++++++++
 .../src/views/project/info/ProjectForm.vue      |  2 ++
 .../oms_vue/src/views/project/info/index.vue    | 17 ++++++++++++-----
 .../src/views/project/order/OrderDetail.vue     |  1 +
 .../com/ruoyi/common/core/page/PageDomain.java  |  2 +-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/oms_web/oms_vue/src/store/modules/user.js b/oms_web/oms_vue/src/store/modules/user.js
index 224b3baf..5020a981 100644
--- a/oms_web/oms_vue/src/store/modules/user.js
+++ b/oms_web/oms_vue/src/store/modules/user.js
@@ -10,6 +10,8 @@ const user = {
     name: '',
     userName: '',
     avatar: '',
+    email:'',
+    phonenumber:'',
     roles: [],
     permissions: []
   },
@@ -32,6 +34,12 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    } ,
+    SET_EMAIL: (state, email) => {
+      state.email = email
+    },
+    SET_PHONENUMBER: (state, phonenumber) => {
+      state.phonenumber = phonenumber
     }
   },
 
@@ -69,6 +77,8 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_ID', user.userId)
+          commit('SET_EMAIL', user.email)
+          commit('SET_PHONENUMBER', user.phonenumber)
           commit('SET_NAME', user.loginName)
           commit('SET_NICK_NAME', user.userName)
           commit('SET_AVATAR', avatar)
diff --git a/oms_web/oms_vue/src/views/project/info/ProjectForm.vue b/oms_web/oms_vue/src/views/project/info/ProjectForm.vue
index 617d246f..e3bb39a0 100644
--- a/oms_web/oms_vue/src/views/project/info/ProjectForm.vue
+++ b/oms_web/oms_vue/src/views/project/info/ProjectForm.vue
@@ -590,6 +590,8 @@ export default {
     handleAdd() {
       this.reset();
       this.title = "添加项目管理";
+      this.form.hzSupportUserName = this.$store.state.user.name;
+      this.form.hzSupportUser = this.$store.state.user.id;
     },
     handleUpdate() {
       this.reset();
diff --git a/oms_web/oms_vue/src/views/project/info/index.vue b/oms_web/oms_vue/src/views/project/info/index.vue
index f2a1b8da..03efba46 100644
--- a/oms_web/oms_vue/src/views/project/info/index.vue
+++ b/oms_web/oms_vue/src/views/project/info/index.vue
@@ -196,7 +196,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleView(scope.row)"
+            @click="handleView(scope.row, 'edit')"
             v-hasPermi="['sip:project:edit']"
           >项目详情</el-button>
           <el-button
@@ -433,10 +433,17 @@ export default {
       }
       return '';
     },
-    /** 查看项目详情 */
-    handleView(row) {
-      this.currentProjectId = row.id;
-      this.drawerVisible = true;
+    /** 查看项目详情或编辑项目 */
+    handleView(row, type) {
+      if (type === 'edit' && row.canGenerate) {
+        // 如果是点击操作栏的“项目详情”且项目未生成订单，则打开编辑表单
+        this.selectedProjectId = row.id;
+        this.projectFormVisible = true;
+      } else {
+        // 否则（点击项目名称或已生成订单的项目），打开详情抽屉
+        this.currentProjectId = row.id;
+        this.drawerVisible = true;
+      }
     },
     /** 生成订单 */
     openOrder(id, canGenerate) {
diff --git a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
index dac3ad97..828399dc 100644
--- a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
+++ b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
@@ -384,6 +384,7 @@ export default {
           if (this.uniqueContractVersions.length > 0) this.activeContractVersionTab = String(this.uniqueContractVersions[0]);
         });
       } else {
+        this.form.duty = this.$store.state.user.id;
         this.form.dutyName = this.$store.state.user.name;
         this.form.dutyEmail = this.$store.state.user.email;
         this.form.dutyPhone = this.$store.state.user.phonenumber;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
index d17d8f90..c92ed94d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@@ -30,7 +30,7 @@ public class PageDomain
         {
             return "";
         }
-        return StringUtils.toUnderScoreCase(orderByColumn) + " " + getIsAsc();
+        return StringUtils.toUnderScoreCase(orderByColumn) + " " + ((StringUtils.isEmpty(getIsAsc())) ? "" : getIsAsc());
     }