From b6080e9d4b906a0da9493a5fa302ce3ab7c4f7d2 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 18 Mar 2026 11:30:58 +0800
Subject: [PATCH 1/4] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/README.md                               |   2 +-
 front/index.html                              |   2 +-
 front/src/api/hr.js                           |   9 +-
 .../src/views/components/ProjectBasicInfo.vue | 473 +++++++++++-------
 .../src/views/components/ProjectImplInfo.vue  |   6 +-
 front/src/views/components/Story.vue          |   2 +-
 front/src/views/customer-mgr/customerlist.vue |  38 +-
 front/src/views/hr-mgr/stafflist.vue          | 181 ++++---
 front/src/views/login/index.vue               |   2 +-
 front/src/views/system-mgr/userList.vue       |   9 +-
 10 files changed, 448 insertions(+), 276 deletions(-)
diff --git a/front/README.md b/front/README.md
index d0ff7d7..6baf907 100644
--- a/front/README.md
+++ b/front/README.md
@@ -1,4 +1,4 @@
-<p align="center">
+npm<p align="center">
   <img width="320" src="https://wpimg.wallstcn.com/ecc53a42-d79b-42e2-8852-5126b810a4c8.svg">
 </p>
 
diff --git a/front/index.html b/front/index.html
index 8e15938..425cb6b 100644
--- a/front/index.html
+++ b/front/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <title>Warehouse Management System</title>
+    <title>上海诺力智能科技有限公司</title>
   </head>
   <body>
     <script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>
diff --git a/front/src/api/hr.js b/front/src/api/hr.js
index aec01aa..f9ff670 100644
--- a/front/src/api/hr.js
+++ b/front/src/api/hr.js
@@ -45,6 +45,13 @@ export default {
       data: param
     })
   },
