From 11015b32e5d3cdf14102ce44d60ae0cf4d3144ef Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Thu, 28 May 2026 18:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/flowManagement/index.js               |  47 ++-
 src/views/flowManagement/addDialog.vue        | 353 ++++--------------
 src/views/flowManagement/assignDaialog.vue    | 114 ++++++
 src/views/flowManagement/configRole.vue       | 194 ++++++++++
 .../flowManagement/managementOfKeyTasks.vue   | 212 ++++-------
 src/views/flowManagement/milestoneDialog.vue  | 284 ++++++--------
 src/views/flowManagement/projectExecution.vue |  39 +-
 src/views/flowManagement/review.vue           |   3 +-
 8 files changed, 644 insertions(+), 602 deletions(-)
 create mode 100644 src/views/flowManagement/assignDaialog.vue
 create mode 100644 src/views/flowManagement/configRole.vue

diff --git a/src/api/flowManagement/index.js b/src/api/flowManagement/index.js
index 4719009f..78080133 100644
--- a/src/api/flowManagement/index.js
+++ b/src/api/flowManagement/index.js
@@ -17,7 +17,7 @@ export const getProcessList = (current, size, params) => {
 export const addProcess = (data) => {
     console.log(data, 'api的data');
     return request({
-        url: '/blade-desk/fmProjectApplication/submit',
+        url: '/blade-desk/fmProjectApplication/createApplication',
         method: 'post',
         data
     });
@@ -110,3 +110,48 @@ export const getDeplList = (current, size, params) => {
         },
     });
 };
+
+
+// 配置节点数据  
+export const getProjectApprovalConfigList = params => {
+    return request({
+        url: '/blade-desk/fmProjectApprovalConfig/list',
+        method: 'get',
+        params: params
+    });
+};
+
+//批量修改
+export const batchUpdateRole = data => {
+    return request({
+        url: '/blade-desk/fmProjectApprovalConfig/batchUpdate',
+        method: 'post',
+        data
+    });
+}; 
+// 发送审核
+export const submitApproval = params => {
+    return request({
+        url: '/blade-desk/fmProjectApplication/submitApproval',
+        method: 'get',
+        params
+    });
+};
+
+// 审批
+export const approval = data => {
+    return request({
+        url: '/blade-desk/fmProjectApplication/approval',
+        method: 'post',
+        data
+    });
+};
+
+// 查询各个审批人用户
+export const getUsersByNodeCode = params => {
+    return request({
+        url: '/blade-desk/fmProjectApprovalConfig/getUsersByNodeCode',
+        method: 'get',
+        params
+    });
+};
\ No newline at end of file
diff --git a/src/views/flowManagement/addDialog.vue b/src/views/flowManagement/addDialog.vue
index 855c4502..c13db223 100644
--- a/src/views/flowManagement/addDialog.vue
+++ b/src/views/flowManagement/addDialog.vue
@@ -1,20 +1,7 @@
 <template>
-  <el-dialog
-    :append-to-body="false"
-    :title="title"
-    :model-value="openShow"
-    width="80%"
-    @close="handleClose"
-    fullscreen
-  >
+  <el-dialog :append-to-body="false" :title="title" :model-value="openShow" width="80%" @close="handleClose" fullscreen>
     <!-- 单个 Form 包裹所有内容（基础信息 + 表格） -->
-    <el-form
-      ref="addForm"
-      :model="addForm"
-      :rules="addRules"
-      label-width="100px"
-      label-position="right"
-    >
+    <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="100px" label-position="right">
       <!-- 项目基础信息表单 -->
       <el-row>
         <el-col :span="8">
@@ -25,30 +12,17 @@
         <el-col :span="8">
           <el-form-item label="项目类型：" prop="bcId">
             <el-select :disabled="isDetail" v-model="addForm.bcId" clearable filterable>
-              <el-option
-                v-for="(item, index) in projectType"
-                :key="index"
-                :label="item.dictValue"
-                :value="item.dictKey"
-              ></el-option>
+              <el-option v-for="(item, index) in projectType" :key="index" :label="item.dictValue"
+                :value="item.dictKey"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="制单部门：" prop="touchingDeptId">
-            <el-select
-              :disabled="isDetail"
-              v-model="addForm.touchingDeptId"
-              clearable
-              filterable
-              @change="deptChange()"
-            >
-              <el-option
-                v-for="(item, index) in deplList"
-                :key="index"
-                :label="item.deptName"
-                :value="item.id"
-              ></el-option>
+            <el-select :disabled="isDetail" v-model="addForm.touchingDeptId" clearable filterable
+              @change="deptChange()">
+              <el-option v-for="(item, index) in deplList" :key="index" :label="item.deptName"
+                :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -56,127 +30,62 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="项目背景：" prop="projectBackcloth">
-            <el-input
-              :disabled="isDetail"
-              type="textarea"
-              v-model="addForm.projectBackcloth"
-            ></el-input>
+            <el-input :disabled="isDetail" type="textarea" v-model="addForm.projectBackcloth"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
           <el-form-item label="项目目标：" prop="projectTarget">
-            <el-input
-              :disabled="isDetail"
-              type="textarea"
-              v-model="addForm.projectTarget"
-            ></el-input>
+            <el-input :disabled="isDetail" type="textarea" v-model="addForm.projectTarget"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
           <el-form-item label="预期效果：" prop="desiredResult">
