From 3114bfec4e2278bdd394eb9e74dd9506f42232b2 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 16:11:27 +0800
Subject: [PATCH] 1. 完成项目管理全流程优化,补充阶段推进、汇报统计及生命周期记录。 2. 完成业务与项目数据关联,支持查看项目进度、详情及相关附件。 3. 完成采购审批流程接入,支持配置审批人员及采购业务审批。 4. 精简用户、角色、部门、菜单和字典,完善操作日志及附件下载。

---
 src/views/projectManagement/Management/components/formDia.vue |   84 ++++++++----------------------------------
 1 files changed, 16 insertions(+), 68 deletions(-)

diff --git a/src/views/projectManagement/Management/components/formDia.vue b/src/views/projectManagement/Management/components/formDia.vue
index 15ebe43..5e1e6ef 100644
--- a/src/views/projectManagement/Management/components/formDia.vue
+++ b/src/views/projectManagement/Management/components/formDia.vue
@@ -1,51 +1,32 @@
 <template>
-  <el-dialog v-model="visible" :title="dialogTitle" :width="startProject ? '1100px' : '900px'" destroy-on-close>
+  <el-dialog v-model="visible" :title="dialogTitle" width="900px" destroy-on-close>
     <el-alert v-if="isBusinessProject" title="璇ラ」鐩敱涓氬姟瀹℃壒鐢熸垚锛屼繚瀛樺悗鍙湪椤圭洰璇︽儏鏌ョ湅鏉ユ簮涓氬姟鍙婂叾闄勪欢銆�" type="info" :closable="false" class="tip" />
+    <el-alert v-if="startProject" title="寮�濮嬮」鐩箣鍓嶏紝璇峰厛閫氳繃鍒楄〃涓殑鈥滄ā鍧楃鐞嗏�濇妸鎵�鏈夋ā鍧楃殑宸ヤ綔閲忓崰姣斿垎閰嶅埌100%銆�" type="info" :closable="false" class="tip" />
     <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
-      <el-row v-if="!personnelOnly" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12"><el-form-item label="椤圭洰鍚嶇О" prop="title"><el-input v-model="form.title" maxlength="200" /></el-form-item></el-col>
         <el-col :span="12"><el-form-item label="瀹㈡埛鍚嶇О" prop="clientName"><el-select v-model="form.clientName" filterable clearable style="width:100%" @change="syncCustomer"><el-option v-for="item in customers" :key="item.id" :label="item.customerName" :value="item.customerName" /></el-select></el-form-item></el-col>
       </el-row>
-      <el-row v-if="!personnelOnly" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12"><el-form-item label="椤圭洰鍒嗙被" prop="projectClassification"><el-tree-select v-model="form.projectClassification" :data="categoryTree" :props="{ label:'categoryName',value:'categoryName',children:'children' }" check-strictly clearable :filterable="false" placeholder="璇烽�夋嫨椤圭洰鍒嗙被" style="width:100%" /></el-form-item></el-col>
         <el-col :span="12"><el-form-item label="椤圭洰鏉ユ簮"><el-input v-model="form.source" disabled /></el-form-item></el-col>
       </el-row>
-      <el-row v-if="!personnelOnly" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12"><el-form-item label="棰勮寮�濮嬫椂闂�" prop="planStartTime"><el-date-picker v-model="form.planStartTime" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item></el-col>
         <el-col :span="12"><el-form-item label="棰勮缁撴潫鏃堕棿" prop="planEndTime"><el-date-picker v-model="form.planEndTime" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item></el-col>
       </el-row>
-      <el-row v-if="!personnelOnly" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12"><el-form-item label="椤圭洰璐熻矗浜�" prop="projectLeaderId"><el-select v-model="form.projectLeaderId" filterable style="width:100%" @change="syncLeader"><el-option v-for="u in users" :key="u.value" :label="u.label" :value="u.value" /></el-select></el-form-item></el-col>
         <el-col :span="12"><el-form-item label="椤圭洰缁忕悊" prop="projectManagerIds"><el-select v-model="form.projectManagerIds" multiple filterable style="width:100%"><el-option v-for="u in users" :key="u.value" :label="u.label" :value="u.value" /></el-select></el-form-item></el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="24"><el-form-item label="椤圭洰鎵ц浜�" prop="projectExecutorIds"><el-select v-model="form.projectExecutorIds" multiple filterable style="width:100%"><el-option v-for="u in users" :key="u.value" :label="u.label" :value="u.value" /></el-select><div class="field-hint">椤圭洰寮�濮嬪悗浠嶅彲鏂板锛涘凡鏈夐」鐩眹鎶ュ伐浣滃崰姣旂殑鎵ц浜轰笉鑳藉垹闄ゃ��</div></el-form-item></el-col>
