From c0397b4c0d433394e6bb7a171735e9c3e85f8c6e Mon Sep 17 00:00:00 2001
From: Jinyuanyuan <1197651512@qq.com>
Date: Wed, 24 Jul 2024 16:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/ApprovalPageModel.vue                | 14 +++++++++-----
 src/views/myWork/completed/index.vue               |  3 ++-
 src/views/myWork/inComplete/inComplete.data.ts     |  4 ++--
 src/views/myWork/inComplete/index.vue              |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
index d3bd11a..a7524a6 100644
--- a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
+++ b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
@@ -1,6 +1,5 @@
 <template>
-    <BasicModal v-bind="$attrs" @register="registerModal" width="1200px" :showOkBtn="false">
-        <initiatesProjectsApproval :record="record" @close="exit" v-if="record.stage=='creatProjectinfo'"/>
+    <BasicModal v-bind="$attrs" @register="registerModal" width="1200px" :showOkBtn="false" :title="processName">
         <uploadfileApproval :record="record" @close="exit"  v-if="record.stage=='supervisionFile'"/>
         <projectPlanApproval :record="record" @close="exit"  v-if="record.stage=='createPlaninfo'"/>
         <planFileApproval :record="record" @close="exit"  v-if="planfileNames.includes(record.stage)"/>
@@ -10,7 +9,7 @@
     </BasicModal>
 </template>
 <script lang="ts" name="ApprovalPageModel" setup>
-
+import {ref} from "vue"
 import { BasicModal, useModalInner } from '@/components/Modal';
 
 import initiatesProjectsApproval from "../initiatesProjectsApproval.vue"
@@ -20,15 +19,20 @@ import projectPlanApproval from '../projectPlanApproval.vue'
 import fieldChangeApproval from '../fieldChangeApproval.vue'
 import contractApproval from '../contractApproval.vue'
 import uploadURTfileApproval from '../uploadURTfileApproval.vue'
-const planfileNames = ["feasibilityReportPreparation","jointTechnicalReview","centralizedCheck","createPlaninfoFile"]
-const [registerModal, { closeModal }] = useModalInner();
+const planfileNames = ["feasibilityReportPreparation","jointTechnicalReview","centralizedCheck","createPlaninfoFile","bidDocumentsPreparation"]
+const [registerModal, { closeModal }] = useModalInner(init);
 defineProps(["record"])
+
+let processName= ref()
 let emit = defineEmits(["close"])
 function exit(){
     closeModal()
     console.log("ApprovalPageModel")
     emit("close")
 }
+function init(initData){
+    processName.value=initData.record.processName
+}
 
 </script>
 <style></style>
diff --git a/src/views/myWork/completed/index.vue b/src/views/myWork/completed/index.vue
index 5c71ac1..fd7537c 100644
--- a/src/views/myWork/completed/index.vue
+++ b/src/views/myWork/completed/index.vue
@@ -66,7 +66,8 @@ function handleEdit(record) {
   record.procesType="1" //流程类型， 已办是1  代办是0
   //openApprovePage(record,router);
   rowData.value =record
-  openModal(true)
+  console.log("recordrecord",record)
+  openModal(true,{record:record})
 }
 function exit(){
   console.log("fatheer")
diff --git a/src/views/myWork/inComplete/inComplete.data.ts b/src/views/myWork/inComplete/inComplete.data.ts
index 3da918d..506705f 100644
--- a/src/views/myWork/inComplete/inComplete.data.ts
+++ b/src/views/myWork/inComplete/inComplete.data.ts
@@ -46,8 +46,8 @@ export const columns: BasicColumn[] = [
     dataIndex: 'taskName',
   },
   {
-    title: '节点id',
-    dataIndex: 'taskId',
+    title: '所属流程',
+    dataIndex: 'processName',
     width: 150,
   },
   {
diff --git a/src/views/myWork/inComplete/index.vue b/src/views/myWork/inComplete/index.vue
index f896700..03b392c 100644
--- a/src/views/myWork/inComplete/index.vue
+++ b/src/views/myWork/inComplete/index.vue
@@ -56,7 +56,7 @@ function getTableAction(record): ActionItem[] {
 function handleEdit(record) {
   record.procesType="0" //流程类型， 已办是1  代办是0Object.assign({}, xiaoming, {test1:'demo1', test2:'demo2'}); // 第一个参数是 目标对象，后面的全是源对象，执行完之后返回目标对象
   rowData.value =record
-  openModal(true)
+  openModal(true,{record:record})
 }
 function exit(){
   console.log("fatheer")