-            <el-input
-              :disabled="isDetail"
-              type="textarea"
-              v-model="addForm.desiredResult"
-            ></el-input>
+            <el-input :disabled="isDetail" type="textarea" v-model="addForm.desiredResult"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="项目负责人：" prop="projectHeadId">
-            <jhSelect
-              v-model="addForm.projectHeadId"
-              placeholder="请搜索选择"
-              api-url="/blade-system/user/page"
-              echo-api="/blade-system/user/page"
-              echoParamsKey="ids"
-              echo-method="get"
-              api-method="get"
-              list-key="records"
-              total-key="total"
-              label-key="realName"
-              value-key="id"
-              search-key="realName"
-              :debounce-time="500"
-              @change="projectHeadChange"
-              :title="title"
-              :disabled="isDetail"
-            />
+            <jhSelect v-model="addForm.projectHeadId" placeholder="请搜索选择" api-url="/blade-system/user/page"
+              echo-api="/blade-system/user/page" echoParamsKey="ids" echo-method="get" api-method="get"
+              list-key="records" total-key="total" label-key="realName" value-key="id" search-key="realName"
+              :debounce-time="500" @change="projectHeadChange" :title="title" :disabled="isDetail" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="成员名称：" prop="memberName">
-            <jhSelect
-              v-model="addForm.memberName"
-              placeholder="请搜索选择"
-              api-url="/blade-system/user/page"
-              echo-api="/blade-system/user/page"
-              echoParamsKey="ids"
-              api-method="get"
-              list-key="records"
-              total-key="total"
-              label-key="realName"
-              value-key="id"
-              search-key="realName"
-              multiple
-              :debounce-time="500"
-              :title="title"
-              :disabled="isDetail"
-            />
+            <jhSelect v-model="addForm.memberName" placeholder="请搜索选择" api-url="/blade-system/user/page"
+              echo-api="/blade-system/user/page" echoParamsKey="ids" api-method="get" list-key="records"
+              total-key="total" label-key="realName" value-key="id" search-key="realName" multiple :debounce-time="500"
+              :title="title" :disabled="isDetail" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="项目支持人：" prop="projectSupportMan">
-            <jhSelect
-              v-model="addForm.projectSupportMan"
-              placeholder="请搜索选择"
-              api-url="/blade-system/user/page"
-              echo-api="/blade-system/user/page"
-              echoParamsKey="ids"
-              api-method="get"
-              list-key="records"
-              total-key="total"
-              label-key="realName"
-              value-key="id"
-              search-key="realName"
-              :debounce-time="500"
-              :title="title"
-              :disabled="isDetail"
-            />
+            <jhSelect v-model="addForm.projectSupportMan" placeholder="请搜索选择" api-url="/blade-system/user/page"
+              echo-api="/blade-system/user/page" echoParamsKey="ids" api-method="get" list-key="records"
+              total-key="total" label-key="realName" value-key="id" search-key="realName" :debounce-time="500"
+              :title="title" :disabled="isDetail" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="项目开始时间：" prop="projectStartTime" label-width="110px">
-            <el-date-picker
-              :disabled="isDetail"
-              style="width: 100%"
-              v-model="addForm.projectStartTime"
-              type="date"
-              placeholder="选择日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            >
+            <el-date-picker :disabled="isDetail" style="width: 100%" v-model="addForm.projectStartTime" type="date"
+              placeholder="选择日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD">
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="项目结束预期时间：" prop="projectDesiredEnd" label-width="130px">
-            <el-date-picker
-              :disabled="isDetail"
-              style="width: 100%"
-              v-model="addForm.projectDesiredEnd"
-              type="date"
-              placeholder="选择日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            ></el-date-picker>
+            <el-date-picker :disabled="isDetail" style="width: 100%" v-model="addForm.projectDesiredEnd" type="date"
+              placeholder="选择日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD"></el-date-picker>
           </el-form-item>
         </el-col>
       </el-row>
@@ -191,35 +100,19 @@
         {{ formError }}
       </div>
       <!-- 里程碑表格 -->
-      <el-table
-        :data="addForm.stoneList"
-        ref="detailTable"
-        border
-        @select="selectChange"
-        class="table_project"
-        :cell-class-name="tableCellClassName"
-      >
+      <el-table :data="addForm.stoneList" ref="detailTable" border @select="selectChange" class="table_project"
+        :cell-class-name="tableCellClassName">
         <el-table-column type="selection"></el-table-column>
         <el-table-column type="index" width="80" label="序号"></el-table-column>
-        <el-table-column
-          align="center"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-          label="里程碑计划"
-        >
+        <el-table-column align="center" :width="isDetail || isStatusEdit ? '120' : ''" label="里程碑计划">
           <template #header>
             <span><i style="color: red">*</i>里程碑计划</span>
           </template>
           <template #default="scope">
             <template v-if="!isDetail">
-              <el-form-item
-                label-width="0"
-                :prop="`stoneList[${scope.$index}].milestonePlan`"
-                :rules="addRules.milestonePlan"
-              >
-                <el-input
-                  v-model="scope.row.milestonePlan"
-                  placeholder="请输入里程碑计划"
-                ></el-input>
+              <el-form-item label-width="0" :prop="`stoneList[${scope.$index}].milestonePlan`"
+                :rules="addRules.milestonePlan">
+                <el-input v-model="scope.row.milestonePlan" placeholder="请输入里程碑计划"></el-input>
               </el-form-item>
             </template>
             <template v-else>
@@ -227,39 +120,20 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-          label="里程碑负责人"
-          prop="milestoneMemo"
-        >
+        <el-table-column align="center" :width="isDetail || isStatusEdit ? '120' : ''" label="里程碑负责人"
+          prop="milestoneManId">
           <template #header>
             <span><i style="color: red">*</i>里程碑负责人</span>
           </template>
           <template #default="scope">
             <template v-if="!isDetail">
-              <el-form-item
-                label-width="0"
-                :prop="`stoneList[${scope.$index}].milestoneMemo`"
-                :rules="addRules.milestoneMemo"
-              >
-                <jhSelect
-                  v-model="scope.row.milestoneMemo"
-                  placeholder="请搜索选择"
-                  api-url="/blade-system/user/page"
-                  echo-api="/blade-system/user/page"
-                  echoParamsKey="ids"
-                  api-method="get"
-                  list-key="records"
-                  total-key="total"
-                  label-key="realName"
-                  value-key="id"
-                  search-key="realName"
-                  :debounce-time="500"
-                  @change="(val, item) => handleStoneListChange(val, item, scope.$index, scope.row)"
-                  :title="title"
-                  :disabled="isDetail"
-                />
+              <el-form-item label-width="0" :prop="`stoneList[${scope.$index}].milestoneManId`"
+                :rules="addRules.milestoneManId">
+                <jhSelect v-model="scope.row.milestoneManId" placeholder="请搜索选择" api-url="/blade-system/user/page"
+                  echo-api="/blade-system/user/page" echoParamsKey="ids" api-method="get" list-key="records"
+                  total-key="total" label-key="realName" value-key="id" search-key="realName" :debounce-time="500"
+                  @change="(val, item) => handleStoneListChange(val, item, scope.$index, scope.row)" :title="title"
+                  :disabled="isDetail" />
               </el-form-item>
             </template>
             <template v-else>
@@ -267,26 +141,16 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-          label="里程碑输出物"
-          prop="outputMaterial"
-        >
+        <el-table-column align="center" :width="isDetail || isStatusEdit ? '120' : ''" label="里程碑输出物"
+          prop="outputMaterial">
           <template #header>
             <span><i style="color: red">*</i>里程碑输出物</span>
           </template>
           <template #default="scope">
             <template v-if="!isDetail">
-              <el-form-item
-                label-width="0"
-                :prop="`stoneList[${scope.$index}].outputMaterial`"
-                :rules="addRules.outputMaterial"
-              >
-                <el-input
-                  v-model="scope.row.outputMaterial"
-                  placeholder="请输入里程碑输出物"
-                ></el-input>
+              <el-form-item label-width="0" :prop="`stoneList[${scope.$index}].outputMaterial`"
+                :rules="addRules.outputMaterial">
+                <el-input v-model="scope.row.outputMaterial" placeholder="请输入里程碑输出物"></el-input>
               </el-form-item>
             </template>
             <template v-else>
@@ -294,30 +158,17 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          :width="isDetail || isStatusEdit ? '180' : ''"
-          label="里程碑节点"
-          prop="milestoneNode"
-        >
+        <el-table-column align="center" :width="isDetail || isStatusEdit ? '180' : ''" label="里程碑节点"
+          prop="milestoneNode">
           <template #header>
             <span><i style="color: red">*</i>里程碑节点</span>
           </template>
           <template #default="scope">
             <template v-if="!isDetail">