-      </el-row>
-      <el-row v-if="!personnelOnly" :gutter="20">
         <el-col :span="8"><el-form-item label="璺熻繘鍛ㄦ湡" prop="followCycle"><el-select v-model="form.followCycle" style="width:100%"><el-option label="姣忔湀" value="MONTH" /><el-option label="姣忓搴�" value="QUARTER" /><el-option label="姣忓勾" value="YEAR" /></el-select></el-form-item></el-col>
         <el-col :span="16"><el-form-item label="璺熻繘瑕佹眰" prop="followDetail"><el-input v-model="form.followDetail" maxlength="1000" /></el-form-item></el-col>
       </el-row>
-      <el-form-item v-if="!personnelOnly" label="椤圭洰澶囨敞"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="2000" show-word-limit /></el-form-item>
-      <el-form-item v-if="!personnelOnly" label="椤圭洰璧勬枡"><AttachmentUploadFile v-model:file-list="files" :limit="20" /></el-form-item>
-      <template v-if="startProject && !personnelOnly">
-        <el-divider content-position="left">椤圭洰妯″潡缁勬垚锛堝紑濮嬮」鐩墠蹇呭~锛�</el-divider>
-        <el-alert title="妯″潡宸ヤ綔閲忓崰姣斿悎璁″繀椤讳负100%锛涜繖閲屽彧閫夋嫨鎵ц浜猴紝浜哄憳姣旈噸鍦ㄦ瘡娆¤繘搴︽眹鎶ユ椂濉啓銆�" type="info" :closable="false" class="tip" />
-        <div v-for="(module,index) in startModules" :key="module.localKey" class="module-card">
-          <div class="module-card__title"><span>妯″潡 {{ index + 1 }}</span><el-button link type="danger" @click="removeStartModule(index)">鍒犻櫎</el-button></div>
-          <el-row :gutter="16">
-            <el-col :span="8"><el-form-item label="妯″潡鍚嶇О" required><el-input v-model="module.moduleName" maxlength="200" /></el-form-item></el-col>
-            <el-col :span="8"><el-form-item label="棰勮寮�濮�" required><el-date-picker v-model="module.plannedStartDate" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item></el-col>
-            <el-col :span="8"><el-form-item label="椤圭洰宸ヤ綔閲�" required><el-input-number v-model="module.projectWeight" :min="0" :max="moduleWeightLimit(index)" :precision="2" /><span class="unit">%</span><div class="field-hint">鍏朵粬妯″潡 {{ otherStartModuleWeight(index) }}%锛屽綋鍓嶆渶澶� {{ moduleWeightLimit(index) }}%</div></el-form-item></el-col>
-          </el-row>
-          <el-row :gutter="16">
-            <el-col :span="12"><el-form-item label="妯″潡鎵ц浜�" required><el-select v-model="module.memberIds" multiple filterable style="width:100%"><el-option v-for="u in projectExecutorOptions" :key="u.value" :label="u.label" :value="u.value" /></el-select></el-form-item></el-col>
-            <el-col :span="12"><el-form-item label="妯″潡姒傝" required><el-input v-model="module.summary" type="textarea" :rows="2" maxlength="1000" /></el-form-item></el-col>
-          </el-row>
-        </div>
-        <div class="module-actions"><span>褰撳墠妯″潡宸ヤ綔閲忓悎璁★細{{ startModuleWeight }}%</span><el-button type="primary" plain @click="addStartModule">+ 娣诲姞妯″潡</el-button></div>
-      </template>
+      <el-form-item label="椤圭洰澶囨敞"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="2000" show-word-limit /></el-form-item>
+      <el-form-item label="椤圭洰璧勬枡"><AttachmentUploadFile v-model:file-list="files" :limit="20" /></el-form-item>
     </el-form>
