From ff1a63ac1ac20c48cecbc5ad8e8ee38fd16de628 Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Fri, 26 Apr 2024 14:50:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E8=AE=AF=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/addressBook/address/address.data.ts | 16 +++++----------
 .../projectArchive/SubmitProjectArchive.vue   |  9 +--------
 .../projectPlan/planinfoFileDetail.vue        | 14 ++++++++-----
 .../projectLib/projectPlan/viewPlanDetail.vue | 20 +++++++++----------
 4 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/src/views/addressBook/address/address.data.ts b/src/views/addressBook/address/address.data.ts
index c6f1cd3..e277955 100644
--- a/src/views/addressBook/address/address.data.ts
+++ b/src/views/addressBook/address/address.data.ts
@@ -48,15 +48,9 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     //colProps: { span: 6 },
   },
-  // {
-  //   label: '',
-  //   field: 'status',
-  //   component: 'JDictSelectTag',
-  //   componentProps: {
-  //     dictCode: 'user_status',
-  //     placeholder: '请选择状态',
-  //     stringToNumber: true,
-  //   },
-  //  //colProps: { span: 6 },
-  // },
+  {
+    label: '项目名称',
+    field: 'projectName',
+    component: 'Input',
+  },
 ];
diff --git a/src/views/projectLib/projectArchive/SubmitProjectArchive.vue b/src/views/projectLib/projectArchive/SubmitProjectArchive.vue
index 9867624..f8ebd75 100644
--- a/src/views/projectLib/projectArchive/SubmitProjectArchive.vue
+++ b/src/views/projectLib/projectArchive/SubmitProjectArchive.vue
@@ -19,8 +19,7 @@
     </el-tabs>
     <!-- <ApprovalDetails :projectid="projectid" stage="createProjectArchive" v-if="showApprovalForm" /> -->
 
-    <planinfoFileDetail @register="registerFileInfo" :planinfoid="planinfoid" :taskName="taskName"
-        :isfinish="isfinish" />
+    <planinfoFileDetail @register="registerFileInfo" />
     <!-- <div style="display: flex; justify-content: center; align-items: center; height: 100px;" v-if="!showApprovalForm">
         <el-button type="primary" @click="submitImportForm">发起审批</el-button>
         <el-button type="info" @click="closeModel()">关闭窗口</el-button>
@@ -86,12 +85,6 @@ function getTableAction(record): ActionItem[] {
 }
 
 function handleDetail(record) {
-    console.log("rrrrrrrr", record)
-    planinfoid.value = record.record.id
-    taskName.value = record.record.taskName
-    isfinish.value = record.record.isfinish
-    console.log("rrrrrrrr", record, record.id, record.taskName, planinfoid.value, taskName.value)
-
     openFileInfo(true,{planinfoid:record.id,taskName:record.taskName,isfinish:record.isfinish})
 
 }
diff --git a/src/views/projectLib/projectPlan/planinfoFileDetail.vue b/src/views/projectLib/projectPlan/planinfoFileDetail.vue
index 2ee28e4..3af12f3 100644
--- a/src/views/projectLib/projectPlan/planinfoFileDetail.vue
+++ b/src/views/projectLib/projectPlan/planinfoFileDetail.vue
@@ -1,33 +1,37 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" title="文件详情" width="1200px" :showOkBtn="false">
-    <el-divider content-position="left">{{ dataTo.taskName }}</el-divider>
+    <el-divider content-position="left">{{ taskName }}</el-divider>
     <div>
       <el-divider content-position="left">项目计划资料详情</el-divider>
       <PlanFileDetail :planinfoid="planinfoid" :stage="1" />
       <el-divider content-position="left">项目计划审批文件列表</el-divider>
       <PlanFileDetail :planinfoid="planinfoid" :stage="2" />
-      <div v-if="dataTo.isfinish == 1">
+      <div v-if="isfinish == 1">
         <ApprovalDetails :projectid="planinfoid" :stage="processName" />
       </div>
     </div>
   </BasicModal>
 </template>
 <script lang="ts" name="Detailpage" setup>
