From 812298acce619ca50642b69a4910ab5626f279c1 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 9 Jun 2024 19:00:43 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E6=98=AF=E5=90=A6=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         |  2 +-
 src/views/project-demand/summary/add.vue      | 30 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index da790e8..8ded615 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -9,7 +9,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
-            <span>{{localFormData.specialFund }}</span>
+            <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 57ada02..1aaf3bc 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -10,18 +10,18 @@
         </el-col>
         <el-col :span="5" v-if="!route.query.id">
           <el-form-item label="是否专项资金" prop="isSpecialFund">
-            <el-radio-group v-model="formData.isSpecialFund">
+            <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="route.query.id&&formData.isSpecialFund">
+        <el-col :span="6" v-if="route.query.id && formData.isSpecialFund">
           <el-form-item label="专项资金" prop="specialFundId">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="!route.query.id">
+        <el-col :span="6" v-if="!route.query.id && formData.isSpecialFund">
           <el-form-item label="专项资金" prop="specialFundId">
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
               <el-option
@@ -283,7 +283,7 @@ const formData = ref({
 
 const rules = reactive({
   projectName: [{required: true, message: '请输入项目名称', trigger: 'blur'}],
-  specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
+  // specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
   startTime: [{required: true, message: '请选择开始时间', trigger: ['blur', 'change']}],
   endTime: [{required: true, message: '请选择结束时间', trigger: ['blur', 'change']}],
   rdSubject: [{required: true, message: '请选择研发主体', trigger: ['blur', 'change']}],
@@ -313,10 +313,10 @@ const disabledDate = (time) => {
 
 const getIsFund = async () => {
   if (!route.query.id) return;
-  loading.value = true
+  // loading.value = true
   await getFormInfo(route.query.id).then(res => {
     if (res.code === 1000) {
-      loading.value = false
+      // loading.value = false
       formData.value.isSpecialFund = res.data.isSpecialFund
       if (res.data.isSpecialFund) {
         res.data.specialFundId = getSpecialFundId(res.data.specialFund)
@@ -428,7 +428,7 @@ const handleResubmit = debounce(() => {
       otherFiles.push(getFileParam(item))
     })
   }
-  if (attachment.value.singleFile==null) {
+  if (attachment.value.singleFile == null) {
     attachment.value.validate()
     ElNotification({
       title: '提示',
@@ -436,7 +436,7 @@ const handleResubmit = debounce(() => {
       type: 'error'
     })
     return;
-  } else{
+  } else {
     attachment.value.clearValidate()
   }
   let params = {
@@ -475,17 +475,26 @@ const getDetailInfo = async () => {
     }
   })
 }
+const specialFundChange = () => {
+  processInfo()
+}
 const init = async () => {
+  await getIsFund()
   loading.value = true
   const resFund = await getFundOption()
   specialFundOption.value = resFund.data
   const res = await getSubCompOpt()
   companyOption.value = res.data
+ await processInfo()
+  loading.value = false
+}
+const processInfo = () => {
+  processStore.setDesign(null)
+  processDiagramViewer.value=false
   getProcessInfo(formData.value.isSpecialFund).then(res => {
     if (res.code === 1000) {
       let data = res.data
       deploymentId.value = data.deploymentId
-      loading.value = false
       processStore.setDesign(data)
       processStore.runningList.value = data.runningList;
       processStore.endList.value = data.endList;
@@ -495,7 +504,6 @@ const init = async () => {
       nextTick(() => {
         processDiagramViewer.value = true
       })
-      getIsFund()
     } else {
       ElNotification({
         title: '提示',
@@ -506,10 +514,10 @@ const init = async () => {
   })
 }
 onMounted(async () => {
-  await init()
   if (route.query.projectId) {
     await getDetailInfo()
   }
+  await init()
 })
 const staging = async () => {
 }

From c3e006bba85f8e414d06f04804cd7f2050cbcb4d Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 9 Jun 2024 19:12:37 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AB=8B=E9=A1=B9=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=AD=89=E6=93=8D=E4=BD=9C=E6=9B=BF=E6=8D=A2=E5=88=B0=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          | 20 +++++++++++++++----
 .../implementation/detail.vue                 | 20 +++----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 8ae2735..d4b1edb 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -13,8 +13,15 @@
                       @getAttachment="getAttachment"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="route.query.state==3"/>
+    <div v-if="route.query.state==3">
+      <baseTitle title="审批记录"></baseTitle>
+      <div class="process">
+        <operation-render v-if="processDiagramViewer" :operation-list="data.operationList"
+                          :state="data.state"/>
+      </div>
+    </div>
+    <baseTitle title="流程"></baseTitle>
     <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
       <process-diagram-viewer mode="view" idName="projectApply" v-if="processDiagramViewer"/>
     </div>
     <div class="oper-page-btn">
@@ -25,6 +32,7 @@
 </template>
 
 <script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElNotification} from "element-plus";
 import {getApplyProcess, projectApply, resubmitApply, getApplyDetail} from "@/api/project-manage";
@@ -42,6 +50,10 @@ const props = defineProps({
   showTable: {
     type: Boolean,
     default: false
+  },
+  data: {
+    type: Array,
+    default: []
   }
 })
 const rules = reactive({
@@ -101,7 +113,7 @@ const handleSubmit = (instance) => {
       attachment.value.allFileList.forEach(item => {
         files.push(getFileParam(item))
       })
-    }else {
+    } else {
       otherFileList.value.forEach(item => {
         files.push(getFileParam(item))
       })
@@ -131,8 +143,8 @@ const handleSubmit = (instance) => {
     let res
     if (route.query.state === '3') {
       res = await resubmitApply(params)
-    }else {
-     res = await projectApply(params)
+    } else {
+      res = await projectApply(params)
     }
     ElNotification({
       title: '提示',
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 0c63525..b3accf0 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -13,7 +13,7 @@
       <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
                       :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
-      <ApprovalDetail type="approval" v-show="showActive == '20'&&!showApply&&!showTabs" :formData="commonForm.formData"
+      <ApprovalDetail type="approval" v-show="showActive == '20'&&!showApply" :formData="commonForm.formData"
                       :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
                       :fileListShow="fileListShow" v-model:value="auditOpinion"/>
       <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData"
@@ -22,17 +22,7 @@
       <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
                       :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
-      <project-apply v-if="showApply"/>
-      <el-tabs v-if="showTabs" v-model="activeName">
-        <el-tab-pane label="详情" name="first">
-          <ApprovalDetail type="approval" idName="applyDetail" :formData="commonForm.formData"
-                          :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
-                          :fileListShow="fileListShow" v-model:value="auditOpinion"/>
-        </el-tab-pane>
-        <el-tab-pane label="重新提交" name="second">
-          <project-apply/>
-        </el-tab-pane>
-      </el-tabs>
+      <project-apply v-if="showApply" :data="commonForm"/>
     </template>
   </steps>
   <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"
@@ -49,9 +39,7 @@ import {ElLoading, ElNotification} from "element-plus";
 import Opinion from "@/components/DetailComponent/Opinion.vue";
 
 const route = useRoute()
-const activeName = ref('first')
 const showApply = ref(false)
-const showTabs = ref(false)
 const loading = ref(false)
 const processStore = useProcessStore()
 const fileListShow = ref('READ')
@@ -107,12 +95,10 @@ const changeModel = (active) => {
   if (route.query.state === '0' && active === '20') {
     showApply.value = true
   } else if (route.query.state === '3' && active === '20') {
-    //tab左侧详情, 右侧重新提交
-    showTabs.value = true
+    showApply.value = true
     getAllInfo(active)
   } else {
     showApply.value = false
-    showTabs.value = false
     getAllInfo(active)
   }
 }

From adbd98f03513a45f30c27411849a2a01fc0cef6e Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 9 Jun 2024 19:30:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AB=8B=E9=A1=B9=E5=88=87=E6=8D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/implementation/detail.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index b3accf0..83552f9 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,4 +1,5 @@
 <template>
+  {{showApply}}{{showActive}}
   <steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
          :reportType="route.query.id==='-1'?'direct':''">
     <template #content>
@@ -22,7 +23,7 @@
       <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
                       :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
-      <project-apply v-if="showApply" :data="commonForm"/>
+      <project-apply v-if="showApply&&showActive == '20'" :data="commonForm"/>
     </template>
   </steps>
   <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"
@@ -92,9 +93,9 @@ const getAllInfo = async (state) => {
   }
 }
 const changeModel = (active) => {
-  if (route.query.state === '0' && active === '20') {
+  if (route.query.state === '0' && route.query.step === '20') {
     showApply.value = true
-  } else if (route.query.state === '3' && active === '20') {
+  } else if (route.query.state === '3' && route.query.step === '20') {
     showApply.value = true
     getAllInfo(active)
   } else {

From b0eabd9c397c2b92b43cd95f4bb39e62b52dab14 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 9 Jun 2024 19:33:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AB=8B=E9=A1=B9=E5=88=87=E6=8D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/implementation/detail.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 83552f9..3e58448 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,5 +1,4 @@
 <template>
-  {{showApply}}{{showActive}}
   <steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
          :reportType="route.query.id==='-1'?'direct':''">
     <template #content>
@@ -93,9 +92,9 @@ const getAllInfo = async (state) => {
   }
 }
 const changeModel = (active) => {
-  if (route.query.state === '0' && route.query.step === '20') {
+  if (route.query.state === '0' && active === '20') {
     showApply.value = true
-  } else if (route.query.state === '3' && route.query.step === '20') {
+  } else if (route.query.state === '3' && active === '20') {
     showApply.value = true
     getAllInfo(active)
   } else {

From a88ae09628388caff706ced4b8ec913eb866c82b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 9 Jun 2024 20:03:26 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AE=9E=E6=96=BD=E9=98=B6=E6=AE=B5=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../implementation/phase.vue                  | 25 +++++++++----------
 .../implementation/phaseDetail.vue            |  3 +++
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 8e05176..346b5f0 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -143,19 +143,18 @@ const handleSubmit = async () => {
   } else {
     attachment.value.clearValidate()
   }
-  console.log('params-提交', params,userList.value)
-  // let res = await submitPhaseChange(params)
-  // ElNotification({
-  //   title: '提示',
-  //   message: res.msg,
-  //   type: res.code === 1000 ? 'success' : 'error'
-  // })
-  // if (res.code === 1000) {
-  //   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-  //   await router.push({
-  //     name: 'Implementation'
-  //   })
-  // }
+  let res = await submitPhaseChange(params)
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  if (res.code === 1000) {
+    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+    await router.push({
+      name: 'Implementation'
+    })
+  }
 }
 const handleResubmit = (instance) => {
   let singleFile = {}
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index 6aab684..c535dc5 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -1,5 +1,6 @@
 <template>
   <baseTitle title="阶段变更详情"></baseTitle>
+  <div style="color: #606266;font-size: 14px">抄送人：{{copyName}}</div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
                   :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
   <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>
@@ -16,6 +17,7 @@ const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
 const loading = ref(false)
 const auditOpinion = ref('')
+const copyName = ref('')
 const fileListShow = ref('READ')
 const getInfo = async () => {
   fileListShow.value = 'READ'
@@ -25,6 +27,7 @@ const getInfo = async () => {
   const {code, data, msg} = await getPhaseDetail(projectId)
   if (code === 1000) {
     summaryData.value = data;
+    copyName.value= data.formData.userInfoList.map(item=>item.name).join('')
     loading.value = false
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;