-    <template #footer><el-button @click="visible=false">鍙栨秷</el-button><el-button type="primary" :loading="saving" @click="submit">{{ personnelOnly ? '淇濆瓨鎵ц浜�' : startProject ? '淇濆瓨骞跺紑濮嬮」鐩�' : '淇濆瓨' }}</el-button></template>
+    <template #footer><el-button @click="visible=false">鍙栨秷</el-button><el-button type="primary" :loading="saving" @click="submit">{{ startProject ? '淇濆瓨骞跺紑濮嬮」鐩�' : '淇濆瓨' }}</el-button></template>
   </el-dialog>
 </template>
 
@@ -55,35 +36,29 @@
 import AttachmentUploadFile from '@/components/AttachmentUpload/file/index.vue'
 import { addProject, getProject, updateProject } from '@/api/projectManagement/project'
 import { listCustomer } from '@/api/basicData/customer'
-import { deleteProjectModule, getProjectWorkflow, listProjectCategories, saveProjectModule, startProjectWorkflow, updateProjectExecutors } from '@/api/projectManagement/workflow'
+import { listProjectCategories, startProjectWorkflow } from '@/api/projectManagement/workflow'
 import { userListAll } from '@/api/publicApi'
 
 const emit = defineEmits(['completed'])
 const visible = ref(false)
 const saving = ref(false)
 const startProject = ref(false)
-const personnelOnly = ref(false)
 const operationType = ref('add')
 const formRef = ref()
 const customers = ref([])
 const users = ref([])
 const categoryTree = ref([])
 const files = ref([])
-const startModules = ref([])
-const originalModuleIds = ref([])
-const form = reactive({ id:null,no:'',title:'',clientId:null,clientName:'',source:'鎵嬪姩鍒涘缓',sourceBusinessId:null,projectClassification:'',planStartTime:'',planEndTime:'',projectLeaderId:null,projectLeaderName:'',projectManagerIds:[],projectManagerNames:[],projectExecutorIds:[],projectExecutorNames:[],followCycle:'MONTH',followDetail:'',currentPhase:'鏈紑濮�',remark:'' })
+const form = reactive({ id:null,no:'',title:'',clientId:null,clientName:'',source:'鎵嬪姩鍒涘缓',sourceBusinessId:null,projectClassification:'',planStartTime:'',planEndTime:'',projectLeaderId:null,projectLeaderName:'',projectManagerIds:[],projectManagerNames:[],followCycle:'MONTH',followDetail:'',currentPhase:'鏈紑濮�',remark:'' })
 const rules = {
   title:[{ required:true,message:'璇疯緭鍏ラ」鐩悕绉�',trigger:'blur' }], clientName:[{ required:true,message:'璇烽�夋嫨瀹㈡埛',trigger:'change' }],
   projectClassification:[{ required:true,message:'璇烽�夋嫨椤圭洰鍒嗙被',trigger:'change' }], planStartTime:[{ required:true,message:'璇烽�夋嫨棰勮寮�濮嬫椂闂�',trigger:'change' }],
   planEndTime:[{ required:true,message:'璇烽�夋嫨棰勮缁撴潫鏃堕棿',trigger:'change' }], projectLeaderId:[{ required:true,message:'璇烽�夋嫨椤圭洰璐熻矗浜�',trigger:'change' }],
   projectManagerIds:[{ required:true,type:'array',min:1,message:'璇烽�夋嫨鑷冲皯涓�鍚嶉」鐩粡鐞�',trigger:'change' }], followCycle:[{ required:true,message:'璇烽�夋嫨璺熻繘鍛ㄦ湡',trigger:'change' }],
-  projectExecutorIds:[{ required:true,type:'array',min:1,message:'璇烽�夋嫨鑷冲皯涓�鍚嶉」鐩墽琛屼汉',trigger:'change' }],
   followDetail:[{ required:true,message:'璇疯緭鍏ヨ窡杩涜姹�',trigger:'blur' }]
 }
 const isBusinessProject = computed(() => !!form.sourceBusinessId || form.source === '涓氬姟鐢熸垚' || form.source === '涓氬姟瀹℃壒')
