diff --git a/src/api/flowManagement/index.js b/src/api/flowManagement/index.js
index 7c5cf06..4719009 100644
--- a/src/api/flowManagement/index.js
+++ b/src/api/flowManagement/index.js
@@ -28,7 +28,7 @@ export const delProcess = (data) => {
     return request({
         url: '/blade-desk/fmProjectApplication/remove',
         method: 'post',
-        params:data
+        params: data
     });
 }
 
@@ -96,3 +96,17 @@ export const projectApprove = (data) => {
 
 
 // 项目审核  
+
+
+// 制单部门  depl/list
+export const getDeplList = (current, size, params) => {
+    return request({
+        url: '/blade-system/dept/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        },
+    });
+};
diff --git a/src/api/processManagement/inPlantProcess.js b/src/api/processManagement/inPlantProcess.js
index 76de594..dbef600 100644
--- a/src/api/processManagement/inPlantProcess.js
+++ b/src/api/processManagement/inPlantProcess.js
@@ -20,3 +20,12 @@ export const submitBatchData = (data)=>{
     data:data
   });
 }
+
+// 处理查看详情 dsTaskBill/listFillingDetail
+export const getDetail = (params)=>{
+  return request({
+    url: '/blade-desk/dsTaskBill/detail',
+    method: 'get',
+    params: params
+  });
+}
diff --git a/src/views/flowManagement/addDialog.vue b/src/views/flowManagement/addDialog.vue
index bf72f0d..eef2b3e 100644
--- a/src/views/flowManagement/addDialog.vue
+++ b/src/views/flowManagement/addDialog.vue
@@ -5,6 +5,7 @@
     :model-value="openShow"
     width="80%"
     @close="handleClose"
+    fullscreen
   >
     <!-- 单个 Form 包裹所有内容（基础信息 + 表格） -->
     <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="140px">
@@ -27,10 +28,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="制单部门" prop="touchingDept">
-            <el-select :disabled="isDetail" v-model="addForm.touchingDept" clearable filterable>
-              <el-option label="化学镀镍一班崔胜伟" value="61"></el-option>
-              <el-option label="部门二" value="62"></el-option>
+          <el-form-item label="制单部门" prop="touchingDeptId">
+            <el-select
+              :disabled="isDetail"
+              v-model="addForm.touchingDeptId"
+              clearable
+              filterable
+              @change="handleChange('touchingDeptId')"
+            >
+              <el-option
+                v-for="(item, index) in deplList"
+                :label="item.deptName"
+                :value="item.id"
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -70,8 +80,14 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="项目负责人" prop="projectHead">
-            <el-select :disabled="isDetail" v-model="addForm.projectHead" clearable filterable>
+          <el-form-item label="项目负责人" prop="projectHeadId">
+            <el-select
+              :disabled="isDetail"
+              v-model="addForm.projectHeadId"
+              clearable
+              filterable
+              @change="handleChange('projectHeadId')"
+            >
               <el-option
                 v-for="item in memberList"
                 :label="item.realName"
@@ -124,8 +140,8 @@
               v-model="addForm.projectStartTime"
               type="date"
               placeholder="选择日期"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             >
             </el-date-picker>
           </el-form-item>
@@ -138,8 +154,8 @@
               v-model="addForm.projectDesiredEnd"
               type="date"
               placeholder="选择日期"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             ></el-date-picker>
           </el-form-item>
         </el-col>
@@ -352,9 +368,10 @@
 </template>
 
 <script>
-import { addProcess, getProcessDetail } from '@/api/flowManagement/index';
+import { addProcess, getProcessDetail, getDeplList } from '@/api/flowManagement/index';
 import { getRoleUserList } from '@/api/processManagement/taskDispatch';
 import { getDictionary } from '@/api/system/dict';