+  getStaffPage(param) {
+    return request({
+      url: `/Hr/GetStaffPage`,
+      method: "post",
+      data: param
+    });
+  },
   GetStaffTypeList() {
     return request({
       url: `/Hr/GetStaffTypeList`,
@@ -73,7 +80,7 @@ export default {
       data: param
     })
   },
-  
+
   GetOperationDeptStaff()
   {
     return request({
diff --git a/front/src/views/components/ProjectBasicInfo.vue b/front/src/views/components/ProjectBasicInfo.vue
index 89cee69..8021d48 100644
--- a/front/src/views/components/ProjectBasicInfo.vue
+++ b/front/src/views/components/ProjectBasicInfo.vue
@@ -5,39 +5,62 @@
       <el-collapse-item name="base-info">
         <template slot="title">
           <span class="custom-title">项目基础信息</span>
-          <el-button style="margin_left:20px" size="mini" class="el-icon-edit" type="text" @click="editProjectInfo"
-            v-if="edit_support == true">编辑</el-button>
+          <el-button
+            v-if="edit_support == true"
+            style="margin_left:20px"
+            size="mini"
+            class="el-icon-edit"
+            type="text"
+            @click="editProjectInfo">编辑</el-button>
         </template>
         <span style="border: 1px solid #dcdcdc; padding: 8px; display: inline-block;width: 100%;">项目介绍：{{
-          project_info.project_intro }}
+        project_info.project_intro }}
         </span>
 
-
         <el-descriptions :column="2" border class="resume-label-width" style="margin-top: 5px;">
-          <el-descriptions-item label="客户名称" :span="1">{{ project_info.company_name }}</el-descriptions-item>
-          <el-descriptions-item label="项目名称" :span="1">{{ project_info.project_name }}</el-descriptions-item>
-          <el-descriptions-item label="项目状态" :span="1">{{ project_info.project_state_desp }}
-            <el-button v-if="project_info.project_state == 1 && edit_support == true" type="text"
-              icon="el-icon-video-play" @click="dialogVisibleStartProject = true" style="margin-left: 20px;"
-              size="mini">启动</el-button>
+          <el-descriptions-item :span="1" label="客户名称">{{ project_info.company_name }}</el-descriptions-item>
+          <el-descriptions-item :span="1" label="项目名称">{{ project_info.project_name }}</el-descriptions-item>
+          <el-descriptions-item :span="1" label="项目状态">{{ project_info.project_state_desp }}
+            <el-button
+              v-if="project_info.project_state == 1 && edit_support == true"
+              type="text"
+              icon="el-icon-video-play"
+              style="margin-left: 20px;"
+              size="mini"
+              @click="dialogVisibleStartProject = true">启动</el-button>
           </el-descriptions-item>
-          <el-descriptions-item label="创建时间" :span="1">{{ project_info.create_time }}</el-descriptions-item>
-          <el-descriptions-item label="销售经理" :span="1">{{ project_info.sale_manager }}
-            <el-button type="text" icon="el-icon-edit" @click="setSaleManager()" style="margin-left: 20px;"
-              size="mini" v-if="edit_support == true && allow_change_manager == true">编辑</el-button>
+          <el-descriptions-item :span="1" label="创建时间">{{ project_info.create_time }}</el-descriptions-item>
+          <el-descriptions-item :span="1" label="销售经理">{{ project_info.sale_name }}
+            <el-button
+              v-if="edit_support == true && allow_change_manager == true"
+              type="text"
+              icon="el-icon-edit"
+              style="margin-left: 20px;"
+              size="mini"
+              @click="setSaleManager()">编辑</el-button>
           </el-descriptions-item>
 
-          <el-descriptions-item label="交付经理" :span="1">{{ project_info.project_manager }}
-            <el-button type="text" icon="el-icon-edit" @click="setProjectManager()" style="margin-left: 20px;"
-              size="mini" v-if="edit_support == true && allow_change_manager == true">编辑</el-button>
+          <el-descriptions-item :span="1" label="交付经理">{{ project_info.project_manager }}
+            <el-button
+              v-if="edit_support == true && allow_change_manager == true"
+              type="text"
+              icon="el-icon-edit"
+              style="margin-left: 20px;"
+              size="mini"
+              @click="setProjectManager()">编辑</el-button>
           </el-descriptions-item>
 
-          <el-descriptions-item label="项目成员" :span="1">{{ project_info.project_members }}
-            <el-button type="text" icon="el-icon-edit" @click="addProjectMember()" style="margin-left: 20px;"
-              size="mini" v-if="edit_support == true">编辑</el-button>
+          <el-descriptions-item :span="1" label="项目成员">{{ project_info.project_members }}
+            <el-button
+              v-if="edit_support == true"
+              type="text"
+              icon="el-icon-edit"
+              style="margin-left: 20px;"
+              size="mini"
+              @click="addProjectMember()">编辑</el-button>
           </el-descriptions-item>
-          <el-descriptions-item label="外部成员" :span="1">
-            <el-button class="el-icon-view" @click="showExternalMember()" type="text" size="mini">查看</el-button>
+          <el-descriptions-item :span="1" label="外部成员">
+            <el-button class="el-icon-view" type="text" size="mini" @click="showExternalMember()">查看</el-button>
           </el-descriptions-item>
           <!--el-descriptions-item label="项目合同" :span="1" v-if="project_info.project_state > 1 && edit_support == true">
             <el-button class="el-icon-view" @click="showContract()" type="text" size="mini">查看</el-button>
@@ -47,29 +70,37 @@
             <el-button class="el-icon-view" @click="showProtocol()" type="text" size="mini">查看</el-button>
           </el-descriptions-item-->
 
-          <el-descriptions-item label="项目计划" :span="1" v-if="project_info.project_state > 1">
-            <el-button class="el-icon-view" @click="showPlan()" type="text" size="mini">查看</el-button>
+          <el-descriptions-item v-if="project_info.project_state > 1" :span="1" label="项目计划">
+            <el-button class="el-icon-view" type="text" size="mini" @click="showPlan()">查看</el-button>
           </el-descriptions-item>
 
-          <el-descriptions-item label="项目资料" :span="1">
-            <el-button class="el-icon-view" @click="showContract()" type="text" size="mini"
-              v-if="project_info.project_state > 1 && edit_support == true">项目合同</el-button>
-            <el-button class="el-icon-view" @click="showEquipment()" type="text" size="mini">设备资料</el-button>
-            <el-button class="el-icon-view" @click="showProtocol()" type="text" size="mini">技术协议</el-button>
-            <el-button class="el-icon-view" @click="showSummary()" type="text" size="mini">会议纪要</el-button>
-            <el-button class="el-icon-view" @click="showBid()" type="text" size="mini"
-              v-if="edit_support == true">投标文件</el-button>
+          <el-descriptions-item :span="1" label="项目资料">
+            <el-button
+              v-if="project_info.project_state > 1 && edit_support == true"
+              class="el-icon-view"
+              type="text"
+              size="mini"
+              @click="showContract()">项目合同</el-button>
+            <el-button class="el-icon-view" type="text" size="mini" @click="showEquipment()">设备资料</el-button>
+            <el-button class="el-icon-view" type="text" size="mini" @click="showProtocol()">技术协议</el-button>
+            <el-button class="el-icon-view" type="text" size="mini" @click="showSummary()">会议纪要</el-button>
+            <el-button
+              v-if="edit_support == true"
+              class="el-icon-view"
+              type="text"
+              size="mini"
+              @click="showBid()">投标文件</el-button>
           </el-descriptions-item>
 
           <!--el-descriptions-item label="会议纪要" :span="1">
             <el-button class="el-icon-view" @click="showSummary()" type="text" size="mini">查看</el-button>
           </el-descriptions-item-->
 
-          <el-descriptions-item label="验收报告" :span="1" v-if="project_info.project_state > 8">
-            <el-button class="el-icon-view" @click="showReport()" type="text" size="mini">查看</el-button>
+          <el-descriptions-item v-if="project_info.project_state > 8" :span="1" label="验收报告">
+            <el-button class="el-icon-view" type="text" size="mini" @click="showReport()">查看</el-button>
           </el-descriptions-item>
-          <el-descriptions-item label="供应商" :span="1">
-            <el-button class="el-icon-view" @click="showSupplier()" type="text" size="mini">查看</el-button>
+          <el-descriptions-item :span="1" label="供应商">
+            <el-button class="el-icon-view" type="text" size="mini" @click="showSupplier()">查看</el-button>
           </el-descriptions-item>
         </el-descriptions>
 
@@ -77,92 +108,162 @@
     </el-collapse>
 
     <!-- 问题单对话框 -->
-    <el-dialog title="项目合同" :visible.sync="dialogVisibleShowContract" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowContract"
+      :close-on-click-modal="false"
+      title="项目合同"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Contract :project_id="project_info.project_id" :contract_category="1" :edid_authority="false"
-          v-if="update_view == false" />
+        <Contract
+          v-if="update_view == false"
+          :project_id="project_info.project_id"
+          :contract_category="1"
+          :edid_authority="false" />
       </div>
     </el-dialog>
 
     <!-- 外部客户对话框 -->
-    <el-dialog title="外部客户" :visible.sync="dialogVisibleShowExternalMember" :close-on-click-modal="false" width="55%"
-      style="position: fixed;" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowExternalMember"
+      :close-on-click-modal="false"
+      title="外部客户"
+      width="55%"
+      style="position: fixed;"
+      append-to-body>
       <div class="custom-dialog">
-        <ExternalMember :project_id="project_info.project_id" :edit_support="edit_support"
-          v-if="update_view == false" />
+        <ExternalMember
+          v-if="update_view == false"
+          :project_id="project_info.project_id"
+          :edit_support="edit_support" />
       </div>
     </el-dialog>
 
-    <el-dialog title="技术协议" :visible.sync="dialogVisibleShowProtocol" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowProtocol"
+      :close-on-click-modal="false"
+      title="技术协议"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Contract :project_id="project_info.project_id" :contract_category="2" :edid_authority="edit_support"
-          v-if="update_view == false" />
+        <Contract
+          v-if="update_view == false"
+          :project_id="project_info.project_id"
+          :contract_category="2"
+          :edid_authority="edit_support" />
       </div>
     </el-dialog>
 
-    <el-dialog title="设备资料" :visible.sync="dialogVisibleShowEquipment" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowEquipment"
+      :close-on-click-modal="false"
+      title="设备资料"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Materials :materials_class="1" :materials_owner="project_info.project_id" :materials_type="[18, 19]"
-          :edid_authority="true" v-if="update_view == false" />
+        <Materials
+          v-if="update_view == false"
+          :materials_class="1"
+          :materials_owner="project_info.project_id"
+          :materials_type="[18, 19]"
+          :edid_authority="true" />
       </div>
     </el-dialog>
 
-    <el-dialog title="会议纪要" :visible.sync="dialogVisibleShowSummary" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowSummary"
+      :close-on-click-modal="false"
+      title="会议纪要"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Materials :materials_class="1" :materials_owner="project_info.project_id" :materials_type="2"
-          :edid_authority="true" v-if="update_view == false" />
+        <Materials
+          v-if="update_view == false"
+          :materials_class="1"
+          :materials_owner="project_info.project_id"
+          :materials_type="2"
+          :edid_authority="true" />
       </div>
     </el-dialog>
 
-    <el-dialog title="项目计划" :visible.sync="dialogVisibleShowPlan" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowPlan"
+      :close-on-click-modal="false"
+      title="项目计划"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
         <ProjectPlan v-if="update_view == false" :project_id="project_info.project_id" />
       </div>
     </el-dialog>
 
-    <el-dialog title="验收报告" :visible.sync="dialogVisibleShowReport" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowReport"
+      :close-on-click-modal="false"
+      title="验收报告"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Materials :materials_class="1" :materials_owner="project_info.project_id" :materials_type="4"
-          :edid_authority="true" v-if="update_view == false" />
+        <Materials
+          v-if="update_view == false"
+          :materials_class="1"
+          :materials_owner="project_info.project_id"
+          :materials_type="4"
+          :edid_authority="true" />
       </div>
     </el-dialog>
 
-    <el-dialog title="供应商信息" :visible.sync="dialogVisibleShowSupplier" :close-on-click-modal="false" width="60%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowSupplier"
+      :close-on-click-modal="false"
+      title="供应商信息"
+      width="60%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
         <SupplierInfo :project_id="project_info.project_id" :edid_authority="edit_support" />
       </div>
     </el-dialog>
 
-    <el-dialog title="投标文件" :visible.sync="dialogVisibleShowBid" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowBid"
+      :close-on-click-modal="false"
+      title="投标文件"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <BidInfo :project_id="project_info.project_id" :contract_category="5" :edid_authority="edit_support"
-          v-if="update_view == false" />
+        <BidInfo
+          v-if="update_view == false"
+          :project_id="project_info.project_id"
+          :contract_category="5"
+          :edid_authority="edit_support" />
       </div>
     </el-dialog>
 
     <!-- 对话框 -->
-    <el-dialog title="文件信息" :visible.sync="dialogVisibleShowFile" width="80%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleShowFile" title="文件信息" width="80%" append-to-body>
       <img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
-      <iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"></iframe>
+      <iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"/>
       <p v-else>不支持的文件类型</p>
     </el-dialog>
 
     <!-- 设置项目经理对话框 -->
-    <el-dialog title="设置交付负责人" :visible.sync="dialogVisibleSetManager" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleSetManager" title="设置交付负责人" width="30%" append-to-body>
       <el-form :model="editProject" label-width="100px">
         <el-form-item label="项目成员">
           <el-select v-model="editProject.project_manager" placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in dept_member_list" :key="item.staff_id" :label="item.staff_name"
-              :value="item.staff_id">
-            </el-option>
+            <el-option
+              v-for="item in dept_member_list"
+              :key="item.staff_id"
+              :label="item.staff_name"
+              :value="item.staff_id"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -173,13 +274,15 @@
     </el-dialog>
 
     <!-- 设置项目经理对话框 -->
-    <el-dialog title="设置销售负责人" :visible.sync="dialogVisibleSetSaleManager" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleSetSaleManager" title="设置销售负责人" width="30%" append-to-body>
       <el-form :model="editProject" label-width="100px">
         <el-form-item label="项目成员">
           <el-select v-model="editProject.sale_manager" placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in dept_member_list" :key="item.staff_id" :label="item.staff_name"
-              :value="item.staff_id">
-            </el-option>
+            <el-option
+              v-for="item in dept_member_list"
+              :key="item.staff_id"
+              :label="item.staff_name"
+              :value="item.staff_id"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -190,13 +293,15 @@
     </el-dialog>
 
     <!-- 添加项目成员对话框 -->
-    <el-dialog title="添加项目组成员" :visible.sync="dialogVisibleAddMember" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleAddMember" title="添加项目组成员" width="30%" append-to-body>
       <el-form :model="editProject" label-width="100px">
         <el-form-item label="项目成员">
           <el-select v-model="editProject.project_members" multiple placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in dept_member_list" :key="item.staff_id" :label="item.staff_name"
-              :value="item.staff_id">
-            </el-option>
+            <el-option
+              v-for="item in dept_member_list"
+              :key="item.staff_id"
+              :label="item.staff_name"
+              :value="item.staff_id"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -207,27 +312,29 @@
     </el-dialog>
 
     <!-- 编辑项目对话框 -->
-    <el-dialog title="编辑项目" :visible.sync="dialogVisibleEditProject" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleEditProject" title="编辑项目" width="30%" append-to-body>
       <el-form :model="editProject" label-width="100px">
         <el-form-item label="项目名称">
-          <el-input v-model="editProject.project_name"></el-input>
+          <el-input v-model="editProject.project_name"/>
         </el-form-item>
         <el-form-item label="项目编号">
-          <el-input v-model="editProject.project_number"></el-input>
+          <el-input v-model="editProject.project_number"/>
         </el-form-item>
         <el-form-item label="项目描述">
-          <el-input v-model="editProject.project_intro"></el-input>
+          <el-input v-model="editProject.project_intro"/>
         </el-form-item>
         <el-form-item label="项目状态">
           <el-select v-model="editProject.project_state" placeholder="请选择" style="width: 80%;">
-            <el-option v-for="item in project_state_list" :key="item.id" :label="item.desp" :value="item.id">
-            </el-option>
+            <el-option v-for="item in project_state_list" :key="item.id" :label="item.desp" :value="item.id"/>
           </el-select>
         </el-form-item>
         <el-form-item label="创建时间">
-          <el-date-picker v-model="editProject.create_time" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+          <el-date-picker
+            v-model="editProject.create_time"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"/>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -237,20 +344,27 @@
     </el-dialog>
 
     <!-- 启动项目对话框 -->
-    <el-dialog title="启动项目" :visible.sync="dialogVisibleStartProject" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleStartProject" title="启动项目" width="30%" append-to-body>
       <el-form :model="editNode" label-width="100px">
         <el-form-item label="参与员工">
-          <el-select v-model="editNode.members" multiple placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in dept_member_list" :key="item.staff_id" :label="item.staff_name"
-              :value="item.staff_id">
-            </el-option>
+          <el-select v-model="editNode.members" filterable multiple placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in dept_member_list"
+              :key="item.staff_id"
+              :label="item.staff_name"
+              :value="item.staff_id"
+              filterable
+            />
           </el-select>
         </el-form-item>
 
         <el-form-item label="启动时间">
-          <el-date-picker v-model="editNode.start_date" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+          <el-date-picker
+            v-model="editNode.start_date"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"/>
         </el-form-item>
 
       </el-form>
@@ -268,16 +382,15 @@ import project from '@/api/project'
 import contract from '@/api/contract'
 import hr from '@/api/hr'
 import user from '@/api/user'
-import Contract from './Contract.vue';
-import ExternalMember from './ExternalMember.vue';
+import Contract from './Contract.vue'
+import ExternalMember from './ExternalMember.vue'
 import Materials from '@/views/components/Materials.vue'
-import SupplierInfo from './SupplierInfo.vue';
-import ProjectPlan from './ProjectPlan.vue';
-import BidInfo from '@/views/components/BidInfo.vue';
+import SupplierInfo from './SupplierInfo.vue'
+import ProjectPlan from './ProjectPlan.vue'
+import BidInfo from '@/views/components/BidInfo.vue'
 
 export default {
   name: 'ProjectBasicInfo',
-  props: ['project_id', 'edit_support'],
   components: {
     Contract,
     ExternalMember,
@@ -286,6 +399,7 @@ export default {
     BidInfo,
     ProjectPlan
   },
+  props: ['project_id', 'edit_support'],
   data() {
     return {
       update_view: false,
@@ -343,141 +457,135 @@ export default {
     addProjectMember() {
       this.dialogVisibleAddMember = true
 
-      this.editProject.project_members = [];
+      this.editProject.project_members = []
       if (this.project_info['involve_members'] != '') {
-        this.editProject.project_members = this.project_info['involve_members'].split(',').map(staff_id => parseInt(staff_id, 10));
-
+        this.editProject.project_members = this.project_info['involve_members'].split(',').map(staff_id => parseInt(staff_id, 10))
       }
     },
 
-    //获取项目部所有员工信息
+    // 获取项目部所有员工信息
     get_project_dept_member_list() {
       user.GetProjectDeptStaffList().then(response => {
         this.dept_member_list = response.data.data
-        console.log(this.dept_member_list);
+        console.log(this.dept_member_list)
       })
     },
 
     setProjectManager() {
-      this.dialogVisibleSetManager = true;
+      this.dialogVisibleSetManager = true
     },
 
     setSaleManager() {
-      this.dialogVisibleSetSaleManager = true;
+      this.dialogVisibleSetSaleManager = true
     },
 
     update_sub_component() {
-      this.update_view = true;
-      let that = this;
+      this.update_view = true
+      const that = this
       setTimeout(() => {
-        that.update_view = false;
-      }, 100); // 1000 毫秒后执行
+        that.update_view = false
+      }, 100) // 1000 毫秒后执行
     },
 
     confirmSetManager() {
-
-      var param = { project_id: this.project_id, involve_manager: this.editProject.project_manager };
+      var param = { project_id: this.project_id, involve_manager: this.editProject.project_manager }
       console.log('---------------------------')
       console.log(param)
       project.UpdateProjectManager(param).then(response => {
         this.get_project_info(this.project_id)
-        this.$message({ type: 'success', message: '更新成功' });
-        this.dialogVisibleSetManager = false;
+        this.$message({ type: 'success', message: '更新成功' })
+        this.dialogVisibleSetManager = false
       })
     },
 
     confirmSaleManager() {
-
-      var param = { project_id: this.project_id, sale_manager: this.editProject.sale_manager };
+      var param = { project_id: this.project_id, sale_manager: this.editProject.sale_manager }
       console.log('---------------------------')
       console.log(param)
       project.UpdateProjectSaleManager(param).then(response => {
         this.get_project_info(this.project_id)
-        this.$message({ type: 'success', message: '更新成功' });
-        this.dialogVisibleSetSaleManager = false;
+        this.$message({ type: 'success', message: '更新成功' })
+        this.dialogVisibleSetSaleManager = false
       })
     },
 
     confirmAddMember() {
-      var param = { project_id: this.project_id, involve_members: this.editProject.project_members };
+      var param = { project_id: this.project_id, involve_members: this.editProject.project_members }
       project.UpdateProjectMember(param).then(response => {
         this.get_project_info(this.project_id)
         this.dialogVisibleAddMember = false
-        this.$message({ type: 'success', message: '更新成功' });
+        this.$message({ type: 'success', message: '更新成功' })
       })
-
     },
 
     confirmStartProject() {
-
       if (this.editNode.members.length == 0) {
-        this.$message.warning('请选择项目组成员');
-        return;
+        this.$message.warning('请选择项目组成员')
+        return
       }
 
-      if ('' == this.editNode.start_date) {
-        this.$message.warning('请选择项目启动时间');
-        return;
+      if (this.editNode.start_date == '') {
+        this.$message.warning('请选择项目启动时间')
+        return
       }
 
       var project_id = this.project_id
       var param = {
         project_id: project_id,
-        //manager: this.editNode.manager,
+        // manager: this.editNode.manager,
         members: this.editNode.members,
-        start_date: this.editNode.start_date,
-        //tech_protocol: this.editNode.tech_protocol_url,
+        start_date: this.editNode.start_date
+        // tech_protocol: this.editNode.tech_protocol_url,
 
-      };
+      }
 
-      console.log(param);
+      console.log(param)
       project.StartProject(param).then(response => {
         this.$message({
           type: 'success',
           message: '添加成功'
-        });
+        })
         this.get_project_info(this.project_id)
       }).catch(error => {
         this.$message({
           type: 'error',
           message: '添加失败，请重试'
-        });
-      });
-      this.dialogVisibleStartProject = false;
+        })
+      })
+      this.dialogVisibleStartProject = false
     },
 
     get_project_state_list() {
       project.GetProjectStateList().then(response => {
         this.project_state_list = response.data.data
-        console.log(this.project_state_list);
+        console.log(this.project_state_list)
       })
     },
 
     editProjectInfo() {
-      this.dialogVisibleEditProject = true;
-      this.get_project_info(this.project_id);
+      this.dialogVisibleEditProject = true
+      this.get_project_info(this.project_id)
     },
 
     get_project_info(project_id) {
       this.project_id = project_id
-      var param = { project_id: project_id };
+      var param = { project_id: project_id }
       project.GetProjectInfo(param).then(response => {
         this.project_info = response.data.data
 
-        //从项目管理进入
+        // 从项目管理进入
         if (this.edit_support == false) {
-          //如果登录用户是项目经理，则有编辑项目基本信息的权限
-          var login_user = localStorage.getItem('user_id');
+          // 如果登录用户是项目经理，则有编辑项目基本信息的权限
+          var login_user = localStorage.getItem('user_id')
           if (login_user == this.project_info.involve_manager) {
             this.edit_support = true
-            //不允许编辑项目经理
-            this.allow_change_manager = false;
+            // 不允许编辑项目经理
+            this.allow_change_manager = false
           }
-        }
-        else//从客户管理进入
+        } else// 从客户管理进入
         {
-          //允许编辑项目经理
-          this.allow_change_manager = true;
+          // 允许编辑项目经理
+          this.allow_change_manager = true
         }
 
         this.editProject = response.data.data
@@ -488,47 +596,47 @@ export default {
 
     showProtocol() {
       this.dialogVisibleShowProtocol = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showEquipment() {
       this.dialogVisibleShowEquipment = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showReport() {
       this.dialogVisibleShowReport = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showSupplier() {
       this.dialogVisibleShowSupplier = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showBid() {
       this.dialogVisibleShowBid = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showSummary() {
       this.dialogVisibleShowSummary = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showPlan() {
       this.dialogVisibleShowPlan = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showContract() {
       this.dialogVisibleShowContract = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showExternalMember() {
       this.dialogVisibleShowExternalMember = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     // showProtocol() {
@@ -539,25 +647,24 @@ export default {
       var param = { project_id: this.project_id, contract_type: 2 }
       contract.GetProjectContractList(param).then(response => {
         this.contract_info_list = response.data.data
-        console.log(this.contract_info_list);
+        console.log(this.contract_info_list)
       })
     },
 
     update_sub_component() {
-      this.update_view = true;
-      let that = this;
+      this.update_view = true
+      const that = this
       setTimeout(() => {
-        that.update_view = false;
-      }, 100); // 1000 毫秒后执行
+        that.update_view = false
+      }, 100) // 1000 毫秒后执行
     },
 
-
     showImg(row) {
       const url = process.env.BASE_WMS_FILE + row.contract_url
-      const ext = url.split('.').pop().toLowerCase();
+      const ext = url.split('.').pop().toLowerCase()
 
-      console.log('-----------------------------------------');
-      console.log(url);
+      console.log('-----------------------------------------')
+      console.log(url)
 
       if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
         this.previewUrl = url
@@ -570,16 +677,16 @@ export default {
       } else if (ext === '') {
 
       } else {
-        this.$message.success('不支持的文件类型');
+        this.$message.success('不支持的文件类型')
       }
       this.dialogVisibleShowFile = true
     },
     confirmEditProject() {
       if (this.editProject.project_name.trim() === '') {
-        this.$message.warning('请输入项目名称');
-        return;
+        this.$message.warning('请输入项目名称')
+        return
       }
-      var project_id = this.project_id;
+      var project_id = this.project_id
       var param = {
         project_id: project_id,
         project_name: this.editProject.project_name,
@@ -587,18 +694,18 @@ export default {
         project_number: this.editProject.project_number,
         project_state: this.editProject.project_state,
         create_time: this.editProject.create_time
-      };
+      }
 
-      console.log(param);
+      console.log(param)
 
       project.EditProjectInfo(param).then(response => {
         this.$message({
           type: 'success',
           message: '添加成功'
-        });
-        this.get_project_info(this.project_id);
-      });
-      this.dialogVisibleEditProject = false;
+        })
+        this.get_project_info(this.project_id)
+      })
+      this.dialogVisibleEditProject = false
     }
   }
 }
diff --git a/front/src/views/components/ProjectImplInfo.vue b/front/src/views/components/ProjectImplInfo.vue
index 81ad85f..0296750 100644
--- a/front/src/views/components/ProjectImplInfo.vue
+++ b/front/src/views/components/ProjectImplInfo.vue
@@ -38,7 +38,7 @@
     <el-dialog title="功能需求清单" :visible.sync="dialogVisibleShowDemand" :close-on-click-modal="false" width="95%"
       style="position: fixed;top:-10%" append-to-body>
       <div class="custom-dialog">
-        <Story :project_id="project_info.project_id" :story_type="1" v-if="update_view == false"/>
+        <Story :project_id="project_info.project_id" :is_project_manager=true :story_type="1" v-if="update_view == false"/>
       </div>
     </el-dialog>
 
@@ -118,7 +118,7 @@ export default {
         this.project_info = response.data.data
       })
     },
-    
+
     update_sub_component() {
       this.update_view = true;
       let that = this;
@@ -156,7 +156,7 @@ export default {
     //查看问题单
     showDemand() {
       this.dialogVisibleShowDemand = true
-      this.update_sub_component() 
+      this.update_sub_component()
     },
     //查看项目实施购买清单
     showPorShopping() {
diff --git a/front/src/views/components/Story.vue b/front/src/views/components/Story.vue
index d84dd60..baff609 100644
--- a/front/src/views/components/Story.vue
+++ b/front/src/views/components/Story.vue
@@ -50,7 +50,7 @@
                 <el-button class="el-icon-view" @click="showMaterials(scope.row)" size="mini" type="text">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="story_managers" label="Story管理者" align="left">
+            <el-table-column prop="story_manager" label="Story管理者" align="left">
             </el-table-column>
             <el-table-column prop="story_members" label="Story成员" align="left">
             </el-table-column>
diff --git a/front/src/views/customer-mgr/customerlist.vue b/front/src/views/customer-mgr/customerlist.vue
index f617202..af35cc9 100644
--- a/front/src/views/customer-mgr/customerlist.vue
+++ b/front/src/views/customer-mgr/customerlist.vue
@@ -62,7 +62,9 @@ export default {
 	data() {
 		let id = 1;
 		return {
-			supplier_type_list: [],
+      newPartner: {},
+      dialogVisibleAddPartner: false,
+      supplier_type_list: [],
       update_view:false,
 			defaultProps: {
 				children: 'sub_type',
@@ -88,6 +90,31 @@ export default {
 
 	},
 	methods: {
+    confirmAddPartner() {
+      // this.newPartner.company_type = this.partner_type
+      //如果是供应商,需要设置供应商的服务类型
+      if (this.partner_type == 4) {
+        this.newPartner.service_type = this.service_type
+      }
+      else {
+        this.newPartner.service_type = 0;
+      }
+
+      partner.AddPartnerCompanyInfo(this.newPartner).then(response => {
+        this.$message({
+          type: 'success',
+          message: '添加成功'
+        });
+        //this.get_supplier_type_list(supplier_type)
+      }).catch(error => {
+        this.$message({
+          type: 'error',
+          message: '添加失败，请重试'
+        });
+      });
+      // 关闭所有对话框
+      this.dialogVisibleAddPartner = false;
+    },
 
 		openTreeMenu(event, data, node, target) {
 			console.log(event, data, node, target)
@@ -129,7 +156,14 @@ export default {
           that.update_view = false;
       }, 100); // 1000 毫秒后执行
     },
-
+    addPartnerInfo() {
+      this.dialogVisibleAddPartner = true;
+      this.newPartner = {
+        company_name: '',
+        company_intro: '',
+        create_time: ''
+      }
+    },
 		handle_node_click(data, node) {
 			this.currentNode = node;
 			this.currentData = data;
diff --git a/front/src/views/hr-mgr/stafflist.vue b/front/src/views/hr-mgr/stafflist.vue
index bfb7e0a..69f7567 100644
--- a/front/src/views/hr-mgr/stafflist.vue
+++ b/front/src/views/hr-mgr/stafflist.vue
@@ -1,97 +1,118 @@
 <template>
-	<div class="about">
-		<el-row>
-			<el-table :data="staff_info_list" border fit highlight-current-row style="width: 100%; margin-left: 2px;"
-				height="80vh">
-				<el-table-column prop="staff_idcard" label="员工工号" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_name" label="员工姓名" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_phone" label="员工电话" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_type_desp" label="员工类型" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_dept_desp" label="员工部门" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_email" label="员工邮箱" align="left">
-				</el-table-column>
-				<el-table-column prop="entry_date" label="入职时间" align="left">
-				</el-table-column>
+  <div class="about">
+    <el-card>
+      <el-main id="el-main">
+        <el-table
+          :data="staff_info_list"
+          border
+          fit
+          highlight-current-row
+          style="width: 100%; margin-left: 2px;"
+          height="80vh">
+          <el-table-column prop="staff_idcard" label="员工工号" align="left"/>
+          <el-table-column prop="staff_name" label="员工姓名" align="left"/>
+          <el-table-column prop="staff_phone" label="员工电话" align="left"/>
+          <el-table-column prop="staff_type_desp" label="员工类型" align="left"/>
+          <el-table-column prop="staff_dept_desp" label="员工部门" align="left"/>
+          <el-table-column prop="staff_email" label="员工邮箱" align="left"/>
+          <el-table-column prop="entry_date" label="入职时间" align="left"/>
 
-				<el-table-column fixed="right" label="操作" width="250px">
-					<template slot-scope="scope">
-						<el-button v-if="(scope.row.task_state < 2) && (scope.row.action_state < 4)"
-							@click="handleClick(scope.row)" size="mini" type="danger">删除</el-button>
-						<!--el-button class="el-icon-view" v-if="scope.row.asset_url != ''" @click="showImg(scope.row)" size="mini"
-							type="primary"></el-button-->
-						<!--el-button @click="update(scope.row)" size="mini" class="el-icon-edit" type="primary"></el-button-->
-					</template>
-				</el-table-column>
-			</el-table>
-		</el-row>
+          <el-table-column fixed="right" label="操作" width="250px">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="danger"
+                @click="handleClick(scope.row)">删除</el-button>
+              <el-button
+                class="el-icon-view"
+                size="mini"
+                type="primary"
+                @click="showImg(scope.row)"/>
+              <el-button size="mini" class="el-icon-edit" type="primary" @click="update(scope.row)"/>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-main>
+      <el-pagination
+        :page-sizes="[5, 10, 20, 50]"
+        :page-size="pageSize"
+        :total="total"
+        :current-page.sync="currPage"
+        background
+        layout="sizes,prev, pager, next,  jumper,->,total"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"/>
+    </el-card>
 
-		<!-- 对话框 -->
-		<el-dialog title="文件信息" :visible.sync="dialogVisibleStaffInfo" width="80%">
-			<img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
-			<iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"></iframe>
-			<p v-else>不支持的文件类型</p>
-		</el-dialog>
+    <!-- 对话框 -->
+    <el-dialog :visible.sync="dialogVisibleStaffInfo" title="文件信息" width="80%">
+      <img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
+      <iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"/>
+      <p v-else>不支持的文件类型</p>
+    </el-dialog>
 
-	</div>
+  </div>
 </template>
 
 <script>
 import hr from '@/api/hr'
 
 export default {
-	data() {
-		let id = 1;
-		return {
-			staff_info_list: [],
-			id: id,
-			dialogVisibleStaffInfo: false,
-			assets_img: '',
-			assets_pdf_img: ''
-		};
-	},
-	mounted() {
-		this.get_staff_info_list()
-	},
-	created() {
+  data() {
+    const id = 1
+    return {
+      pageSize: 20,
+      currPage: 1,
+      total: 0,
+      staff_info_list: [],
+      id: id,
+      dialogVisibleStaffInfo: false,
+      assets_img: '',
+      assets_pdf_img: ''
+    }
+  },
+  mounted() {
+    this.getStaffPageInfo()
+  },
+  created() {
 
-	},
-	methods: {
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.getStaffPageInfo()
+    },
+    handleCurrentChange(val) {
+      this.currPage = val
+      this.getStaffPageInfo()
+    },
+    showImg(row) {
+      const url = row.asset_url
+      const ext = url.split('.').pop().toLowerCase()
 
-		showImg(row) {
-			const url = row.asset_url
-			const ext = url.split('.').pop().toLowerCase();
+      if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
+        this.previewUrl = url
+        this.isImage = true
+        this.isPDF = false
+      } else if (ext === 'pdf') {
+        this.previewUrl = url
+        this.isImage = false
+        this.isPDF = true
+      } else if (ext === '') {
 
-			if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
-				this.previewUrl = url
-				this.isImage = true
-				this.isPDF = false
-			} else if (ext === 'pdf') {
-				this.previewUrl = url
-				this.isImage = false
-				this.isPDF = true
-			} else if (ext === '') {
+      } else {
+        this.$message.success('不支持的文件类型')
+      }
+      this.dialogVisibleStaffInfo = true
+    },
 
-			} else {
-				this.$message.success('不支持的文件类型');
-			}
-			this.dialogVisibleStaffInfo = true
-		},
-
-		get_staff_info_list() {
-			var param = {}
-
-			console.log(param);
-			hr.GetStaffInfoList(param).then(response => {
-				this.staff_info_list = response.data.data
-				console.log(this.staff_info_list);
-			})
-		},
-	}
+    getStaffPageInfo() {
+      hr.getStaffPage({ currPage: this.currPage, pageSize: this.pageSize }).then(res => {
+        this.staff_info_list = res.data.data.list
+        this.total = res.data.data.total
+      })
+    }
+  }
 }
 </script>
 
diff --git a/front/src/views/login/index.vue b/front/src/views/login/index.vue
index 4397dc2..d05a862 100644
--- a/front/src/views/login/index.vue
+++ b/front/src/views/login/index.vue
@@ -4,7 +4,7 @@
       <img :src="imgTitle" height="100px" alt="" />
     </div>
     <div class="background" style="margin-bottom:110px;margin-top:110px;background-color:#2d3a4b;">
-      <img :src="imgBack" width="70%" height="80%" alt="" />
+      <img :src="imgBack" width="100%" height="100%" alt="" />
     </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
       label-position="left" style="float:right">
diff --git a/front/src/views/system-mgr/userList.vue b/front/src/views/system-mgr/userList.vue
index 508bcf7..a79d3c4 100644
--- a/front/src/views/system-mgr/userList.vue
+++ b/front/src/views/system-mgr/userList.vue
@@ -49,8 +49,11 @@
         </el-form-item>
 
         <el-form-item label="选择添加用户" prop="user_id">
-          <el-select v-model="userData.user_id" placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in contactsList" :key="item.contacts_id" :label="item.contacts_name"
+          <el-select v-model="userData.user_id" filterable placeholder="请选择" style="width: 100%;">
+            <el-option v-for="item in contactsList"
+                       filterable
+                       :key="item.contacts_id"
+                       :label="item.contacts_name"
               :value="item.contacts_id">
             </el-option>
           </el-select>
@@ -230,7 +233,7 @@ export default {
     },
     //获取用户信息
     getUserInfoList() {
-      user.getUserInfoList({ currPage: this.currPage, pageSize: this.pageSize, }).then(res => {
+      user.getUserInfoList({ currPage: this.currPage, pageSize: this.pageSize}).then(res => {
         this.userList = res.data.data.list;
         console.log('userList', this.userList);
         this.total = res.data.data.total;

From b7a7e27a53494e51efe64c0c9d1564c93b937f1d Mon Sep 17 00:00:00 2001
From: ldjun <ldj_willow@163.com>
Date: Wed, 18 Mar 2026 14:02:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/application/api/controller/Hr.php        |  50 ++++++++++++++++++
 back/application/api/controller/Project.php   |  39 ++++++++++----
 back/application/api/controller/Story.php     |  44 ++++++++-------
 back/application/api/controller/User.php      |   4 +-
 .../api/controller_74GYL3/Project.php         |   9 ++++
 .../api/controller_74GYL3/User.php            |   4 +-
 back/application/database.php                 |   4 +-
 back/composer.json                            |   7 ++-
 .../5e6ffed6bf3bb71a10b08d4a561c582d.png      | Bin 11002 -> 0 bytes
 9 files changed, 125 insertions(+), 36 deletions(-)
 delete mode 100644 back/public/uploads/20260310/5e6ffed6bf3bb71a10b08d4a561c582d.png

diff --git a/back/application/api/controller/Hr.php b/back/application/api/controller/Hr.php
index 673aa22..2ba1c20 100644
--- a/back/application/api/controller/Hr.php
+++ b/back/application/api/controller/Hr.php
@@ -87,6 +87,56 @@ class Hr extends Common
 
         return $this->sendSuccess($StaffList);
     }
+    public function GetStaffPage()
+    {
+
+        $param = request()->post();
+
+        $currPage = isset($param['currPage']) ? $param['currPage'] : 1;
+        $pageSize = isset($param['pageSize']) ? $param['pageSize'] : 20;
+
+        $result = db('hr_staff')->alias('i')
+            ->join('hr_staff_type t', 'i.staff_type=t.id', 'left')
+            ->where('i.del_time',null)
+            ->field('i.*, t.desp as staff_type_desp')
+            ->page($currPage, $pageSize)
+            ->select();
+
+
+        $total = db('hr_staff')->alias('i')
+            ->join('hr_staff_type t', 'i.staff_type=t.id', 'left')
+            ->where('i.del_time',null)
+            ->field('i.*, t.desp as staff_type_desp')
+            ->count();
+        //查找员工所属部门信息
+        for ($i=0; $i<count($result); $i++)
+        {
+            $dept_arr  = explode(",", $result[$i]['staff_dept']);
+            $dept_desp = db('hr_dept')->where('dept_id', 'in', $dept_arr)->column('dept_name');
+            $result[$i]['staff_dept_desp'] = implode(',', $dept_desp);
+        }
+
+
+        $StaffList = [];
+        if (isset($param['type']))
+        {
+            for ($i=0; $i<count($result); $i++)
+            {
+                $dept_arr = explode(",", $result[$i]['staff_dept']);
+                if (in_array($param['type'], $dept_arr))
+                {
+                    $StaffList[] = $result[$i];
+                }
+            }
+        }
+        else
+        {
+            $StaffList = $result;
+        }
+        $res['list'] = $StaffList;
+        $res['total'] = $total;
+        return $this->sendSuccess($res);
+    }
     
     //获取项目部门所有的员工信息
     public function GetProjectDeptStaffList()
diff --git a/back/application/api/controller/Project.php b/back/application/api/controller/Project.php
index 35968f8..58d4d76 100644
--- a/back/application/api/controller/Project.php
+++ b/back/application/api/controller/Project.php
@@ -197,7 +197,18 @@ class Project extends Common
         {
             $ProjectInfo['project_manager'] = $ret['staff_name'];
         }
-
+        $ProjectInfo['sale_name'] = '';
+        if (!empty($ProjectInfo['sale_manager'])){
+            $retSale = db('system_user')->alias('u')
+                ->join('hr_staff s','s.staff_id=u.user_id', 'left')
+                ->where('u.user_type', 1)
+                ->where('u.id', $ProjectInfo['sale_manager'])
+                ->find();
+            if (null != $retSale)
+            {
+                $ProjectInfo['sale_name'] = $retSale['staff_name'];
+            }
+        }
         return $this->sendSuccess($ProjectInfo);
     }
     
@@ -260,32 +271,40 @@ class Project extends Common
         
         $project_id    = $param['project_id'];
         $remove_member = $param['staff_id'].'';
-        
-        
+
+
         $ret = db('project_info')->where('project_id', $project_id)->find();
         $member_arr = explode(',', $ret['involve_members']);
-        
+
         // 使用array_filter()函数删除指定值
         $resultArray = array_filter($member_arr, function ($value) use ($remove_member) {
             return $value !== $remove_member;
         });
-        
 
-        $update['involve_members']     = implode(',', $resultArray); 
+
+        $update['involve_members']     = implode(',', $resultArray);
         $ret = db('project_info')->where('project_id',$project_id)->update($update);
-        
+
         return $this->sendSuccess('移除成功');
     }
-    
-    
+
+
     public function UpdateProjectMember()
     {
         $param = request()->post();
-        
+
         $update['involve_members']     = implode(',', $param['involve_members']); //数组转字符串
         $ret = db('project_info')->where('project_id',$param['project_id'])->update($update);
         return $this->sendSuccess('更新成功');
     }
+    public function UpdateSaleManager()
+    {
+        $param = request()->post();
+
+        $update['sale_manager']     = $param['sale_manager']; //数组转字符串
+        $ret = db('project_info')->where('project_id',$param['project_id'])->update($update);
+        return $this->sendSuccess('更新成功');
+    }
     
     
 
diff --git a/back/application/api/controller/Story.php b/back/application/api/controller/Story.php
index 10a6fb5..4a058be 100644
--- a/back/application/api/controller/Story.php
+++ b/back/application/api/controller/Story.php
@@ -49,23 +49,31 @@ class Story extends Common
             $members = explode(',', $opStory['story_member']);
             $opStory['story_members'] = '';
 
-            $ret = [];
-            for ($i=0; $i<count($members); $i++)
-            {
-                $user_info = $user->GetUserInfoByLoginId($members[$i]);
-                if ($user_info && isset($user_info['name'])) {
-                    $ret[] = $user_info['name'];
-                }
-            }
-            $opStory['story_members'] = implode(',', $ret);
 
-            $opStory['story_managers'] = '';
-            if ($opStory['story_manager'] !== null) {
-                $user_info =  $user->GetUserInfoByLoginId($opStory['story_manager']);
-                if ($user_info && isset($user_info['name'])) {
-                    $opStory['story_managers'] = $user_info['name'];
-                }
+            $opStory['story_members'] = '';
+            if (count($members)>0)
+            {
+                $ret = db('system_user')->alias('u')
+                    ->join('hr_staff s','s.staff_id=u.user_id', 'left')
+                    ->where('u.user_type', 1)
+                    ->where('u.id', 'in', $members)
+                    ->column('s.staff_name');
+
+                $opStory['story_members'] = implode(',', $ret); //数组转字符串
             }
+            $opStory['story_managername'] = '';
+
+            $ret = db('system_user')->alias('u')
+                ->join('hr_staff s','s.staff_id=u.user_id', 'left')
+                ->where('u.user_type', 1)
+                ->where('u.id', $opStory['story_manager'])
+                ->find();
+
+            if (null != $ret)
+            {
+                $opStory['story_managername'] = $ret['staff_name'];
+            }
+
 
             $result[] = $opStory;
         }
@@ -185,12 +193,12 @@ class Story extends Common
                 ->where('story_id', $param['story_id'])
                 ->find();
             if ($story_info) {
-                
+
                 $user = new User();
-                
+
                 $story_info_member = explode(',', $story_info['story_member']);
                 foreach ($story_info_member as $memberId) {
-                    
+
                     $user_info          = $user->GetUserInfoByLoginId($memberId);
                     $item['id']         = $user_info['id'];
                     $item['staff_name'] = $user_info['name'];
diff --git a/back/application/api/controller/User.php b/back/application/api/controller/User.php
index f8fdddc..426b47a 100644
--- a/back/application/api/controller/User.php
+++ b/back/application/api/controller/User.php
@@ -42,7 +42,7 @@ class User extends Common
                                  ->find();
             if ($ret != null)
             {
-                $ret['company'] = "苏州维达奇智能科技有限公司";
+                $ret['company'] = "上海诺力智能科技有限公司";
             }
         }
         //客户
@@ -318,7 +318,7 @@ class User extends Common
                                      ->find();
                 if ($ret != null)
                 {
-                    $ret['company'] = "苏州维达奇智能科技有限公司";
+                    $ret['company'] = "上海诺力智能科技有限公司";
                 }
                 $ret['id'] = $login_id;
                 $ret['name'] = $res['user_name'];
diff --git a/back/application/api/controller_74GYL3/Project.php b/back/application/api/controller_74GYL3/Project.php
index 39ea325..3f25d30 100644
--- a/back/application/api/controller_74GYL3/Project.php
+++ b/back/application/api/controller_74GYL3/Project.php
@@ -297,6 +297,15 @@ class Project extends Common
         $ret = db('project_info')->where('project_id',$param['project_id'])->update($update);
         return $this->sendSuccess('更新成功');
     }
+
+    public function UpdateSaleManager()
+    {
+        $param = request()->post();
+
+        $update['sale_manager']     = $param['sale_manager']; //数组转字符串
+        $ret = db('project_info')->where('project_id',$param['project_id'])->update($update);
+        return $this->sendSuccess('更新成功');
+    }
     
     //添加项目外部成员
     public function AddProjectExternalMember()
diff --git a/back/application/api/controller_74GYL3/User.php b/back/application/api/controller_74GYL3/User.php
index 8d889c5..96f2b5d 100644
--- a/back/application/api/controller_74GYL3/User.php
+++ b/back/application/api/controller_74GYL3/User.php
@@ -42,7 +42,7 @@ class User extends Common
                                  ->find();
             if ($ret != null)
             {
-                $ret['company'] = "苏州维达奇智能科技有限公司";
+                $ret['company'] = "上海诺力智能科技有限公司";
             }
         }
         //客户
@@ -318,7 +318,7 @@ class User extends Common
                                      ->find();
                 if ($ret != null)
                 {
-                    $ret['company'] = "苏州维达奇智能科技有限公司";
+                    $ret['company'] = "上海诺力智能科技有限公司";
                 }
                 $ret['id'] = $login_id;
             }
diff --git a/back/application/database.php b/back/application/database.php
index ea49943..8163f85 100644
--- a/back/application/database.php
+++ b/back/application/database.php
@@ -13,13 +13,13 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '127.0.0.1',
+    'hostname'        => '192.168.81.251',
     // 数据库名
     'database'        => 'oms',
     // 用户名
     'username'        => 'root',
     // 密码
-    'password'        => '12356',
+    'password'        => 'P@ssw0rd.',
     // 端口
     'hostport'        => '',
     // 连接dsn
diff --git a/back/composer.json b/back/composer.json
index 8a2fc60..61feb50 100644
--- a/back/composer.json
+++ b/back/composer.json
@@ -26,7 +26,7 @@
         "topthink/think-oracle": "1.*",
         "phpoffice/phpexcel": "^1.8",
         "aliyuncs/oss-sdk-php": "^2.3",
-        "topthink/think-worker": "^3.0"
+        "topthink/think-worker": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -37,6 +37,9 @@
         "think-path": "thinkphp"
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "allow-plugins": {
+            "topthink/think-installer": true
+        }
     }
 }
diff --git a/back/public/uploads/20260310/5e6ffed6bf3bb71a10b08d4a561c582d.png b/back/public/uploads/20260310/5e6ffed6bf3bb71a10b08d4a561c582d.png
deleted file mode 100644
index 8e386c01149e725b334bbfeeb208f3dfa65cc35a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11002
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
Tx`)2g3Q&BjDhqq_{_}qWW>^XR


From 925920a6c5c02d02cf21ba53c5b25e5b11c02ed2 Mon Sep 17 00:00:00 2001
From: ldjun <ldj_willow@163.com>
Date: Wed, 18 Mar 2026 14:19:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:storay=E4=B8=AD=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/application/api/controller/Story.php | 24 +++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/back/application/api/controller/Story.php b/back/application/api/controller/Story.php
index 4a058be..5e87993 100644
--- a/back/application/api/controller/Story.php
+++ b/back/application/api/controller/Story.php
@@ -68,7 +68,6 @@ class Story extends Common
                 ->where('u.user_type', 1)
                 ->where('u.id', $opStory['story_manager'])
                 ->find();
-
             if (null != $ret)
             {
                 $opStory['story_managername'] = $ret['staff_name'];
@@ -193,15 +192,15 @@ class Story extends Common
                 ->where('story_id', $param['story_id'])
                 ->find();
             if ($story_info) {
-
-                $user = new User();
-
                 $story_info_member = explode(',', $story_info['story_member']);
                 foreach ($story_info_member as $memberId) {
-
-                    $user_info          = $user->GetUserInfoByLoginId($memberId);
-                    $item['id']         = $user_info['id'];
-                    $item['staff_name'] = $user_info['name'];
+                    $ret = db('system_user')->alias('u')
+                        ->join('hr_staff s','s.staff_id=u.user_id', 'left')
+                        ->where('u.user_type', 1)
+                        ->where('u.id', $memberId)
+                        ->find();
+                    $item['id']         = $memberId;
+                    $item['staff_name'] = $ret['staff_name'];
                     $array[] = $item;
                 }
             }
@@ -247,8 +246,13 @@ class Story extends Common
             $user = new User();                                
             for ($i=0; $i<count($opTasks);$i++)
             {
-                $user_info = $user->GetUserInfoByLoginId($opTasks[$i]['task_processor']);
-                $opTasks[$i]['task_processor_name'] = $user_info['name'];
+               // $user_info = $user->GetUserInfoByLoginId($opTasks[$i]['task_processor']);
+                $ret = db('system_user')->alias('u')
+                    ->join('hr_staff s','s.staff_id=u.user_id', 'left')
+                    ->where('u.user_type', 1)
+                    ->where('u.id', $opTasks[$i]['task_processor'])
+                    ->find();
+                $opTasks[$i]['task_processor_name'] = $ret['staff_name'];
             }
             return $this->sendSuccess($opTasks);
         }

From fa1fe77d1e3e1afc33d427070b1035abc6987ffc Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 18 Mar 2026 14:20:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?opt:=E4=BB=BB=E5=8A=A1=E5=8D=95=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8CTODO=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E5=8F=8A=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/components/Issuelist.vue                | 8 +++++++-
 front/src/views/components/Story.vue                    | 2 +-
 front/src/views/components/Task.vue                     | 4 ++--
 front/src/views/workbench/customer/projectissuelist.vue | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/front/src/views/components/Issuelist.vue b/front/src/views/components/Issuelist.vue
index 2e2f00a..83bd459 100644
--- a/front/src/views/components/Issuelist.vue
+++ b/front/src/views/components/Issuelist.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div slot="header" class="clearfix">
-      <span>问题单管理</span>
+      <span>问题列表管理</span>
 
       <el-select v-model="select_issue_type" placeholder="请选择问题类型" @change="handleChangeType"
         style="width: 20%;margin-left:20px" size="mini">
@@ -45,6 +45,12 @@
         </template>
       </el-table-column>
       <el-table-column prop="close_time" label="操作" align="left">
+        <template slot-scope="scope">
+          <el-button v-if="login_user_id == scope.row.issue_processor && scope.row.issue_state < 10"
+                     class="el-icon-view" @click="showUpdate(scope.row)" type="text">处理</el-button>
+          <el-button v-if="login_user_id == scope.row.involve_manager && scope.row.issue_state == 1"
+                     class="el-icon-view" @click="updateProcessor(scope.row)" type="text">分配</el-button>
+        </template>
       </el-table-column>
     </el-table>
 
diff --git a/front/src/views/components/Story.vue b/front/src/views/components/Story.vue
index baff609..b37ac62 100644
--- a/front/src/views/components/Story.vue
+++ b/front/src/views/components/Story.vue
@@ -50,7 +50,7 @@
                 <el-button class="el-icon-view" @click="showMaterials(scope.row)" size="mini" type="text">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="story_manager" label="Story管理者" align="left">
+            <el-table-column prop="story_managername" label="Story管理者" align="left">
             </el-table-column>
             <el-table-column prop="story_members" label="Story成员" align="left">
             </el-table-column>
diff --git a/front/src/views/components/Task.vue b/front/src/views/components/Task.vue
index 5d98e57..111f46c 100644
--- a/front/src/views/components/Task.vue
+++ b/front/src/views/components/Task.vue
@@ -102,7 +102,7 @@
         </el-dialog>
 
         <!-- 添加Task信息对话框 -->
-        <el-dialog title="添加Task" :visible.sync="dialogVisibleCreateTask" :close-on-click-modal="false" width="36%"
+        <el-dialog title="添加Task" :visible.sync="dialogVisibleCreateTask" :close-on-click-modal="false" width="45%"
             append-to-body>
             <el-form :model="newTask" label-width="120px">
                 <el-form-item label="Task介绍">
@@ -116,7 +116,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="计划处理时间">
-                    <el-date-picker v-model="newTask.planned_time" type="datetimerange" range-separator="至"
+                    <el-date-picker style="width: 100%" v-model="newTask.planned_time" type="datetimerange" range-separator="至"
                         start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss"
                         value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
                     </el-date-picker>
diff --git a/front/src/views/workbench/customer/projectissuelist.vue b/front/src/views/workbench/customer/projectissuelist.vue
index a376137..d2367d8 100644
--- a/front/src/views/workbench/customer/projectissuelist.vue
+++ b/front/src/views/workbench/customer/projectissuelist.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div slot="header" class="clearfix">
-      <span>问题单管理</span>
+      <span>问题管理</span>
 
       <el-select v-model="select_issue_type" placeholder="请选择问题类型" @change="handleChangeType"
         style="width: 20%;margin-left:20px" size="mini">