-const startModuleWeight = computed(() => startModules.value.reduce((sum,module)=>sum+Number(module.projectWeight||0),0).toFixed(2))
-const projectExecutorOptions = computed(() => users.value.filter(user=>form.projectExecutorIds.some(id=>String(id)===String(user.value))))
-const dialogTitle = computed(() => personnelOnly.value ? '璋冩暣椤圭洰鎵ц浜�' : startProject.value ? '濉啓绔嬮」淇℃伅骞跺紑濮嬮」鐩�' : operationType.value === 'add' ? '鎵嬪姩鍒涘缓椤圭洰' : '缂栬緫椤圭洰鍩烘湰鎯呭喌')
+const dialogTitle = computed(() => startProject.value ? '濉啓绔嬮」淇℃伅骞跺紑濮嬮」鐩�' : operationType.value === 'add' ? '鎵嬪姩鍒涘缓椤圭洰' : '缂栬緫椤圭洰鍩烘湰鎯呭喌')
 
 function buildTree(list) { const map=new Map((list||[]).map(x=>[String(x.id),{...x,children:[]}])) ; const roots=[]; map.forEach(node=>{ const parent=map.get(String(node.parentId)); if(parent&&node.parentId) parent.children.push(node); else roots.push(node) }); return roots }
 async function loadOptions() {
@@ -92,54 +67,27 @@
   const userData=userRes?.data||userRes?.rows||userRes||[]; users.value=(Array.isArray(userData)?userData:[]).map(u=>({ label:u.nickName||u.userName||u.name,value:u.userId||u.id }))
   categoryTree.value=buildTree(categoryRes?.data||[])
 }
-function reset() { Object.assign(form,{ id:null,no:'',title:'',clientId:null,clientName:'',source:'鎵嬪姩鍒涘缓',sourceBusinessId:null,projectClassification:'',planStartTime:'',planEndTime:'',projectLeaderId:null,projectLeaderName:'',projectManagerIds:[],projectManagerNames:[],projectExecutorIds:[],projectExecutorNames:[],followCycle:'MONTH',followDetail:'',currentPhase:'鏈紑濮�',remark:'' }); files.value=[];startModules.value=[];originalModuleIds.value=[] }
+function reset() { Object.assign(form,{ id:null,no:'',title:'',clientId:null,clientName:'',source:'鎵嬪姩鍒涘缓',sourceBusinessId:null,projectClassification:'',planStartTime:'',planEndTime:'',projectLeaderId:null,projectLeaderName:'',projectManagerIds:[],projectManagerNames:[],followCycle:'MONTH',followDetail:'',currentPhase:'鏈紑濮�',remark:'' }); files.value=[] }
 function syncCustomer(name) { const item=customers.value.find(x=>x.customerName===name); form.clientId=item?.id||item?.customerId||null }
 function syncLeader(id) { form.projectLeaderName=users.value.find(u=>String(u.value)===String(id))?.label||'' }
 function normalizeFiles(list) { return (list||[]).map(f=>({ id:f.id??f.fileId??f.rawData?.id,name:f.name??f.fileName??f.rawData?.originalFilename,url:f.url??f.fileUrl??f.rawData?.url })).filter(f=>f.id||f.url) }
