From bd6fef9f7e9a8a01c09054b23e70db15e2ad66d9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 18:56:05 +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=88=90=E6=9E=9C=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue   | 8 ++++----
 src/views/project-demand/summary/index.vue | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 1546f67..ec4118d 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -412,14 +412,14 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
-    formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
+    // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
       fileList: otherFiles,
       requirementId: route.query.id ? route.query.id : '-1'
     }
-    // console.log('params', params)
+    console.log('params', params)
     if (!attachment.value.isSingleFile) {
       attachment.value.validate()
       ElNotification({
@@ -466,12 +466,12 @@ const handleResubmit = debounce(() => {
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
-  formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
+  // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,
     fileList: otherFiles,
-    requirementId: route.query.requirementId ? route.query.requirementId : '-1'
+    requirementId: route.query.id ? route.query.id : '-1'
   }
   // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
   resubmitReported(params).then(res => {
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index b3ef500..8df7cab 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -304,7 +304,7 @@ const handleEdit = (row) => {
   router.push({
     name: 'Summary/edit',
     query: {
-      requirementId: row.requirementId,
+      // requirementId: row.requirementId,
       projectId: row.projectId
     }
   })

From a446dfcaa61fb77cb1ece5aacc21841e71d0fe4f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 21:43:57 +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=E8=AF=A6=E6=83=85=E5=89=8D=E7=BD=AE=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/AllocationSummaryDetail.vue        |  2 +-
 src/components/DetailComponent/ProjectApply.vue        | 10 +++++++++-
 .../moblieDetail/AllocationSummaryDetailMoblie.vue     |  2 +-
 .../project-management/implementation/account.vue      |  1 -
 .../mobledetail/AllocationSummaryDetailMobile.vue      |  2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index 51af440..0223cf8 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center">
+    <el-table-column prop="researchStage" label="研发阶段" align="center">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index fa88507..967edf6 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -57,7 +57,7 @@
         </el-form-item>
       </el-form>
       <el-table :data="preProcessList" stripe v-loading="loading"
-                @select="handleSelect" row-key="requestId">
+                @select="handleSelect" row-key="requestId" ref="preProcessTable">
         <el-table-column type="selection" width="55" :reserve-selection="true"/>
         <el-table-column prop="requestId" label="请求id"></el-table-column>
         <el-table-column prop="requestName" label="请求名称"></el-table-column>
@@ -106,6 +106,7 @@ import Paging from "@/components/pagination/index.vue";
 const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
+const preProcessTable = ref()
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
@@ -210,6 +211,13 @@ const getPreProcessList = () => {
         searchArray.push(item)
       }
     })
+    res.data.forEach((item) => {
+      localFormData.value.preProcess.forEach((item1) => {
+        if (item.requestId == item1.requestId) {
+          preProcessTable.value.toggleRowSelection(item)
+        }
+      })
+    })
     total.value = searchArray.length
     currentList.value = searchArray
     preProcessList.value = currentList.value.slice(0, 10)
diff --git a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
index ccd1b78..0a27000 100644
--- a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
+++ b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center">
+    <el-table-column prop="researchStage" label="研发阶段" align="center">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 4e55864..d52f14d 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -310,7 +310,6 @@ const search = (val) => {
 }
 const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
-  console.log("🚀 ~ init ~ data:", data)
   if (data) {
     tableData.value = data
     baseForm.value.setValues(data)
diff --git a/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue b/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
index 6cdb330..691578d 100644
--- a/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
+++ b/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center" min-width="100">
+    <el-table-column prop="researchStage" label="研发阶段" align="center" min-width="100">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">

From 3b884c0b785b392ab6b9547aa3ba9c7248e510b8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 22:27:22 +0800
Subject: [PATCH 3/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=88=90=E6=9E=9C=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?,=E9=9C=80=E6=B1=82=E6=96=B0=E5=A2=9E=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AllocationSummaryDetail.vue               |  2 +-
 .../DetailComponent/SummaryDetail.vue         | 34 +++++++++----------
 src/views/project-demand/requirement/add.vue  |  6 ++--
 src/views/project-demand/summary/add.vue      |  5 +--
 src/views/special-fund/add.vue                |  3 +-
 5 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index 0223cf8..d5459d7 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
+<!--  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
   <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
             :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
     <el-table-column type="index" label="序号" align="center" width="60"/>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 6b7fa74..ec79794 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -63,7 +63,9 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
-            <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
+            <span>{{
+                localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId)
+              }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -108,7 +110,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="经济概算(元)" prop="economicEstimate">
-            <span>{{toThousands( localFormData.economicEstimate )}}</span>
+            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -141,7 +143,7 @@
           <baseTitle title="附件列表"></baseTitle>
         </el-col>
         <el-col :span="24">
-          <file-component  tag="需求上报"
+          <file-component tag="需求上报"
                           v-model:value="localFormData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>
         </el-col>
@@ -171,7 +173,8 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+                            :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
         </div>
@@ -240,20 +243,17 @@ const _value = computed({
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
-  let result=[]
-  if(value.indexOf(",") >= 0){
-    if (value.split(",") instanceof Array) {
-      value.split(",").forEach(item1 => {
-        console.log('item',item1)
-        data.find(item => {
-          if (item.value == item1) {
-            result.push(item.label)
-          }
-        })
+  let result = []
+  if (JSON.parse(value) instanceof Array) {
+    JSON.parse(value).forEach(item1 => {
+      data.find(item => {
+        if (item.value == item1) {
+          result.push(item.label)
+        }
       })
-    }
-    label=result.map(item=>item).join('，')
-  }else {
+    })
+    label = result.map(item => item).join('，')
+  } else {
     if (data instanceof Array) {
       data.find(item => {
         if (item.value == value) {
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 828a747..cdb13c4 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -41,8 +41,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="!formData.isSpecialFund">
+          <el-form-item label="专项资金名称" prop="specialFundId" v-if="formData.isSpecialFund">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable >
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -158,7 +158,7 @@ const specialFundOption = ref([])
 const form = ref(null)
 const fileList = ref([])
 const loading = ref(false)
-const showTable = ref(false)
+const showTable = ref(true)
 const processStore = useProcessStore()
 const processInstanceData = ref()
 const formPermMap = ref(new Map());
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index ec4118d..2d4b8dc 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -412,7 +412,7 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
-    // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
+    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
@@ -466,7 +466,7 @@ const handleResubmit = debounce(() => {
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
-  // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
+  formData.value.resultForm=JSON.stringify(formData.value.resultForm)
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,
@@ -499,6 +499,7 @@ const getDetailInfo = async () => {
     })
     if (res.code === 1000) {
       res.data.formData.specialFundId = res.data.formData.specialFundId === 0 ? null : res.data.formData.specialFundId
+      res.data.formData.resultForm = JSON.parse(res.data.formData.resultForm)
       formData.value = res.data.formData
       loading.value = false
     }
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index ed41db1..d287762 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -136,6 +136,7 @@ const handleDelete = (row) => {
     })
     if (res.code === 1000) {
       formData.value.files.splice(formData.value.files.findIndex((item) => item.id === row.fileId), 1);
+      showTable.value = formData.value.files.length !== 0;
     }
   });
 }
@@ -246,7 +247,7 @@ const init = async () => {
     } else {
       ElNotification({
         title: '提示',
-        message: msg,
+        message: res.msg,
         type: 'error'
       })
     }

From 40d3d423c7d399a878fe64a1c00e76ae317077d2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 22:30:21 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E6=96=87=E4=BB=B6=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 2d4b8dc..bbfbac6 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -281,7 +281,7 @@ const companyOption = ref([])
 const summaryForm = ref()
 const deploymentId = ref()
 const specialFundOption = ref([])
-const showTable = ref(false)
+const showTable = ref(true)
 const showSingleTable = ref(false)
 const otherFileList = ref([])
 const singleList = ref([])

From 1e4397b5ea52d970608bebba4f147225361675c0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 22:46:37 +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=E8=AF=A6=E6=83=85=E5=8D=95=E4=B8=AA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue             |  4 ++--
 src/components/DetailComponent/ProjectApply.vue | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 9742001..bc336d8 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -2,7 +2,7 @@
   <el-form :model="formData" ref="applyForm" :rules="rules" :label-position="labelPosition">
     <el-row>
       <el-col :span="24">
-        <el-form-item :label="label" prop="attachment" label-width="125">
+        <el-form-item :label="label" prop="attachment" label-width="110">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
               {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
@@ -25,7 +25,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="其他文件" label-width="125">
+        <el-form-item label="其他文件" label-width="110">
           <file-upload @getFile="getOtherFile"/>
           <!--          <el-card style="width: 100%;box-shadow: none">-->
           <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 967edf6..41be74b 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -3,7 +3,7 @@
     <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="前置流程" :required="preProcessRequired" prop="requestName">
+          <el-form-item label="前置流程" :required="preProcessRequired" prop="requestName" label-width="110">
             <div v-for="item in localFormData.preProcess" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
                  style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ item.requestName }}</a>
@@ -17,7 +17,7 @@
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
                       :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
+                      @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>
     <div>
@@ -26,7 +26,7 @@
           <baseTitle title="审批记录" v-if="mode === 'resubmit'"></baseTitle>
           <div v-else></div>
           <div class="diagram">
-            <div class="base-title">流程图</div>
+            <div class="base-title" style="margin-left: 50px">流程图</div>
             <el-switch
                 v-model="changeDiagram"
                 style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
@@ -107,6 +107,8 @@ const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
 const preProcessTable = ref()
+const showSingleTable = ref(false)
+const singleList = ref([])
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
@@ -276,8 +278,16 @@ const compositeParam = (item) => {
 }
 const getAttachment = (val) => {
   // console.log('上传文件getAttachment', val)
+  showSingleTable.value=false
   localFormData.value.singleFile = compositeParam(val)
+  singleList.value.push( compositeParam(val))
+  nextTick(() => {
+    showSingleTable.value = true
+  })
 }
+watch(() => singleList.value, (newVal) => {
+  showSingleTable.value = newVal.length !== 0;
+}, {deep: true})
 const getOtherFile = (val) => {
   // console.log('上传文件getOtherFile', val)
   showTable.value = false