From e43213d9a7ae0bb0a7f8f26597edcf04aa93a460 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 17:21:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E6=91=8A=E6=B1=87=E6=80=BB=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/AllocationSummaryDetail.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index d5459d7..e4d866c 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -14,9 +14,9 @@
     </el-table-column>
     <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">
-          <Tag dictType="research_stage" :value="scope.row.researchStage"/>
+        <div v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
+          <el-tag effect="plain">{{scope.row.researchStage==1?'开发阶段':'研究阶段'}}</el-tag>
+<!--          <Tag dictType="research_stage" :value="scope.row.researchStage"/>-->
         </div>
         <div v-else>--</div>
       </template>

From fd3231db4d2cb3d191a276e0a5f736b73786209a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 19:17:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E6=B7=BB=E5=8A=A0=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/steps/index.vue                | 21 ++++++---
 .../project-management/filing/attachment.vue  | 16 ++++++-
 .../project-management/filing/upload.vue      | 16 ++++++-
 .../implementation/account.vue                | 45 ++++++++++---------
 .../implementation/attachment.vue             | 14 ++++++
 .../implementation/phase.vue                  | 16 ++++++-
 .../implementation/phaseDetail.vue            | 16 ++++++-
 .../implementation/share.vue                  | 18 ++++++--
 .../implementation/upload.vue                 | 16 ++++++-
 .../implementation/uploadFee.vue              | 34 +++++++++-----
 .../mobledetail/StepsMoblie.vue               | 28 +++++++-----
 11 files changed, 182 insertions(+), 58 deletions(-)

diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 18d09df..24b2a05 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -103,6 +103,20 @@ const schema = computed(() => {
         span: 12
       }
     },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
@@ -110,13 +124,6 @@ const schema = computed(() => {
         span: 12
       }
     },
-    {
-      label: '项目名称',
-      prop: 'projectName',
-      colProps: {
-        span: 12
-      }
-    }
 
   ]
 })
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index a5b4949..8099ef4 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -39,7 +39,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index 52dd235..80198f4 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -45,7 +45,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index d52f14d..251d593 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -38,35 +38,35 @@ const formDataArray = ref([
     label: '征集名称',
     prop: 'requirementName',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
     label: '项目名称',
     prop: 'projectName',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
     label: '项目负责人',
     prop: 'projectChargePerson',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
     label: '项目开始时间',
     prop: 'startTime',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
     label: '项目预计持续时间',
     prop: 'endTime',
     colProps: {
-      span: 12
+      span: 8
     }
   },
   {
@@ -84,7 +84,7 @@ const formDataArray = ref([
     }
   },
   {
-    label: '项目总体完成率（%）',
+    label: '项目总体完成率',
     prop: 'projectCompletionRate',
     colProps: {
       span: 6
@@ -257,10 +257,25 @@ const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
     baseForm.value.setValues(data)
+    await init()
   } catch {
   }
 }
-
+const init = async () => {
+  const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
+  console.log('data',data)
+  if (data) {
+    tableData.value = data
+    baseForm.value.setValues(data)
+  }
+  // if (code !== 1000) {
+  //   ElNotification({
+  //     title: '提示',
+  //     message: msg,
+  //     type: 'error'
+  //   })
+  // }
+}
 getBaseInfo()
 const headBtnClick = (key) => {
   switch (key) {
@@ -308,21 +323,7 @@ const search = (val) => {
   tableConfig.params = {...val, projectId: route.query.id}
   tableIns.value.refresh()
 }
-const init = async () => {
-  const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
-  if (data) {
-    tableData.value = data
-    baseForm.value.setValues(data)
-  }
-  // if (code !== 1000) {
-  //   ElNotification({
-  //     title: '提示',
-  //     message: msg,
-  //     type: 'error'
-  //   })
-  // }
-}
-init()
+
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 2c35432..45bb082 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -56,6 +56,20 @@ const schema = computed(() => {
         span: 12
       }
     },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 1fb70cc..e38b0e7 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -74,7 +74,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index 952d761..bee485d 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -38,7 +38,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index d7a1a4c..f8498e9 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -10,10 +10,8 @@
 </template>
 
 <script setup lang="jsx">
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
-import {getResearchUser} from "@/api/expense-manage";
 
 const route = useRoute()
 const schema = computed(() => {
@@ -31,7 +29,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 10f3212..6a2a087 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -59,7 +59,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index fe278f8..11d92f2 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -2,7 +2,7 @@
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <el-form :model="tableForm" ref="form" class="query-form">
-    <el-table :data="tableForm.tableData" style="width: 100%">
+    <el-table :data="tableForm.tableData">
       <el-table-column prop="time" label="时间" width="180">
         <template #default="scope">
           <el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
@@ -33,7 +33,7 @@
       </el-table-column>
       <el-table-column prop="researchStage" label="研发阶段" width="220">
         <template #default="scope">
-          <el-form-item prop="researchStage"  :rules="scope.row.researchStage?'1':rules.researchStage">
+          <el-form-item prop="researchStage" :rules="scope.row.researchStage?'1':rules.researchStage">
             <el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('fee_stage')"
@@ -56,7 +56,7 @@
       <el-table-column prop="afterTax" label="税后余额(元)" width="220">
         <template #default="scope">
           <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
-            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额"  :controls="false">
+            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
             </el-input-number>
           </el-form-item>
         </template>
@@ -92,7 +92,7 @@ const router = useRouter()
 const tagsViewStore = useTagsView()
 const formData = ref({})
 const form = ref()
-const projectName=ref()
+const projectName = ref()
 const schema = computed(() => {
   return [
     {
@@ -108,7 +108,21 @@ const schema = computed(() => {
       colProps: {
         span: 12
       }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })
 const baseForm = ref()
@@ -166,10 +180,10 @@ const handleSubmit = (instance) => {
       })
     }
     instance.clearValidate()
-    tableForm.tableData.forEach(item=>{
-      item.projectName=projectName.value
+    tableForm.tableData.forEach(item => {
+      item.projectName = projectName.value
     })
-    const res =await addLedger(tableForm.tableData)
+    const res = await addLedger(tableForm.tableData)
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -179,8 +193,8 @@ const handleSubmit = (instance) => {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
         name: 'Implementation/account',
-        query:{
-          id:route.query.id
+        query: {
+          id: route.query.id
         }
       })
     }
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index 5fb6999..4613810 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -101,24 +101,30 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
-      colProps: {
-        span: 24
+        span: 12
       }
     },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
-        span: 24
+        span: 12
       }
-    }
-
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
   ]
 })