-function newModule(module={}) { return { localKey:module.id||`${Date.now()}-${Math.random()}`,id:module.id||null,moduleName:module.moduleName||'',plannedStartDate:module.plannedStartDate||'',summary:module.summary||'',projectWeight:Number(module.projectWeight||0),memberIds:(module.members||[]).map(member=>member.userId) } }
-function addStartModule(){startModules.value.push(newModule())}
-function removeStartModule(index){startModules.value.splice(index,1)}
-function otherStartModuleWeight(index){return startModules.value.reduce((sum,module,i)=>sum+(i===index?0:Number(module.projectWeight||0)),0).toFixed(2)}
-function moduleWeightLimit(index){return Math.max(0,100-Number(otherStartModuleWeight(index)))}
-function validateStartModules(){
-  if(!startModules.value.length){ElMessage.warning('椤圭洰寮�濮嬪墠璇疯嚦灏戞坊鍔犱竴涓」鐩ā鍧�');return false}
-  if(startModules.value.some(module=>!module.moduleName||!module.plannedStartDate||!module.summary||!module.memberIds.length)){ElMessage.warning('璇峰畬鏁村~鍐欐瘡涓ā鍧楃殑鍚嶇О銆侀璁″紑濮嬫椂闂淬�佹ā鍧楁瑕佸拰鎵ц浜�');return false}
-  if(Number(startModuleWeight.value)!==100){ElMessage.warning('鎵�鏈夋ā鍧楃殑椤圭洰宸ヤ綔閲忓崰姣斿悎璁″繀椤讳负100%');return false}
-  return true
-}
 
 async function openDialog(options={}) {
-  reset(); operationType.value=options.operationType||'add'; startProject.value=!!options.startProject; personnelOnly.value=!!options.personnelOnly; await loadOptions()
+  reset(); operationType.value=options.operationType||'add'; startProject.value=!!options.startProject; await loadOptions()
   const id=options.row?.id
-  if(id) { const res=await getProject(id); const detail=res?.data?.data??res?.data??res; const info=detail?.info||{}; Object.assign(form,info,{ projectManagerIds:info.projectManagerIds||[],projectManagerNames:info.projectManagerNames||[],projectExecutorIds:info.projectExecutorIds||[],projectExecutorNames:info.projectExecutorNames||[] }); files.value=(info.attachmentList||[]).map(f=>({...f})) }
-  if(startProject.value&&id){const workflow=await getProjectWorkflow(id);const modules=workflow?.data?.modules||[];startModules.value=modules.map(newModule);originalModuleIds.value=modules.map(module=>module.id);if(!startModules.value.length)addStartModule()}
+  if(id) { const res=await getProject(id); const detail=res?.data?.data??res?.data??res; const info=detail?.info||{}; Object.assign(form,info,{ projectManagerIds:info.projectManagerIds||[],projectManagerNames:info.projectManagerNames||[] }); files.value=(info.attachmentList||[]).map(f=>({...f})) }
   visible.value=true
 }
 
 async function submit() {
-  form.projectExecutorNames=form.projectExecutorIds.map(id=>users.value.find(u=>String(u.value)===String(id))?.label||'').filter(Boolean)
-  if(personnelOnly.value){
-    if(!form.projectExecutorIds.length)return ElMessage.warning('璇疯嚦灏戜繚鐣欎竴鍚嶉」鐩墽琛屼汉')
-    saving.value=true
-    try{await updateProjectExecutors({projectId:form.id,executors:form.projectExecutorIds.map(id=>({userId:id,userName:users.value.find(user=>String(user.value)===String(id))?.label||''}))});ElMessage.success('椤圭洰鎵ц浜哄凡鏇存柊');visible.value=false;emit('completed',{id:form.id})}finally{saving.value=false}
-    return
-  }
   await formRef.value?.validate()
   if(form.planEndTime < form.planStartTime) return ElMessage.warning('棰勮缁撴潫鏃堕棿涓嶈兘鏃╀簬棰勮寮�濮嬫椂闂�')
-  if(startProject.value&&!validateStartModules()) return
   form.projectManagerNames=form.projectManagerIds.map(id=>users.value.find(u=>String(u.value)===String(id))?.label||'').filter(Boolean)
   const info={ ...form, currentPhase:startProject.value?'鏈紑濮�':form.currentPhase, establishTime:form.establishTime||new Date().toISOString().slice(0,10), managerId:form.projectLeaderId,managerName:form.projectLeaderName,attachmentIds:normalizeFiles(files.value).map(f=>f.id).filter(Boolean),projectManagementPlanId:null }
   saving.value=true
   try {
     await (form.id?updateProject:addProject)({ info,shippingAddress:null,contractInfo:null,salesLedgerProductList:null })
     if(startProject.value){
-      for(const module of startModules.value){
-        const members=module.memberIds.map(id=>({userId:id,userName:users.value.find(user=>String(user.value)===String(id))?.label||''}))
-        const res=await saveProjectModule({...module,projectId:form.id,members})
-        module.id=res?.data||module.id
-      }
-      const retainedIds=new Set(startModules.value.map(module=>String(module.id)))
-      for(const id of originalModuleIds.value.filter(id=>!retainedIds.has(String(id)))) await deleteProjectModule(id)
       await startProjectWorkflow(form.id)
     }
     ElMessage.success(startProject.value?'椤圭洰宸插紑濮�':'淇濆瓨鎴愬姛')
@@ -150,4 +98,4 @@
 defineExpose({ openDialog })
 </script>
 
-<style scoped>.tip{margin-bottom:18px}.module-card{padding:14px 14px 2px;margin-bottom:12px;border:1px solid #dcdfe6;border-radius:6px}.module-card__title,.module-actions{display:flex;align-items:center;justify-content:space-between;margin-bottom:12px}.module-card__title{font-weight:600}.module-actions{color:#606266}.unit{margin-left:6px;color:#606266}.field-hint{width:100%;margin-top:4px;color:#909399;font-size:12px;line-height:18px}</style>
+<style scoped>.tip{margin-bottom:18px}</style>

--
Gitblit v1.9.3