-              <el-form-item
-                label-width="0"
-                :prop="`stoneList[${scope.$index}].milestoneNode`"
-                :rules="addRules.milestoneNode"
-              >
-                <el-date-picker
-                  v-model="scope.row.milestoneNode"
-                  type="date"
-                  placeholder="选择日期时间"
-                  style="width: 100%"
-                  format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD"
-                />
+              <el-form-item label-width="0" :prop="`stoneList[${scope.$index}].milestoneNode`"
+                :rules="addRules.milestoneNode">
+                <el-date-picker v-model="scope.row.milestoneNode" type="date" placeholder="选择日期时间" style="width: 100%"
+                  format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </template>
             <template v-else>
@@ -326,84 +177,40 @@
           </template>
         </el-table-column>
         <!-- 详情页专属列 -->
-        <el-table-column
-          v-if="isDetail || isStatusEdit"
-          align="center"
-          label="执行类型"
-          prop="executeType"
-          :width="isDetail ? '120' : ''"
-        >
+        <el-table-column v-if="isDetail || isStatusEdit" align="center" label="执行类型" prop="executeType"
+          :width="isDetail ? '120' : ''">
           <template #default="scope">
             {{ scope.row.executeTypeText }}
           </template>
         </el-table-column>
-        <el-table-column
-          v-if="isDetail || isStatusEdit"
-          align="center"
-          label="延期时间"
-          prop="delayTime"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-        ></el-table-column>
-        <el-table-column
-          v-if="isDetail || isStatusEdit"
-          align="center"
-          label="核查结果"
-          prop="checkResult"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-        >
+        <el-table-column v-if="isDetail || isStatusEdit" align="center" label="延期时间" prop="delayTime"
+          :width="isDetail || isStatusEdit ? '120' : ''"></el-table-column>
+        <el-table-column v-if="isDetail || isStatusEdit" align="center" label="核查结果" prop="checkResult"
+          :width="isDetail || isStatusEdit ? '120' : ''">
           <template #default="scope">
             <span v-if="scope.row.checkResult === 0">未核查</span>
             <span v-else-if="scope.row.checkResult === 1">已核查</span>
             <span v-else-if="scope.row.checkResult === 2">已核准</span>
           </template>
         </el-table-column>
-        <el-table-column
-          v-if="isDetail || isStatusEdit"
-          align="center"
-          label="核查人"
-          prop="checkMan"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-        ></el-table-column>
-        <el-table-column
-          v-if="isDetail || isStatusEdit"
-          align="center"
-          label="评价等级"
-          prop="gradeTitle"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-        >
+        <el-table-column v-if="isDetail || isStatusEdit" align="center" label="核查人" prop="checkMan"
+          :width="isDetail || isStatusEdit ? '120' : ''"></el-table-column>
+        <el-table-column v-if="isDetail || isStatusEdit" align="center" label="评价等级" prop="gradeTitle"
+          :width="isDetail || isStatusEdit ? '120' : ''">
         </el-table-column>
-        <el-table-column
-          v-if="isDetail || isStatusEdit"
-          align="center"
-          label="评价人"
-          prop="gradeMan"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-        >
+        <el-table-column v-if="isDetail || isStatusEdit" align="center" label="评价人" prop="gradeMan"
+          :width="isDetail || isStatusEdit ? '120' : ''">
           <template #default="scope">
             {{ scope.row.gradeTitle == '待评价' ? '' : scope.row.gradeMan }}
           </template>
         </el-table-column>
-        <el-table-column
-          v-if="isDetail || isStatusEdit"
-          width="200"
-          align="center"
-          label="业务领导评价"
-          prop="evaluate"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-        ></el-table-column>
-        <el-table-column
-          v-if="isDetail || isStatusEdit"
-          align="center"
-          label="附件"
-          :width="isDetail || isStatusEdit ? '120' : ''"
-        >
+        <el-table-column v-if="isDetail || isStatusEdit" width="200" align="center" label="业务领导评价" prop="evaluate"
+          :width="isDetail || isStatusEdit ? '120' : ''"></el-table-column>
+        <el-table-column v-if="isDetail || isStatusEdit" align="center" label="附件"
+          :width="isDetail || isStatusEdit ? '120' : ''">
           <template #default="scope">