+
 export default {
   name: 'AddDialog',
   props: {
@@ -387,7 +404,7 @@ export default {
         ],
         projectTarget: [{ required: true, message: '请填写项目目标', trigger: ['blur', 'submit'] }],
         desiredResult: [{ required: true, message: '请填写预期效果', trigger: ['blur', 'submit'] }],
-        projectHead: [
+        projectHeadId: [
           { required: true, message: '请选择项目负责人', trigger: ['change', 'submit'] },
         ],
         memberName: [{ required: true, message: '请选择成员名称', trigger: ['change', 'submit'] }],
@@ -435,10 +452,11 @@ export default {
       },
       memberList: [], //人员列表
       projectType: [], //项目类型
+      deplList: [], //部门列表
       openShow: false,
-      addForm:{
-        stoneList:[]
-      }
+      addForm: {
+        stoneList: [],
+      },
     };
   },
   computed: {
@@ -451,11 +469,31 @@ export default {
     this.openShow = this.visible;
     this.getRoleUserList();
     this.getDictionary();
+    this.getDeplList();
     if (this.title === '详情' || this.title === '修改') {
       this.getDetails();
     }
   },
   methods: {
+    handleChange(type) {
+      // 制单部门
+      if (type == 'touchingDeptId') {
+        let sel = this.deplList.filter(item => item.id == this.addForm.touchingDeptId)[0];
+        this.addForm.touchingDept = sel.deptName;
+      }
+      // 项目负责人
+      if (type == 'projectHeadId') {
+        let sel = this.memberList.filter(item => item.id == this.addForm.projectHeadId)[0];
+        this.addForm.projectHead = sel.realName;
+      }
+    },
+    // 获取部门列表
+    getDeplList() {
+      getDeplList().then(res => {
+        // console.log(res.data.data, 'res');
+        this.deplList = res.data.data;
+      });
+    },
     // 获取人员
     getRoleUserList() {
       getRoleUserList({ size: 999999, current: 1 }).then(res => {
@@ -471,7 +509,7 @@ export default {
     // 获取详情数据
     getDetails() {
       getProcessDetail(this.rowItem.id).then(res => {
-        console.log(res.data.data,'res'); 
+        console.log(res.data.data, 'res');
         this.addForm = res.data.data;
         // 安全地处理 memberName 回显
         if (res.data.data.memberName) {
@@ -558,6 +596,9 @@ export default {
     // 提交
     async handleSubmitForm() {
       this.formError = '';
+      if (this.addForm.stoneList.length === 0) {
+        return this.$message.error('立项申请数据不能为空！');
+      }
       this.$refs.addForm.validate((isValid, invalidFields) => {
         if (!isValid) {
           this.formError = '存在未完善的字段，请检查红色提示';
@@ -570,6 +611,8 @@ export default {
           return;
         }
         const submitData = this.formatSubmitData(this.addForm);
+        submitData.projectStartTime = submitData.projectStartTime + ' 00:00:00';
+        submitData.projectDesiredEnd = submitData.projectDesiredEnd + ' 00:00:00';
         if (this.title === '详情') {
           updateProcess({ ...submitDat, approvalStatus: 1 }).then(res => {
             this.$message.success('修改成功');
diff --git a/src/views/flowManagement/managementOfKeyTasks.vue b/src/views/flowManagement/managementOfKeyTasks.vue
index e3f0930..1f5b39f 100644
--- a/src/views/flowManagement/managementOfKeyTasks.vue
+++ b/src/views/flowManagement/managementOfKeyTasks.vue
@@ -39,50 +39,65 @@
       </template>
       <!-- 列表嵌套表格 -->
       <template #expand="{ row }">
-        <el-table :data="row.stoneList">
+        <el-table :data="row.stoneList" size="small" style="padding: 5px">
           <el-table-column label="里程碑计划" align="center" prop="milestonePlan"></el-table-column>
           <el-table-column
             label="里程碑负责人"
             align="center"
             prop="milestoneMan"
+            width="100"
           ></el-table-column>
           <el-table-column
             label="里程碑输出物"
             align="center"
             prop="outputMaterial"
+            width="100"
           ></el-table-column>
-          <el-table-column
-            label="里程碑节点"
-            width="200"
-            align="center"
-            prop="milestoneNode"
-          ></el-table-column>
-          <el-table-column align="center" label="执行类型" prop="executeType"></el-table-column>
-          <el-table-column align="center" label="状态" prop="statusTitle"></el-table-column>
+          <el-table-column label="里程碑节点" width="110" align="center" prop="milestoneNode">
+            <template #default="scope">
+              {{ scope.row.milestoneNode ? scope.row.milestoneNode.substring(0, 10) : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="执行类型" prop="executeType"> </el-table-column>
+          <!-- <el-table-column align="center" label="状态" prop="status"></el-table-column> -->
           <el-table-column align="center" label="延期时间" prop="delayTime"></el-table-column>
           <el-table-column
             align="center"
             label="核查结果"
             prop="checkResultTitle"
           ></el-table-column>
-          <el-table-column align="center" label="核查人" prop="checkMan.userName"></el-table-column>
+          <el-table-column align="center" label="核查人" prop="checkMan"></el-table-column>
           <el-table-column align="center" label="评价等级" prop="gradeTitle"></el-table-column>
-          <el-table-column align="center" label="评价人" prop="gradeMan.userName"></el-table-column>
-          <el-table-column align="center" label="业务领导评价" prop="evaluate"></el-table-column>
+          <el-table-column align="center" label="评价人" prop="gradeMan"></el-table-column>
+          <el-table-column
+            align="center"
+            label="业务领导评价"
+            width="150"
+            prop="evaluate"
+          ></el-table-column>
           <el-table-column label="操作">
             <template #default="scope">
+              <!-- -->
               <el-button
                 type="text"
-                v-if="scope.row.status == 3"
+                v-if="row.approvalStatus == 3 && scope.row.checkResult == 0"
                 @click="executeRow(row, scope.row)"
                 >执行</el-button
               >
-              <el-button type="text" v-if="scope.row.status == 4" @click="auditRow(row, scope.row)"
+              <!--  -->
+              <el-button
+                type="text"
+                v-if="
+                  (row.approvalStatus == 3 && (scope.row.checkResult == 1) ||
+                  scope.row.checkResult == 3)
+                "
+                @click="auditRow(row, scope.row)"
                 >核查</el-button
               >
+              <!--  -->
               <el-button
                 type="text"
-                v-if="scope.row.status == 6"
+                v-if="row.approvalStatus == 3 && scope.row.checkResult == 2"
                 @click="examineRow(row, scope.row)"
                 >核准</el-button
               >
@@ -99,6 +114,7 @@
       :rowItem="rowItem"
       @close="closeDialog"
     ></add-dialog>
+
     <!-- 审核弹窗 -->
     <review
       v-if="checkDialog"
@@ -108,8 +124,14 @@
     ></review>
 
     <!-- 执行/核查/核准弹窗 -->
-    <milestoneDialog :title="subTitle" :showDialog='executeDialog' v-if="executeDialog" @closeDialog="closeDialog" :rowItem="detailForm"></milestoneDialog>
-
+    <milestoneDialog
+      :title="subTitle"
+      :showDialog="executeDialog"
+      v-if="executeDialog"
+      @closeDialog="closeDialog"
+      :rowItem="executeForm"
+      :detailForm="detailForm"
+    ></milestoneDialog>
   </basic-container>
 </template>
 
@@ -123,8 +145,9 @@ import {
 import AddDialog from './addDialog.vue';
 import review from './review.vue';
 import milestoneDialog from './milestoneDialog.vue';
+import { getDictionary } from '@/api/system/dict';
 export default {
-  components: { AddDialog, review,milestoneDialog },
+  components: { AddDialog, review, milestoneDialog },
   data() {
     return {
       // 状态
@@ -216,18 +239,21 @@ export default {
             overflow: true,
             search: true,
             searchLabelWidth: 100,
+            width: 100,
           },
           {
             label: '项目开始时间',
             prop: 'projectStartTime',
             overflow: true,
             search: false,
+            width: 110,
           },
           {
             label: '项目预期结束时间',
             prop: 'projectDesiredEnd',
             overflow: true,
             search: false,
+            width: 140,
           },
           {
             label: '制单人',
@@ -265,21 +291,46 @@ export default {
         ],
       },
       rowItem: {}, //存储每一行的数据
+      executeResultList: [], //执行结果
+      checkResultList: [], //核查结果
+      gradeList: [], //评价等级
     };
   },
-  mounted() {},
+  mounted() {
+    this.getExecuteResult();
+  },
   methods: {
+    // 获取执行类型  flow_project_executeResult
+    getExecuteResult() {
+      getDictionary({ code: 'flow_project_executeResult' }).then(res => {
+        this.executeResultList = res.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 => {
+        this.gradeList = res.data;
+      });
+    },
+
     closeDialog(type) {
       this.checkDialog = false;
-      this.addDialogVisible = false
-      this.executeDialog = false
-      if (type) {
-        this.onLoad(this.page, this.query);
-      }
+      this.addDialogVisible = false;
+      this.executeDialog = false;
+      // if (type) {
+      this.onLoad(this.page, this.query);
+      // }
     },
     handleAdd() {
       this.title = '新增';
-       this.rowItem = {}
+      this.rowItem = {};
       this.addDialogVisible = true;
     },
     // 查看详情
@@ -330,14 +381,16 @@ export default {
     },
     // 执行
     executeRow(row, detail) {
-      this.detailForm = row;
+      this.detailForm = detail;
+      this.executeForm = row;
       this.subTitle = '执行';
       this.executeDialog = true;
     },
     // 核查
     auditRow(row, detail) {
       this.subTitle = '核查';
-      this.detailForm = row;
+      this.detailForm = detail;
+      this.executeForm = row;
       // 模拟加载已有附件
       this.existingFiles = [
         { name: '项目计划书.pdf', url: '#' },
@@ -348,7 +401,8 @@ export default {
     // 核准
     examineRow(row, detail) {
       this.subTitle = '核准';
-      this.detailForm = row;
+      this.detailForm = detail;
+      this.executeForm = row;
       // 模拟加载已有附件
       this.existingFiles = [
         { name: '项目计划书.pdf', url: '#' },
diff --git a/src/views/flowManagement/milestoneDialog.vue b/src/views/flowManagement/milestoneDialog.vue
index 75026d0..8d8f188 100644
--- a/src/views/flowManagement/milestoneDialog.vue
+++ b/src/views/flowManagement/milestoneDialog.vue
@@ -1,138 +1,197 @@
 <template>
-  <el-dialog :title="title" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
-    <el-form :model="executeForm" :rules="executeRules" ref="executeForm" label-width="100">
-      <el-form-item label="项目名称">
-        <el-input disabled v-model="detailForm.projectName"></el-input>
-      </el-form-item>
-      <el-form-item label="项目负责人">
-        <el-input disabled v-model="detailForm.projectHead.userName"></el-input>
-      </el-form-item>
-      <el-form-item label="里程碑计划">
-        <el-input disabled v-model="executeForm.milestonePlan"></el-input>
-      </el-form-item>
-      <el-form-item label="里程碑负责人">
-        <el-input disabled v-model="executeForm.milestoneMan.userName"></el-input>
-      </el-form-item>
-      <el-form-item label="项目目标">
-        <el-input disabled v-model="executeForm.fmProjectApplication.projectTarget"></el-input>
-      </el-form-item>
-      <el-form-item label="预期效果">
-        <el-input disabled v-model="executeForm.fmProjectApplication.desiredResult"></el-input>
-      </el-form-item>
-      <el-form-item label="项目背景">
-        <el-input disabled v-model="executeForm.fmProjectApplication.projectBackcloth"></el-input>
-      </el-form-item>
-      <el-form-item label="里程碑节点">
-        <el-input disabled v-model="executeForm.milestoneNode"></el-input>
-      </el-form-item>
-      <el-form-item label="执行类型" prop="executeResult">
-        <el-select
-          :disabled="subTitle == '核查' || subTitle == '核准'"
-          v-model="executeForm.executeResult"
-        >
-          <el-option label="延期" :value="1"></el-option>
-          <el-option label="终止" :value="2"></el-option>
-          <el-option label="完成" :value="3"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="延期时间" v-if="executeForm.executeResult == 1">
-        <el-date-picker
-          :disabled="subTitle == '核查' || subTitle == '核准'"
-          style="width: 100%"
-          v-model="executeForm.delayTime"
-          type="datetime"
-          placeholder="选择日期时间"
-        />
-      </el-form-item>
-      <el-form-item label="里程碑描述" prop="milestoneMemo">
-        <el-input
-          :disabled="subTitle == '核查' || subTitle == '核准'"
-          type="textarea"
-          v-model="executeForm.milestoneMemo"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="里程碑进展" prop="evolve">
-        <el-input
-          :disabled="subTitle == '核查' || subTitle == '核准'"
-          type="textarea"
-          v-model="executeForm.evolve"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="下一步计划" prop="lastPlan">
-        <el-input
-          :disabled="subTitle == '核查' || subTitle == '核准'"
-          type="textarea"
-          v-model="executeForm.lastPlan"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        label="附件"
-        v-if="subTitle == '执行' || subTitle == '核查' || subTitle == '核准'"
-      >
-        <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 size="small" type="primary">点击上传</el-button>
-          <div slot="tip" class="el-upload__tip">不能上传 exe 附件，且不超过 20M</div>
-        </el-upload>
-        <div v-if="subTitle == '核查' || subTitle == '核准'" class="attachment-list">
-          <h4>附件下载</h4>
-          <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>
+  <el-dialog :title="title" append-to-body :modelValue="openShow" width="45%" @close="closeDialog">
+    <el-form :model="detailForm" :rules="executeRules" ref="executeForm" label-width="100">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="项目名称：">
+            <el-input disabled v-model="executeForm.projectName"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目负责人：">
+            <el-input disabled v-model="executeForm.projectHead"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目背景：">
+            <el-input disabled v-model="executeForm.projectBackcloth"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目目标：">
+            <el-input disabled v-model="executeForm.projectTarget"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="预期效果:">
+            <el-input disabled v-model="executeForm.desiredResult"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="里程碑计划:">
+            <el-input disabled v-model="detailForm.milestonePlan"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="里程碑负责人:">
+            <el-input disabled v-model="detailForm.milestoneMan"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="里程碑节点:">
+            <el-input disabled v-model="detailForm.milestoneNode"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="执行类型:" prop="executeType">
+            <el-select
+              :disabled="subTitle == '核查' || subTitle == '核准'"
+              v-model="detailForm.executeType"
+            >
+              <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="12">
+          <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-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="里程碑描述:" prop="milestoneMemo">
+            <el-input
+              :disabled="subTitle == '核查' || subTitle == '核准'"
+              type="textarea"
+              v-model="detailForm.milestoneMemo"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="里程碑进展:" prop="evolve">
+            <el-input
+              :disabled="subTitle == '核查' || subTitle == '核准'"
+              type="textarea"
+              v-model="detailForm.evolve"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="下一步计划:" prop="lastPlan">
+            <el-input
+              :disabled="subTitle == '核查' || subTitle == '核准'"
+              type="textarea"
+              v-model="detailForm.lastPlan"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item
+            label="附件:"
+            v-if="subTitle == '执行' || subTitle == '核查' || subTitle == '核准'"
+          >
+            <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 size="small" type="primary">点击上传</el-button>
+              <div slot="tip" class="el-upload__tip">不能上传 exe 附件，且不超过 20M</div>
+            </el-upload>
+            <div v-if="subTitle == '核查' || subTitle == '核准'" class="attachment-list">
+              <h4>附件下载</h4>
+              <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="12">
+          <el-form-item label="核查人:" v-if="subTitle == '执行'">
+            <el-select v-model="detailForm.userId" clearable filterable>
+              <el-option
+                v-for="item in memberList"
+                :label="item.realName"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="核查结果:" v-if="subTitle == '核查'">
+            <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="24">
+          <el-form-item label="审核人:" v-if="subTitle == '核查' && detailForm.checkResult == 1">
+            <el-select v-model="detailForm.userId" clearable filterable>
+              <el-option
+                v-for="item in memberList"
+                :label="item.realName"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <div v-if="subTitle == '核准'" style="color: #ffc300; margin-bottom: 10px">
+          评价等级分为:优(95以上，节点推进超前、完成质量高)、良(85-95分，节点推进正常、质量较好)、中(75-84，节点推进轻微拖期，完成质量一般)、差(75以下，进展滞后，完成质量较差)
         </div>
-      </el-form-item>
-      <el-form-item label="核查人" v-if="subTitle == '执行'">
-        <el-select v-model="executeForm.userId">
-          <el-option v-for="item in memberList" :label="item.realName" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="核查结果" v-if="subTitle == '核查'">
-        <el-select v-model="executeForm.checkResult">
-          <el-option label="通过" value="1"></el-option>
-          <el-option label="不通过" value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="审核人" v-if="subTitle == '核查' && executeForm.checkResult == 1">
-        <el-select v-model="executeForm.userId">
-          <el-option v-for="item in memberList" :label="item.realName" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <div v-if="subTitle == '核准'" style="color: #ffc300; margin-bottom: 10px">
-        评价等级分为:优(95以上，节点推进超前、完成质量高)、良(85-95分，节点推进正常、质量较好)、中(75-84，节点推进轻微拖期，完成质量一般)、差(75以下，进展滞后，完成质量较差)
-      </div>
-      <el-form-item v-if="subTitle == '核准'" label="评价分数">
-        <el-input v-model="executeForm.score"></el-input>
-      </el-form-item>
-      <el-form-item v-if="subTitle == '核准'" label="评语">
-        <el-input type="textarea" v-model="executeForm.evaluate"></el-input>
-      </el-form-item>
-
-      <el-form-item label="审核意见" prop="checkOpinion" label-width="80px">
-        <el-input
-          type="textarea"
-          placeholder="请输入审核意见"
-          v-model="checkForm.checkOpinion"
-        ></el-input>
-      </el-form-item>
+        <el-col :span="24">
+          <el-form-item v-if="subTitle == '核准'" label="评价分数:">
+            <el-input v-model="detailForm.score"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item v-if="subTitle == '核准'" label="评语:">
+            <el-input type="textarea" v-model="detailForm.evaluate"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <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>
     </el-form>
+
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submitExecute">确 定</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
       </span>
     </template>
   </el-dialog>
@@ -140,6 +199,7 @@
 <script>
 import { getRoleUserList } from '@/api/processManagement/taskDispatch';
 import { projectExecute, projectCheck, projectApprove } from '@/api/flowManagement/index';
+import { getDictionary } from '@/api/system/dict';
 
 export default {
   props: {
@@ -155,6 +215,10 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    detailForm: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   data() {
     return {
@@ -162,19 +226,30 @@ export default {
       memberList: [],
       executeForm: {},
       executeRules: {
-        executeResult: [{ required: true, message: '请选择执行类型', trigger: 'blur' }],
+        executeType: [{ required: true, message: '请选择执行类型', trigger: 'blur' }],
         milestoneMemo: [{ required: true, message: '请填写里程碑描述', trigger: 'blur' }],
         evolve: [{ required: true, message: '请填写里程碑进展', trigger: 'blur' }],
         lastPlan: [{ required: true, message: '请填写下一步计划', trigger: 'blur' }],
       },
+      subTitle: '',
+      executeResultList: [],
     };
   },
   mounted() {
     this.openShow = this.showDialog;
     this.executeForm = this.rowItem;
+    console.log(this.detailForm, 'title');
+    this.subTitle = this.title;
+    console.log(this.rowItem, 'rowItem');
     this.getRoleUserList();
+    this.getExecuteResult();
   },
   methods: {
+    getExecuteResult() {
+      getDictionary({ code: 'flow_project_executeResult' }).then(res => {
+        this.executeResultList = res.data.data;
+      });
+    },
     // 获取人员
     getRoleUserList() {
       getRoleUserList({ size: 999999, current: 1 }).then(res => {
@@ -190,22 +265,69 @@ export default {
         if (valid) {
           //   this.executeDialog = false;
           if (this.title == '执行') {
-            projectExecute(this.executeForm).then(res => {
-              this.$message.success('执行成功');
+            this.executeForm.delayTime = this.executeForm.delayTime + ' 00:00:00';
+            let query_ = {
+              ...this.detailForm,
+              fmProjectApplication: {
+                ...this.executeForm,
+              },
+              attachList: this.existingFiles,
+            };
+            query_.checkResult = 1;
+            console.log(query_, 'query_');
+            projectExecute(query_).then(res => {
+              this.$message.success('操作成功！');
               this.closeDialog();
             });
           }
           if (this.title == '核查') {
-            projectCheck(this.executeForm).then(res => {
-              this.$message.success('执行成功');
+            let query_ = {
+              ...this.detailForm,
+              fmProjectApplication: {
+                ...this.executeForm,
+              },
+              // attachList: this.existingFiles,
+            };
+            if (query_.checkResult == 2) {
+              query_.fmProjectApplication.approvalStatus = 6;
+            }
+            if (query_.checkResult == 3) {
+              query_.fmProjectApplication.approvalStatus = 5;
+            }
+            console.log(query_, '核查query_');
+            projectCheck(query_).then(res => {
+              this.$message.success('操作成功！');
               this.closeDialog();
             });
           }
           if (this.title == '核准') {
-            projectApprove(this.executeForm).then(res => {
-              this.$message.success('执行成功');
-              this.closeDialog();
-            });
+            let query_ = {
+              ...this.detailForm,
+              fmProjectApplication: {
+                ...this.executeForm,
+              },
+              // attachList: this.existingFiles,
+            };
+            if (this.detailForm.score < 75) {
+              this.$confirm('评价分数小于75，需要打回待审核状态，确认是否继续?', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+              }).then(() => {
+                // return removePersonAbility(row.id);
+                query_.fmProjectApplication.approvalStatus = 7;
+                projectApprove(query_).then(res => {
+                  this.$message.success('操作成功！');
+                  this.closeDialog();
+                });
+              });
+            } else {
+              query_.fmProjectApplication.approvalStatus = 8;
+              projectApprove(query_).then(res => {
+                this.$message.success('操作成功！');
+                this.closeDialog();
+              });
+            }
           }
         }
       });
diff --git a/src/views/processManagement/components/inPlantProcessDetails.vue b/src/views/processManagement/components/inPlantProcessDetails.vue
new file mode 100644
index 0000000..081cf68
--- /dev/null
+++ b/src/views/processManagement/components/inPlantProcessDetails.vue
@@ -0,0 +1,142 @@
+<template>
+  <el-dialog title="详情" append-to-body :modelValue="openShow" width="40%" @close="closeDialog">
+    <!-- <avue-form :option="option"></avue-form> -->
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" @on-load="onLoad">
+      <template #menu-left> </template>
+      <template #menu-right> </template>
+      <template #menu="{ row }"> </template>
+
+      <template #heatTreat="scope"> </template>
+    </avue-crud>
+    <!-- <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </template> -->
+  </el-dialog>
+</template>
+<script>
+import { getDetail } from '@/api/processManagement/inPlantProcess';
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+    rowData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      openShow: false,
+      data: [],
+      loading: false,
+      option: {
+        columnSort: true,
+        tip: false,
+        // height: 'auto',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtnText: '修改',
+        labelWidth: 120,
+        menuWidth: 80,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: true,
+        searchShowBtn: false,
+        excelBtn: true,
+        showOverflowTooltip: true,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        gridBtn: false,
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        align: 'center',
+        header: false,
+        menu: false,
+        column: [
+          {
+            label: '事项',
+            prop: 'matter',
+            search: false,
+            sortable: true,
+            span: 12,
+          },
+          {
+            label: '描述',
+            prop: 'process',
+            search: false,
+            sortable: true,
+            span: 12,
+          },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+  },
+  methods: {
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog');
+    },
+    submit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          let params = {
+            id: this.$route.query.id,
+            approvalStatus: '',
+
+            // status: this.option.column[0].value,
+            // reason: this.option.column[1].value,
+          };
+          //   updateProcess(params).then((res) => {
+          //     if (res.code == 200) {
+          //       this.$message.success('操作成功');
+          //       this.closeDialog();
+          //     }
+          //   });
+        }
+      });
+    },
+    onLoad() {
+      this.loading = true;
+      getDetail({ busId: this.rowData.id }).then(res => {
+        this.data = res.data.data;
+        this.loading = false;
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep(.el-dialog .el-dialog__body) {
+  padding-bottom: 20px !important;
+  padding-left: 20px !important;
+  padding-right: 20px !important;
+}
+</style>
diff --git a/src/views/processManagement/inPlantProcess.vue b/src/views/processManagement/inPlantProcess.vue
index 20263ef..dd94114 100644
--- a/src/views/processManagement/inPlantProcess.vue
+++ b/src/views/processManagement/inPlantProcess.vue
@@ -7,13 +7,11 @@
       v-model="form"
       v-model:page="page"
       ref="crud"
-      @row-del="rowDel"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
       @current-change="currentChange"
       @size-change="sizeChange"
-      @refresh-change="refreshChange"
       @on-load="onLoad"
     >
       <template #menu-left>
@@ -22,9 +20,13 @@
       </template>
       <template #menu-right> </template>
       <template #menu="scope">
-        <el-button type="text" @click="handle(scope.row)">处理 </el-button>
+        <el-button type="text" @click="detailsView(scope.row)">详情 </el-button>
+        <el-button type="text" @click="handle(scope.row)" v-if="scope.row.tbStatus == 0"
+          >处理
+        </el-button>
       </template>
     </avue-crud>
+    <!-- 处理 -->
     <inPlantProcessHandle
       v-if="showHandle"
       :showDialog="showHandle"
@@ -32,16 +34,24 @@
       :rowData="rowData"
       @closeDialog="cancel()"
     ></inPlantProcessHandle>
+    <!-- 详情 -->
+    <inPlantProcessDetails
+      v-if="showDetails"
+      :showDialog="showDetails"
+      :rowData="rowData"
+      @closeDialog="cancel()"
+    ></inPlantProcessDetails>
   </basic-container>
 </template>
 <script>
 import { getList } from '@/api/processManagement/inPlantProcess.js';
 import inPlantProcessHandle from './components/inPlantProcessHandle.vue';
-
+import inPlantProcessDetails from './components/inPlantProcessDetails.vue';
 export default {
   name: 'inPlantProcess',
   components: {
     inPlantProcessHandle,
+    inPlantProcessDetails,
   },
   props: {},
 
@@ -74,7 +84,7 @@ export default {
         editBtnIcon: ' ',
         viewBtnText: '详情',
         labelWidth: 120,
-        menuWidth: 60,
+        menuWidth: 100,
         dialogWidth: 1040,
         dialogClickModal: false,
         searchEnter: true,
@@ -205,7 +215,7 @@ export default {
             headerAlign: 'center',
             align: 'center',
             type: 'select',
-            searchLabelWidth:50,
+            searchLabelWidth: 50,
             dicData: [
               {
                 value: 0,
@@ -238,9 +248,17 @@ export default {
       rowData: {},
       showHandle: false,
       moldAddMore: true,
+      showDetails: false,
     };
   },
   methods: {
+    // 查看详情
+    detailsView(row) {
+      console.log(row, 'row');
+      this.showDetails = true;
+      this.rowData = row;
+      this.moldAddMore = false;
+    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
@@ -258,6 +276,8 @@ export default {
     },
     cancel() {
       this.showHandle = false;
+      this.showDetails = false;
+
       this.onLoad(this.page, this.query);
     },
     // 重置