From e44b41bf14c848a9fe738600d07cc0a9ac5bc68a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 03:30:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=BD=8D=E7=BD=AE,?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5=E6=8E=92=E7=89=88=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                   |  1 +
 src/components/AttachmentUpload.vue            |  4 ++--
 src/components/Tag.vue                         |  1 -
 src/views/expense-management/share/add.vue     |  2 +-
 src/views/project-demand/requirement/add.vue   |  2 +-
 src/views/project-demand/summary/add.vue       | 18 +++++++++---------
 src/views/project-demand/summary/index.vue     |  2 +-
 .../implementation/phase.vue                   |  2 +-
 src/views/special-fund/add.vue                 |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index caed37a..b664b8f 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -551,6 +551,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 }
 
 .approval-record {
+  padding-top: 10px;
   padding-bottom: 30px;
   position: relative;
   .approval-title {
diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index f50707c..8b8b53f 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -217,7 +217,7 @@ const singleFile = ref(props.formData.singleFile)
 const isSingleFile = ref(false)
 const allFileList = ref([])
 const singleFileList = ref([])
-if(props.formData.fileList !== null && props.formData.fileList.length > 0){
+if(props.formData.fileList !== null && props.formData.fileList?.length > 0){
   allFileList.value = props.formData.fileList
 }
 watch(() => props.showTable, (newVal) => {
@@ -237,7 +237,7 @@ watch(() => props.formData.fileList, (newVal) => {
 watch(() => props.otherFileList, (newVal) => {
   // console.log('newotherFileList', newVal, props.formData)
   if (props.preview) {
-    if (props.formData.fileList === null || props.formData.fileList.length === 0) {
+    if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
       allFileList.value = newVal
     } else {
       newVal?.forEach(item => {
diff --git a/src/components/Tag.vue b/src/components/Tag.vue
index 3447898..8bc4691 100644
--- a/src/components/Tag.vue
+++ b/src/components/Tag.vue
@@ -31,7 +31,6 @@ const props = defineProps({
 const tagConfig = ref({})
 
 const filterDict = (data, value) => {
-  console.log("🚀 ~ filterDict ~ data:", data)
   if (!data || value == null) return
   if (data instanceof Array) {
     if (value == true || value == false) {
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 6331374..055b107 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -114,7 +114,7 @@
       <div class="approval-title">
         <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
         <div v-else></div>
-        <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <div style="display: flex;align-items: center;justify-content: flex-start;">
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 6e84b22..e93be62 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -86,7 +86,7 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index a5df96b..f401b4f 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -111,7 +111,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">
           <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="125">
             <el-radio-group v-model="formData.industryUniversityResearch">
               <el-radio v-for="item in cacheStore.getDict('industry_university')"
@@ -121,8 +121,8 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="开展政府申报" prop="governmentDeclaration">
+        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?route.query.id?8:6:6">
+          <el-form-item label="开展政府申报" prop="governmentDeclaration" :label-width="route.query.id && formData.isSpecialFund?145:!formData.isSpecialFund?145:145">
             <el-radio-group v-model="formData.governmentDeclaration">
               <el-radio v-for="item in cacheStore.getDict('government_declaration')"
                         :key="item.value"
@@ -131,7 +131,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="!route.query.id && formData.isSpecialFund?4:12" v-if="!route.query.id">
+        <el-col :span="!route.query.id && formData.isSpecialFund?4:!route.query.id?12:12" v-if="!route.query.id">
           <el-form-item label="是否专项资金" prop="isSpecialFund" >
             <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
               <el-radio :label="true">是</el-radio>
@@ -140,7 +140,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" v-if="route.query.id && formData.isSpecialFund">
-          <el-form-item label="专项资金名称" prop="specialFundId">
+          <el-form-item label="专项资金名称" prop="specialFundId" :label-width="route.query.id && formData.isSpecialFund?135:''">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
@@ -157,7 +157,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" style="margin-bottom: -18px">
-          <el-form-item label="知识产权状况" prop="intellectualProperty" label-width="125">
+          <el-form-item label="知识产权状况" prop="intellectualProperty" :label-width="!formData.isSpecialFund?!route.query.id?125:135:125">
             <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('intellectual_property')"
@@ -236,8 +236,8 @@
                       @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Summary/edit'"/>
-    <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+    <div class="approval-record" style="margin-left: 70px">
+      <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
@@ -468,7 +468,7 @@ const handleResubmit = debounce(() => {
     ...formData.value,
     deploymentId: deploymentId.value,
     fileList: otherFiles,
-    requirementId: route.query.id ? route.query.id : '-1'
+    requirementId: route.query.requirementId ? route.query.requirementId : '-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 e6f7792..3c70964 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: {
-      id: row.requirementId,
+      requirementId: row.requirementId,
       projectId: row.projectId
     }
   })
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 98f4df3..166b7a3 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -13,7 +13,7 @@
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Phase/edit'"/>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index a9306a3..bac3267 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -27,7 +27,7 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <div style="display: flex;align-items: center;justify-content: flex-start;">
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"