-            <el-button
-              type="text"
-              v-if="scope.row.attachList.length > 0"
-              @click="attachListDown(scope.row)"
-              >附件</el-button
-            >
+            <el-button type="text" v-if="scope.row.attachList.length > 0"
+              @click="attachListDown(scope.row)">附件</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -499,7 +306,7 @@ export default {
         milestonePlan: [
           { required: true, message: '请填写里程碑计划', trigger: ['blur', 'submit'] },
         ],
-        milestoneMemo: [
+        milestoneManId: [
           { required: true, message: '请选择里程碑负责人', trigger: ['change', 'submit'] },
         ],
         outputMaterial: [
@@ -563,7 +370,7 @@ export default {
     handleStoneListChange(val, item, index, row) {
       if (item) {
         // 假设你需要将姓名存到 milestoneMan 字段用于提交或展示
-        // row.milestoneMemo =val;
+        // row.milestoneManId =val;
         row.milestoneMan = item.realName;
       } else {
         // 如果 val 为空，说明是清除操作
@@ -677,7 +484,7 @@ export default {
         milestonePlan: '',
         outputMaterial: '',
         milestoneNode: '',
-        milestoneMemo: '',
+        milestoneManId: '',
         evolve: '',
         lastPlan: '',
         grade: null,
@@ -711,15 +518,17 @@ export default {
           this.$message.success('删除成功');
           this.$emit('del-table', index); // 通知父组件
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     formatSubmitData(form) {
       const submitData = JSON.parse(JSON.stringify(form));
       if (Array.isArray(submitData.memberName)) {
         submitData.memberName = submitData.memberName.map(item => String(item)).join(',');
       }
-      submitData.stoneList = submitData.stoneList.map(row => {
+      submitData.stoneList = submitData.stoneList.map((row, index) => {
+
         const { fmProjectApplication, attachList, paIndex, ...validData } = row;
+        validData.paIndex = index + 1
         validData.milestoneNode = validData.milestoneNode + ' 00:00:00';
         return validData;
       });
@@ -769,7 +578,7 @@ export default {
                     this.loadingShow = false;
                   });
               })
-              .catch(() => {});
+              .catch(() => { });
           } else {
             if (this.rowItem.approvalStatus == 2) {
               this.rowItem.approvalStatus = 1;
@@ -836,6 +645,7 @@ export default {
   font-size: 14px;
   line-height: 1.5;
 }
+
 :deep(.el-table .el-table__body .el-table__cell) {
   height: 50px !important;
   padding: 0 !important;
@@ -844,7 +654,8 @@ export default {
 
 /* 高亮行样式 */
 :deep(.highlight-row) {
-  background-color: rgba(40, 167, 69, 0.5) !important; /* 浅绿色背景，可根据需求修改 */
+  background-color: rgba(40, 167, 69, 0.5) !important;
+  /* 浅绿色背景，可根据需求修改 */
   // color: #67c23a;
 }
 </style>
diff --git a/src/views/flowManagement/assignDaialog.vue b/src/views/flowManagement/assignDaialog.vue
new file mode 100644
index 00000000..21348071
--- /dev/null
+++ b/src/views/flowManagement/assignDaialog.vue
@@ -0,0 +1,114 @@
+<template>
+  <el-dialog v-model="setCrewShow" :before-close="cancel" :title="title" width="30%">
+    <avue-form :option="option" ref="from" v-model="formData"></avue-form>
+
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="cancel()">取消</el-button>
+        <el-button type="primary" @click="submit()"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script>
+// setDispatch
+import { submitApproval } from '@/api/flowManagement/index';
+
+export default {
+  name: 'SetPersonnel',
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+    id: {
+      type: String,
+      default: null,
+    },
+    type: {
+      type: String,
+      default: '',
+    },
+    title: {
+      type: String,
+      default: '审批人',
+    },
+    updateRow: {
+      type: Array,
+      default: [],
+    },
+  },
+  data() {
+    return {
+      url: '',
+      setCrewShow: false,
+      formData: {},
+      selectData: {},
+      option: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '审批人',
+            prop: 'userId',
+            span: 23,
+            type: 'select',
+            filterable: true,
+            clearable: true,
+            dicUrl: '/blade-desk/fmProjectApprovalConfig/getUsersByNodeCode?nodeCode=PROJECT_APPROVAL',
+            props: {
+              label: 'realName',
+              value: 'id',
+              res: 'data',
+            },
+            change: (val, row) => {
+              console.log(val, row, 'val');
+              // this.onChangeData(val, 'processIds', row);\\
+              this.selectData = val;
+            },
+
+            rules: [
+              {
+                required: true,
+                message: '请选择',
+                trigger: 'blur',
+              },
+            ],
+          },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.setCrewShow = this.showDialog;
+  },
+  methods: {
+    submit() {
+      this.$refs.from.validate((valid, done, msg) => {
+        if (valid) {
+          // done();
+
+          let query = {
+            id: this.updateRow.id,
+            approverId: this.selectData.item.id,
+            approverName: this.selectData.item.realName,
+          };
+          submitApproval(query).then(res=>{
+             this.$message.success('操作成功');
+              this.cancel();
+          })
+
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+
+    cancel(refresh) {
+      this.setCrewShow = false;
+      this.$emit('closeDialog');
+    },
+  },
+};
+</script>
diff --git a/src/views/flowManagement/configRole.vue b/src/views/flowManagement/configRole.vue
new file mode 100644
index 00000000..ef79f35b
--- /dev/null
+++ b/src/views/flowManagement/configRole.vue
@@ -0,0 +1,194 @@
+<template>
+  <el-dialog title="节点配置" append-to-body :modelValue="openShow" width="40%" @close="closeDialog">
+
+    <!-- 单个 Form 包裹整个表格 -->
+    <el-form ref="tableForm" :model="form" :rules="formRules" label-width="0px">
+      <!-- 全局错误提示 -->
+      <div v-if="formError" class="error-message" style="color: #f56c6c; margin-bottom: 10px;">
+        {{ formError }}
+      </div>
+
+      <el-table :data="form.tableData" border>
+        <el-table-column align="center" label="节点">
+          <template #default="scope">
+            {{ scope.row.nodeName }}
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" :label="'设置角色'">
+          <template #header>
+            <span><i style="color: red">*</i>设置角色</span>
+          </template>
+          <template #default="scope">
+            <el-form-item :prop="`tableData[${scope.$index}].roleId`" :rules="formRules.roleId">
+              <el-select v-model="scope.row.roleId" placeholder="请选择" style="width: 100%" filterable clearable
+                @change="val => roleChange(val, scope.$index)">
+                <el-option v-for="item in roleList" :key="item.id" :value="item.id" :label="item.roleName"></el-option>
+              </el-select>
+            </el-form-item>
+          </template>
+        </el-table-column>
+
+      </el-table>
+    </el-form>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { getProjectApprovalConfigList, batchUpdateRole } from '@/api/flowManagement/index';
+import { getList } from '@/api/system/role.js';
+
+export default {
+  props: {
+    showDialog: { type: Boolean, default: false },
+    moldAddMore: { type: Boolean, default: false },
+    tabPosition: { type: String, default: '' },
+  },
+  data() {
+    return {
+      openShow: false,
+      wcData: [],
+      formError: '', // 全局错误提示
+
+      // 单个表单模型：包含表格所有行数据
+      form: {
+        tableData: [] // 表格数据数组（直接绑定到 Form 模型）
+      },
+
+      // 统一校验规则：支持数组项校验
+      formRules: {
+        // 表格数据数组的整体校验（可选：如最少1行数据）
+        tableData: [
+          {
+            required: true,
+            message: '请至少添加一行数据',
+            trigger: 'submit',
+            type: 'array' // 明确类型为数组
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value.length === 0) {
+                callback(new Error('请至少添加一行数据'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'submit'
+          }
+        ],
+
+        // 数组中每一项的 wcId 字段校验
+        roleId: [
+          { required: true, message: '请选择', trigger: ['change', 'submit'] }
+        ],
+      },
+      roleList: [],//角色列表
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+    this.getRoleList();
+    this.init();
+
+  },
+  methods: {
+    // 初始化数据
+    init() {
+      getProjectApprovalConfigList().then(res => {
+        this.form.tableData = res.data.data
+      })
+    },
+    // 获取角色列表
+    getRoleList() {
+      getList().then(res => {
+        console.log(res.data.data, 'wcData')
+        this.roleList = res.data.data
+      })
+    },
+    roleChange(val, index) {
+      let selecInfo = this.roleList.find(item => item.id === val)
+      this.form.tableData[index].roleName = selecInfo.roleName
+    },
+
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog', true);
+      // 重置表单
+      this.form.tableData = [];
+      this.formError = '';
+      this.$refs.tableForm?.resetFields();
+    },
+
+    // 提交表单（单次校验所有行）
+    submitForm() {
+      this.formError = '';
+
+      // 调用单个 Form 的校验方法
+      this.$refs.tableForm.validate((isValid, invalidFields) => {
+        if (!isValid) {
+          // 校验失败：显示提示并滚动到第一个错误字段
+          this.formError = '存在未完善的字段，请检查表格中的红色提示';
+
+          this.$nextTick(() => {
+            // 找到第一个错误字段并滚动到视图
+            const firstError = document.querySelector('.el-form-item.is-error');
+            if (firstError) {
+              firstError.scrollIntoView({ behavior: 'smooth', block: 'center' });
+            }
+          });
+          return;
+        }
+
+        // 调用接口提交（实际项目替换）
+        try {
+          batchUpdateRole(this.form.tableData).then(res => {
+            this.$message.success('提交成功');
+            this.closeDialog(true);
+          })
+        } catch (err) {
+          console.error('提交失败：', err);
+        }
+      });
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+// 优化表单字段样式
+:deep(.el-table .el-form-item) {
+  margin-bottom: 0; // 去掉默认边距
+}
+
+// 错误提示样式优化
+:deep(.el-form-item__error) {
+  font-size: 12px;
+  white-space: nowrap;
+  z-index: 10;
+  background: #fff;
+  padding: 2px 4px;
+  border: 1px solid #f56c6c;
+  border-radius: 4px;
+}
+
+// 表格行高适配 textarea
+.el-table__row {
+  height: 80px !important;
+}
+
+.el-table__cell {
+  vertical-align: middle !important;
+}
+
+.error-message {
+  font-size: 14px;
+  line-height: 1.5;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/flowManagement/managementOfKeyTasks.vue b/src/views/flowManagement/managementOfKeyTasks.vue
index f068f555..0e1592dc 100644
--- a/src/views/flowManagement/managementOfKeyTasks.vue
+++ b/src/views/flowManagement/managementOfKeyTasks.vue
@@ -1,47 +1,39 @@
 <template>
   <basic-container>
     <!-- 重点工作管理 -->
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model="form"
-      v-model:page="page"
-      ref="crud"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-      @sort-change="sortChange"
-    >
+    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+      @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
+      @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @sort-change="sortChange">
       <template #menu-left>
-        <el-button type="primary" @click="handleAdd" v-if="permissionList.addBtn"> 新增 </el-button>
+        <el-button type="primary" @click="handleAdd" v-if="permission.managementOfKeyTasks_add">
+          新增
+        </el-button>
+      </template>
+      <template #menu-right>
+        <el-button type="primary" @click="setRole" v-if="permission.managementOfKeyTasks_configRole">
+          配置节点
+        </el-button>
       </template>
       <template #menu="{ row }">
-        <el-button type="text" @click="handleView(row)" v-if="permissionList.viewBtn">
+        <el-button type="text" @click="handleView(row)" v-if="permission.managementOfKeyTasks_details">
           详情
         </el-button>
-        <el-button
-          type="text"
-          v-if="row.approvalStatus != 8 && permissionList.editBtn"
-          @click="handleEdit(row)"
-        >
+        <el-button type="text" v-if="row.approvalStatus != 8 && permission.managementOfKeyTasks_edit"
+          @click="handleEdit(row)">
           修改
         </el-button>
-        <el-button
-          type="text"
-          v-if="row.approvalStatus == 1 && permissionList.reviewBtn"
-          @click="checkRow(row)"
-        >
+        <el-button type="text" v-if="row.approvalStatus == 0 && permission.managementOfKeyTasks_sendChenck"
+          @click="sendReview(row)">
+          发送审核
+        </el-button>
+        <el-button type="text" v-if="row.approvalStatus == 1 && permission.managementOfKeyTasks_review"
+          @click="checkRow(row)">
           审核
         </el-button>
-        <el-button
-          type="text"
-          v-if="(row.approvalStatus == 1||row.approvalStatus ==2) && permissionList.deleteBtn"
-          @click="deleteRow(row)"
-        >
+        <el-button type="text" v-if="
+          (row.approvalStatus == 0 || row.approvalStatus == 2) &&
+          permission.managementOfKeyTasks_del
+        " @click="deleteRow(row)">
           删除
         </el-button>
       </template>
@@ -52,57 +44,48 @@
       <template #projectDesiredEnd="scope">
         {{ scope.row.projectDesiredEnd ? scope.row.projectDesiredEnd.substring(0, 10) : '' }}
       </template>
-     
     </avue-crud>
     <!-- 新增弹窗 -->
-    <add-dialog
-      v-if="addDialogVisible"
-      :title="title"
-      :visible="addDialogVisible"
-      :rowItem="rowItem"
-      @close="closeDialog"
-    ></add-dialog>
+    <add-dialog v-if="addDialogVisible" :title="title" :visible="addDialogVisible" :rowItem="rowItem"
+      @close="closeDialog"></add-dialog>
 
     <!-- 审核弹窗 -->
-    <review
-      v-if="checkDialog"
-      :showDialog="checkDialog"
-      @closeDialog="closeDialog"
-      :rowItem="rowItem"
-    ></review>
+    <review v-if="checkDialog" :showDialog="checkDialog" @closeDialog="closeDialog" :rowItem="rowItem"></review>
+
+    <!-- 各节点配置 -->
+    <configRole :showDialog="configRoleDialog" v-if="configRoleDialog" @closeDialog="closeDialog"></configRole>
+
+
+    <!-- 选择审批人 -->
+    <assignDaialog :showDialog="reviewUserShow" v-if="reviewUserShow" :updateRow="rowItem" @closeDialog="closeDialog">
+    </assignDaialog>
 
-    <!-- 执行/核查/核准弹窗 -->
-    <milestoneDialog
-      :title="subTitle"
-      :showDialog="executeDialog"
-      v-if="executeDialog"
-      @closeDialog="closeDialog"
-      :rowItem="executeForm"
-      :detailForm="detailForm"
-    ></milestoneDialog>
   </basic-container>
 </template>
 
 <script>
 import {
   getProcessList,
-  addProcess,
   updateProcess,
   delProcess,
-} from '../../api/flowManagement/index';
+} from '@/api/flowManagement/index';
 import AddDialog from './addDialog.vue';
 import review from './review.vue';
 import milestoneDialog from './milestoneDialog.vue';
 import { getDictionary } from '@/api/system/dict';
 import { mapGetters } from 'vuex';
+import configRole from './configRole.vue';
+import assignDaialog from './assignDaialog.vue';
 export default {
-  components: { AddDialog, review, milestoneDialog },
+  components: { AddDialog, review, milestoneDialog, configRole, assignDaialog },
   data() {
     return {
       // 状态
       // 0-立项待提交、1-立项待审核、2-立项审批不通过、3-项目进行中、
       // 4-项目待核查、5-项目核查不通过、6-项目待核准、7-项目核准不通过、
       // 8-项目已核准
+      reviewUserShow: false,
+      configRoleDialog: false,
       addDialogVisible: false, // 新增弹窗显隐控制
       title: '新增',
       loading: false,
@@ -176,6 +159,7 @@ export default {
             overflow: true,
             search: true,
             sortable: 'custom',
+            width: 120,
           },
           {
             label: '项目名称',
@@ -183,6 +167,7 @@ export default {
             overflow: true,
             search: true,
             sortable: 'custom',
+            width: 120,
           },
           {
             label: '项目负责人',
@@ -215,11 +200,12 @@ export default {
             overflow: true,
             search: false,
             sortable: 'custom',
+            width: 100,
           },
           {
             label: '制单部门',
             prop: 'touchingDept',
-
+            width: 120,
             overflow: true,
             search: false,
             sortable: 'custom',
@@ -227,16 +213,23 @@ export default {
           {
             label: '制单时间',
             prop: 'touchingTime',
-
+            width: 150,
             overflow: true,
             search: false,
             sortable: 'custom',
           },
+          {
+            label: '审核人',
+            prop: 'approvalManName',
+            overflow: true,
+            search: false,
+            sortable: 'custom',
+            width: 100,
+          },
           {
             label: '状态',
             prop: 'approvalStatus',
             sortable: 'custom',
-
             overflow: true,
             search: false,
             type: 'select',
@@ -256,20 +249,14 @@ export default {
   },
   computed: {
     ...mapGetters(['permission']),
-    permissionList() {
-      return {
-        addBtn: this.validData(this.permission.managementOfKeyTasks_add, false),
-        viewBtn: this.validData(this.permission.managementOfKeyTasks_details, false),
-        editBtn: this.validData(this.permission.managementOfKeyTasks_edit, false),
-        reviewBtn: this.validData(this.permission.managementOfKeyTasks_review, false),
-        deleteBtn: this.validData(this.permission.managementOfKeyTasks_del, false),
-      };
-    },
   },
   mounted() {
     this.getExecuteResult();
   },
   methods: {
+    setRole() {
+      this.configRoleDialog = true;
+    },
     getExecuteTypeText(type) {
       const item = this.executeResultList.find(item => item.dictKey === type);
       console.log('item', item);
@@ -281,13 +268,6 @@ export default {
         this.executeResultList = res.data.data;
       });
     },
-    // 核查结果 flow_project_checkResult
-    getCheckResult() {
-      getDictionary({ code: 'flow_project_checkResult' }).then(res => {
-        this.checkResultList = res.data;
-      });
-    },
-    // 评价等级 flow_project_grade
 
     getGrade() {
       getDictionary({ code: 'flow_project_grade' }).then(res => {
@@ -299,6 +279,8 @@ export default {
       this.checkDialog = false;
       this.addDialogVisible = false;
       this.executeDialog = false;
+      this.configRoleDialog = false;
+      this.reviewUserShow = false
       // if (type) {
       this.onLoad(this.page, this.query);
       // }
@@ -339,74 +321,12 @@ export default {
       this.checkDialog = true;
       this.rowItem = row;
     },
-    //确定审核立项
-    submitCheck() {
-      this.$refs.checkForm.validate(valid => {
-        if (valid) {
-          let query = {
-            id: this.rowItem.id,
-            approvalStatus: this.checkForm.checkResult == 1 ? 3 : 2,
-          };
-          updateProcess(query).then(res => {
-            this.checkDialog = false;
-            this.onLoad(this.page, this.query);
-          });
-        }
-      });
-    },
-    // 执行
-    executeRow(row, detail) {
-      this.detailForm = detail;
-      this.executeForm = row;
-      this.subTitle = '执行';
-      this.executeDialog = true;
-    },
-    // 核查
-    auditRow(row, detail) {
-      this.subTitle = '核查';
-      this.detailForm = detail;
-      this.executeForm = row;
-      // 模拟加载已有附件
-      this.existingFiles = [
-        { name: '项目计划书.pdf', url: '#' },
-        { name: '进度报告.docx', url: '#' },
-      ];
-      this.executeDialog = true;
-    },
-    // 核准
-    examineRow(row, detail) {
-      this.subTitle = '核准';
-      this.detailForm = detail;
-      this.executeForm = row;
-      // 模拟加载已有附件
-      this.existingFiles = [
-        { name: '项目计划书.pdf', url: '#' },
-        { name: '进度报告.docx', url: '#' },
-        { name: '验收单.xlsx', url: '#' },
-      ];
-      this.executeDialog = true;
-    },
-    // 下载附件
-    downloadFile(file) {
-      const link = document.createElement('a');
-      link.href = file.url;
-      link.download = file.name;
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-    // 删除已有附件
-    removeExistingFile(index) {
-      this.$confirm('确定删除该附件?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          this.existingFiles.splice(index, 1);
-          this.$message.success('删除成功');
-        })
-        .catch(() => {});
+
+    // 发送审核
+    sendReview(row) {
+      this.reviewUserShow = true;
+      this.rowItem = row;
+
     },
     searchReset() {
       this.query = {};
@@ -443,9 +363,9 @@ export default {
       this.loading = true;
       getProcessList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
         res => {
-          // this.data = res.data.data.records;
           const records = res.data.data.records;
           this.data = records.map(item => {
+            item.approvalStatus = item.approvalStatus + '';
             if (item.stoneList && Array.isArray(item.stoneList)) {
               item.stoneList = item.stoneList.map(stone => ({
                 ...stone,
diff --git a/src/views/flowManagement/milestoneDialog.vue b/src/views/flowManagement/milestoneDialog.vue
index b25f94cc..ca9661ce 100644
--- a/src/views/flowManagement/milestoneDialog.vue
+++ b/src/views/flowManagement/milestoneDialog.vue
@@ -1,12 +1,5 @@
 <template>
-  <el-dialog
-    :title="title"
-    append-to-body
-    :modelValue="openShow"
-    width="80%"
-    @close="closeDialog"
-    fullscreen
-  >
+  <el-dialog :title="title" append-to-body :modelValue="openShow" width="80%" @close="closeDialog" fullscreen>
     <el-form :model="detailForm" :rules="executeRules" ref="executeForm" label-width="100">
       <el-row>
         <el-col :span="6">
@@ -51,100 +44,46 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="执行类型:" prop="executeType">
-            <el-select
-              :disabled="subTitle == '核查' || subTitle == '核准'"
-              v-model="detailForm.executeType"
-              @change="executeTypeChange"
-              filterable
-    clearable
-            >
-              <el-option
-                v-for="(item, index) in executeResultList"
-                :label="item.dictValue"
-                :value="item.dictKey"
-              ></el-option>
+            <el-select :disabled="subTitle == '核查' || subTitle == '核准'" v-model="detailForm.executeType"
+              @change="executeTypeChange" filterable clearable>
+              <el-option v-for="(item, index) in executeResultList" :label="item.dictValue"
+                :value="item.dictKey"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="延期时间:" v-if="detailForm.executeType == 1">
-            <el-date-picker
-              :disabled="subTitle == '核查' || subTitle == '核准'"
-              style="width: 100%"
-              v-model="detailForm.delayTime"
-              type="date"
-              placeholder="选择日期时间"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            />
+            <el-date-picker :disabled="subTitle == '核查' || subTitle == '核准'" style="width: 100%"
+              v-model="detailForm.delayTime" type="date" placeholder="选择日期时间" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="里程碑描述:" prop="milestoneMemo">
-            <el-input
-              :disabled="subTitle == '核查' || subTitle == '核准'"
-              type="textarea"
-              v-model="detailForm.milestoneMemo"
-            ></el-input>
+            <el-input :disabled="subTitle == '核查' || subTitle == '核准'" type="textarea"
+              v-model="detailForm.milestoneMemo"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="里程碑进展:" prop="evolve">
-            <el-input
-              :disabled="subTitle == '核查' || subTitle == '核准'"
-              type="textarea"
-              v-model="detailForm.evolve"
-            ></el-input>
+            <el-input :disabled="subTitle == '核查' || subTitle == '核准'" type="textarea"
+              v-model="detailForm.evolve"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="下一步计划:" prop="lastPlan">
-            <el-input
-              :disabled="subTitle == '核查' || subTitle == '核准'"
-              type="textarea"
-              v-model="detailForm.lastPlan"
-            ></el-input>
+            <el-input :disabled="subTitle == '核查' || subTitle == '核准'" type="textarea"
+              v-model="detailForm.lastPlan"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item
-            label="附件:"
-            v-if="subTitle == '执行' || subTitle == '核查' || subTitle == '核准'"
-            prop="attachList"
-          >
-            <!-- <el-upload
-              class="upload-demo"
-              action="https://jsonplaceholder.typicode.com/posts/"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :before-remove="beforeRemove"
-              multiple
-              :limit="3"
-              :on-exceed="handleExceed"
-              :file-list="fileList"
-            >
-              <el-button type="primary">点击上传</el-button>
-              <div>不能上传 exe 附件，且不超过 20M</div>
-            </el-upload> -->
-            <el-upload
-              class="upload-demo"
-              action="/api/blade-resource/oss/endpoint/put-file-attach"
-              :on-success="handleSuccess"
-              :on-remove="handleRemove"
-              multiple
-              :limit="1"
-              :on-exceed="handleExceed"
-              :file-list="fileList"
-              accept=".pdf,.doc,.docx"
-              v-if="subTitle == '执行'"
-            >
+          <el-form-item label="附件:" v-if="subTitle == '执行' || subTitle == '核查' || subTitle == '核准'" prop="attachList">
+            <el-upload class="upload-demo" action="/api/blade-resource/oss/endpoint/put-file-attach"
+              :on-success="handleSuccess" :on-remove="handleRemove" multiple :limit="1" :on-exceed="handleExceed"
+              :file-list="fileList" accept=".pdf,.doc,.docx" v-if="subTitle == '执行'">
               <div>
                 <el-button type="primary">点击上传</el-button>
-                <div
-                 
-                  slot="tip"
-                  class="el-upload__tip"
-                >
+                <div slot="tip" class="el-upload__tip">
                   支持扩展名:.pdf.doc.docx
                 </div>
               </div>
@@ -155,61 +94,41 @@
               <ul>
                 <li v-for="(file, index) in existingFiles" :key="index">
                   <a href="javascript:void(0)" @click="downloadFile(file)">{{ file.name }}</a>
-                  <!-- <el-button type="text" size="small" @click="removeExistingFile(index)"
-                    >删除</el-button
-                  > -->
                 </li>
               </ul>
             </div>
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item label="核查人:" v-if="subTitle == '执行'">
-            <jhSelect
-              :value="detailForm.userId"
-              @input="val => (detailForm.userId = val)"
-              placeholder="请搜索选择"
-              api-url="/blade-system/user/page"
-              echo-api="/blade-system/user/page"
-              echoParamsKey="ids"
-              echo-method="get"
-              api-method="get"
-              list-key="records"
-              total-key="total"
-              label-key="realName"
-              value-key="id"
-              search-key="id"
-              :debounce-time="500"
-              @change="handleUserChange"
-            />
+          <el-form-item label="核查人:" v-if="subTitle == '执行'" prop="userId">
+            <el-select v-model="detailForm.userId" placeholder="请选择" style="width: 100%" filterable clearable  @change="val=>userIdChange(val)">
+              <el-option v-for="item in usersRoleList" :key="item.id" :value="item.id"
+                :label="item.realName"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item label="核查结果:" v-if="subTitle == '核查'">
+          <el-form-item label="核查结果:" v-if="subTitle == '核查'" prop="checkResult">
             <el-select v-model="detailForm.checkResult" clearable filterable>
               <el-option label="通过" value="2"></el-option>
               <el-option label="不通过" value="3"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="14">
+          <el-form-item label="核准人:" v-if="subTitle == '核查'" prop="hz_userId">
+            <el-select v-model="detailForm.hz_userId" placeholder="请选择" style="width: 100%" filterable clearable @change="hz_userIdChange">
+              <el-option v-for="item in usersRoleList_hz" :key="item.id" :value="item.id"
+                :label="item.realName"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="14">
           <el-form-item label="审核人:" v-if="subTitle == '核查' && detailForm.checkResult == 1">
-            <jhSelect
-              :value="detailForm.userId"
-              @input="val => (detailForm.userId = val)"
-              placeholder="请搜索选择"
-              api-url="/blade-system/user/page"
-              echo-api="/blade-system/user/page"
-              echoParamsKey="ids"
-              echo-method="get"
-              api-method="get"
-              list-key="records"
-              total-key="total"
-              label-key="realName"
-              value-key="id"
-              search-key="id"
-              :debounce-time="500"
-            />
+            <jhSelect :value="detailForm.userId" @input="val => (detailForm.userId = val)" placeholder="请搜索选择"
+              api-url="/blade-system/user/page" echo-api="/blade-system/user/page" echoParamsKey="ids" echo-method="get"
+              api-method="get" list-key="records" total-key="total" label-key="realName" value-key="id" search-key="id"
+              :debounce-time="500" />
           </el-form-item>
         </el-col>
         <div v-if="subTitle == '核准'" style="color: #ffc300; margin-bottom: 10px">
@@ -226,17 +145,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item
-            label="审核意见:"
-            prop="checkOpinion"
-            label-width="80px"
-            v-if="subTitle == '核准'"
-          >
-            <el-input
-              type="textarea"
-              placeholder="请输入审核意见"
-              v-model="detailForm.checkOpinion"
-            ></el-input>
+          <el-form-item label="审核意见:" prop="checkOpinion" label-width="80px" v-if="subTitle == '核准'">
+            <el-input type="textarea" placeholder="请输入审核意见" v-model="detailForm.checkOpinion"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -257,6 +167,7 @@ import {
   projectCheck,
   projectApprove,
   getProcessDetail,
+  getUsersByNodeCode
 } from '@/api/flowManagement/index';
 import { getDictionary } from '@/api/system/dict';
 import jhSelect from '@/components/jh-select/index.vue';
@@ -286,57 +197,106 @@ export default {
       openShow: false,
       memberList: [],
       executeForm: {
-        attachList:[]
+        attachList: []
       },
       executeRules: {
         executeType: [{ required: true, message: '请选择执行类型', trigger: 'blur' }],
         milestoneMemo: [{ required: true, message: '请填写里程碑描述', trigger: 'blur' }],
         evolve: [{ required: true, message: '请填写里程碑进展', trigger: 'blur' }],
         lastPlan: [{ required: true, message: '请填写下一步计划', trigger: 'blur' }],
-        attachList: [
-          {required: true,
-            validator: (rule, value, callback) => {
-              // 如果 subTitle 是 '执行'，则附件必填
-              if (this.subTitle === '执行') {
-                // 检查 fileList 是否为空
-                if (!this.fileList || this.fileList.length === 0) {
-                  callback(new Error('请上传附件'));
-                } else {
-                  callback();
-                }
-              } else {
-                // 其他状态可选填或不校验
-                callback();
-              }
-            },
+        // attachList: [
+        //   {
+        //     required: true,
+        //     validator: (rule, value, callback) => {
+        //       // 如果 subTitle 是 '执行'，则附件必填
+        //       if (this.subTitle === '执行') {
+        //         // 检查 fileList 是否为空
+        //         if (!this.fileList || this.fileList.length === 0) {
+        //           callback(new Error('请上传附件'));
+        //         } else {
+        //           callback();
+        //         }
+        //       } else {
+        //         // 其他状态可选填或不校验
+        //         callback();
+        //       }
+        //     },
+        //     trigger: 'change',
+        //   },
+        // ],
+        userId: [
+          {
+            required: true,
+            message: '请选择核查人',
+            trigger: 'change',
+          },
+        ],
+        checkResult: [
+          {
+            required: true,
+            message: '请选择审核结果',
+            trigger: 'change',
+          },
+        ],
+        hz_userId: [
+          {
+            required: true,
+            message: '请选择核准人',
             trigger: 'change',
           },
         ],
       },
       subTitle: '',
       executeResultList: [],
-      fileList:[],
+      fileList: [],
+      usersRoleList: [],
+      usersRoleList_hz: []
     };
   },
   mounted() {
     this.openShow = this.showDialog;
-    // this.executeForm = this.rowItem;
-    // console.log(this.detailForm, 'title');
     this.detailForm.checkResult = null;
     this.subTitle = this.title;
     console.log(this.rowItem, 'rowItem');
     this.getRoleUserList();
     this.getExecuteResult();
     this.getDetails();
+    if (this.subTitle == '执行') {
+      this.getUsersByNodeCode()
+    }
+    if (this.subTitle == '核查') {
+      this.getUsersByNodeCode_hz()
+    }
   },
   methods: {
+    getUsersByNodeCode() {
+      getUsersByNodeCode({ nodeCode: 'EXECUTE_CHECK' }).then(res => {
+        this.usersRoleList = res.data.data;
+      })
+    },
+    getUsersByNodeCode_hz() {
+      getUsersByNodeCode({ nodeCode: 'CHECK_APPROVE' }).then(res => {
+        this.usersRoleList_hz = res.data.data;
+      })
+    },
+    userIdChange(val){
+      this.detailForm.nextApproverId = val
+      let select = this.usersRoleList.find(item => item.id === val)
+      this.detailForm.nextApproverName = select.realName
+       this.detailForm.checkMan = select.realName;
+    },
+    hz_userIdChange(val){
+      this.detailForm.nextApproverId = val
+      let select = this.usersRoleList_hz.find(item => item.id === val)
+      this.detailForm.nextApproverName = select.name
+    },
     handleRemove(file, fileList) {
       this.fileList = [];
     },
     handleSuccess(response, file, fileList) {
       console.log(response.data, 'response.data.link');
       // this.ruleForm.attachId = response.data.attachId;
-      
+
       this.fileList.push(response.data);
     },
     handleExceed(files, fileList) {
@@ -367,12 +327,7 @@ export default {
     executeTypeChange() {
       this.detailForm.delayTime = '';
     },
-    handleUserChange(value, item) {
-      if(item){
-        this.detailForm.checkMan = item.realName;
-      }
-      
-    },
+    
     getExecuteResult() {
       getDictionary({ code: 'flow_project_executeResult' }).then(res => {
         this.executeResultList = res.data.data;
@@ -392,22 +347,20 @@ export default {
       this.$refs.executeForm.validate(valid => {
         if (valid) {
           this.loadingShow = true;
-          //   this.executeDialog = false;
           if (this.title == '执行') {
             let query_ = {
               ...this.detailForm,
               fmProjectApplication: {
-                // ...this.executeForm,
                 id: this.executeForm.id,
               },
               attachList: this.fileList,
+              nextApproverId: this.detailForm.userId,
+              nextApproverName: this.detailForm.checkMan
             };
             query_.checkResult = 1;
-            // query_.fmProjectApplication.delayTime =
-            //   query_.fmProjectApplication.delayTime + ' 00:00:00';
-
             query_.delayTime = query_.delayTime == '' ? null : query_.delayTime + ' 00:00:00';
             query_.okTime = query_.okTime == '' ? null : query_.okTime;
+            console.log(query_, 'query_执行');
             projectExecute(query_)
               .then(res => {
                 this.$message.success('操作成功！');
@@ -422,17 +375,9 @@ export default {
             let query_ = {
               ...this.detailForm,
               fmProjectApplication: {
-                // ...this.executeForm,
                 id: this.executeForm.id,
               },
-              // attachList: this.existingFiles,
             };
-            // if (query_.checkResult == 2) {
-            //   query_.fmProjectApplication.approvalStatus = 6;
-            // }
-            // if (query_.checkResult == 3) {
-            //   query_.fmProjectApplication.approvalStatus = 5;
-            // }
             projectCheck(query_)
               .then(res => {
                 this.$message.success('操作成功！');
@@ -447,7 +392,6 @@ export default {
             let query_ = {
               ...this.detailForm,
               fmProjectApplication: {
-                // ...this.executeForm,
                 id: this.executeForm.id,
               },
             };
diff --git a/src/views/flowManagement/projectExecution.vue b/src/views/flowManagement/projectExecution.vue
index e67d25d4..53da873d 100644
--- a/src/views/flowManagement/projectExecution.vue
+++ b/src/views/flowManagement/projectExecution.vue
@@ -86,9 +86,7 @@
         </span>
         <span v-else></span>
       </template>
-      <!-- <template #executeType="scope">
-        {{ scope.row.executeTypeText }}
-      </template> -->
+    
     </avue-crud>
     <!-- 新增弹窗 -->
     <add-dialog
@@ -195,7 +193,7 @@ export default {
             label: '项目编号',
             prop: 'paCode',
             overflow: true,
-            search: true,
+            search: false,
             sortable: 'custom',
             width: 140,
           },
@@ -246,8 +244,14 @@ export default {
             search: true,
             sortable: 'custom',
             width: 120,
+            type:'date',
+            searchRange:true,
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            searchOrder:11,
           },
-
           {
             label: '项目开始时间',
             prop: 'projectStartTime',
@@ -266,11 +270,16 @@ export default {
           },
           {
             label: '执行类型',
-            prop: 'executeTypeText',
+            prop: 'executeType',
             overflow: true,
-            search: true,
-            // sortable: 'custom',
+            search: false,
             width: 140,
+            type: 'select',
+            dicUrl: '/blade-system/dict/dictionary?code=flow_project_executeResult',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
             label: '延期时间',
@@ -284,8 +293,7 @@ export default {
             label: '核查结果',
             prop: 'checkResultTitle',
             overflow: true,
-            search: true,
-            // sortable: 'custom',
+            search: false,
             width: 140,
           },
           {
@@ -300,7 +308,7 @@ export default {
             label: '评价等级',
             prop: 'gradeTitle',
             overflow: true,
-            search: true,
+            search: false,
             // sortable: 'custom',
             width: 140,
           },
@@ -348,13 +356,13 @@ export default {
       console.log('item', item);
       return item ? item.dictValue : '';
     },
-    // 获取执行类型  flow_project_executeResult
+    // 获取执行类型  
     getExecuteResult() {
       getDictionary({ code: 'flow_project_executeResult' }).then(res => {
         this.executeResultList = res.data.data;
       });
     },
-    // 核查结果 flow_project_checkResult
+    // 核查结果
     getCheckResult() {
       getDictionary({ code: 'flow_project_checkResult' }).then(res => {
         this.checkResultList = res.data;
@@ -496,6 +504,11 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      if(!! params.milestoneNode){
+        params.milestoneNodeStart = params.milestoneNode[0];
+        params.milestoneNodeEnd = params.milestoneNode[1];
+        delete params.milestoneNode;
+      }
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const records = res.data.data.records;
         this.data = records;
diff --git a/src/views/flowManagement/review.vue b/src/views/flowManagement/review.vue
index 49b6b637..9334a368 100644
--- a/src/views/flowManagement/review.vue
+++ b/src/views/flowManagement/review.vue
@@ -13,6 +13,7 @@
 <script>
 import {
   updateProcess,
+  approval
 } from '../../api/flowManagement/index';
 export default {
   props: {
@@ -61,7 +62,7 @@ export default {
         id:this.rowItem.id,
         approvalStatus:this.form.status
       }
-      updateProcess(query).then(res=>{
+      approval(query).then(res=>{
         this.$message.success('操作成功')
         this.closeDialog(true)
       })