From 9cbe89007d6a262d13c8fe505d677922f61cc3ef Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 17 Jun 2024 11:39:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=BE=93=E5=85=A5=E6=A1=86=E5=9E=82=E7=9B=B4?=
 =?UTF-8?q?=E5=B1=85=E4=B8=AD=E3=80=81=E5=8F=B0=E8=B4=A6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project-management/implementation/account.vue  | 14 +-------------
 .../project-management/implementation/index.vue    | 10 +++++-----
 .../implementation/uploadFee.vue                   | 11 +++++++++++
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 2016ad0..a035274 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -37,17 +37,6 @@ const schema = computed(() => {
 })
 const baseForm = ref()
 const searchConfig = reactive([
-  {
-    label: '项目名称',
-    prop: 'projectName',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入项目名称查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
   {
     label: '时间',
     prop: 'time',
@@ -79,7 +68,7 @@ const searchConfig = reactive([
       clearable: true,
       filterable: true,
       checkStrictly: true,
-      cacheKey: 'research_stage',
+      cacheKey: 'fee_stage',
     }
   },
   {
@@ -194,7 +183,6 @@ const handleUploadFee = () => {
 }
 
 const search = (val) => {
-  console.log('val', val)
   tableConfig.params = {...val, projectId: route.query.id}
   tableIns.value.refresh()
 }
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index cd9ee63..1abb366 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -161,7 +161,7 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.projectType !== null) {
+        if (row.projectType && row.projectType !== null && row.projectType !== undefined) {
           return (<Tag dictType={'project_type'} value={row.projectType}/>)
         } else {
           return '--'
@@ -174,7 +174,7 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.rdSubject !== null) {
+        if (row.rdSubject && row.rdSubject !== null && row.rdSubject !== undefined) {
           return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
         } else {
           return '--'
@@ -187,7 +187,7 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
+        if (row.researchStage && row.researchStage !== null && row.researchStage !== undefined) {
           return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
         } else {
           return '--'
@@ -200,7 +200,7 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.projectImpact !== null) {
+        if (row.projectImpact && row.projectImpact !== null && row.projectImpact !== undefined) {
           return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
         } else {
           return '--'
@@ -234,7 +234,7 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.state !== null) {
+        if (row.state && row.state !== null && row.state !== undefined) {
           return (<Tag dictType={'project_implementation'} value={row.state}/>)
         } else {
           return '--'
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index f20c103..cf01a8d 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -184,4 +184,15 @@ const handleBack = () => {
   history.back()
 }
 </script>
+<style scoped lang="scss">
+:deep(.el-table--enable-row-transition) {
+  .el-table__body td.el-table__cell {
+    .cell {
+      .el-form-item {
+        margin-top: 20px;
+      }
+    }
+  }
+}
+</style>