-import { ref,defineProps, onMounted } from 'vue'
+import { ref, onMounted } from 'vue'
 import { BasicModal, useModalInner } from '@/components/Modal';
 import {getProcessName} from "./projectPlan.api"
 import ApprovalDetails from "../../ProcessApprovalSubPage/component/ApprovalDetails.vue"
 import PlanFileDetail from "@/views/ProcessApprovalSubPage/component/PlanFileDetail.vue";
 
 const [registerModal, { closeModal }] = useModalInner(init);
-let dataTo = defineProps(["planinfoid", "taskName", "isfinish"])
-console.log("wwwwwwwwwwww", dataTo)
 let processName = ref("")
+let planinfoid = ref()
+let taskName=ref()
+let isfinish=ref()
 onMounted(async () => {
   // processName.value =await getProcessName(dataTo.planinfoid)
 })
 async function init(data) {
   processName.value =await getProcessName({pid:data.planinfoid})
+  planinfoid.value = data.planinfoid
+  taskName.value = data.taskName
+  isfinish.value = data.isfinish
 }
 
 
diff --git a/src/views/projectLib/projectPlan/viewPlanDetail.vue b/src/views/projectLib/projectPlan/viewPlanDetail.vue
index ce41cb6..044a1aa 100644
--- a/src/views/projectLib/projectPlan/viewPlanDetail.vue
+++ b/src/views/projectLib/projectPlan/viewPlanDetail.vue
@@ -62,9 +62,9 @@
       <!-- <TableAction :actions="getTableAction(record)" /> -->
       <TableAction :actions="getTableAction(record)" />
     </template>
-    <template #tableTitle >
-                <el-button type="primary" @click="handledownload" v-if="isShowByRoles('manageOrg,supervisor')">下载</el-button>
-            </template>
+    <template #tableTitle>
+      <el-button type="primary" @click="handledownload" v-if="isShowByRoles('manageOrg,supervisor')">下载</el-button>
+    </template>
   </BasicTable>
   <div v-if="dataTo.projectStage == 4">
     <ApprovalDetails :projectid="projectId" stage="createPlaninfo" />
@@ -72,7 +72,7 @@
   <BasicModal @register="registeruploadFile" title="上传文件" width="1200px" :showOkBtn="false" :showCancelBtn="false">
     <addPlanFile :type="type" :planinfoid="planinfoid" :files="fileArr" @close="closePlanFileModal()" />
   </BasicModal>
-  <planinfoFileDetail @register="registerFileInfo" :planinfoid="planinfoid" :taskName="taskName" :isfinish="isfinish" />
+  <planinfoFileDetail @register="registerFileInfo" />
   <BasicModal @register="registerplanFileApproval" title="文件审批" width="1200px" :showOkBtn="false"
     :showCancelBtn="false">
     <planFileApproval :record="recordData" @close="closeplanFile" />
@@ -86,7 +86,7 @@ import planinfoFileDetail from './planinfoFileDetail.vue'
 import { Progress } from 'ant-design-vue';
 import { BasicModal } from '@/components/Modal';
 import { PlaninfoColumn } from './projectPlan.data';
-import { queryPlanInfoMainTimeline, getPlanFileApprovalInfoByPlaninfoId,planUploadFile,downloadPlanInfo } from './projectPlan.api'
+import { queryPlanInfoMainTimeline, getPlanFileApprovalInfoByPlaninfoId, planUploadFile, downloadPlanInfo } from './projectPlan.api'
 import { ActionItem, BasicTable, TableAction, useTable } from '@/components/Table';
 import { useModal } from '@/components/Modal';
 import ApprovalDetails from "../../ProcessApprovalSubPage/component/ApprovalDetails.vue"
@@ -189,10 +189,8 @@ function getTableAction(record): ActionItem[] {
 }
 
 function handleDetail(record) {
-  planinfoid.value = record.id
-  taskName.value = record.taskName
-  isfinish.value = record.isfinish
-  openFileInfo(true,{planinfoid:record.id,taskName:record.taskName,isfinish:record.isfinish})
+
+  openFileInfo(true, { planinfoid: record.id, taskName: record.taskName, isfinish: record.isfinish })
 
 }
 function handleuploadfile(record) {
@@ -233,8 +231,8 @@ function closePlanFileModal() {
   })
 }
 async function handledownload() {
-    //下载
-    await downloadPlanInfo({ projectid: dataTo.projectId});
+  //下载
+  await downloadPlanInfo({ projectid: dataTo.projectId });
 }
 </script>
 <style scoped>