From bd2d12551a718ce75342a14eb3397458d37594ea Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Fri, 28 Jun 2024 23:53:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E6=9D=A1=E6=A0=B7=E5=BC=8F=EF=BC=8C=20=E5=A2=9E=E5=BC=BAtag?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tag.vue                        |  3 ++-
 src/components/steps/index.vue                | 13 ++++++++++++-
 .../implementation/account.vue                |  1 +
 .../implementation/updateTable.vue            |  2 +-
 .../mobledetail/StepsMoblie.vue               | 19 +++++++++++++++----
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/components/Tag.vue b/src/components/Tag.vue
index e50abbd..3447898 100644
--- a/src/components/Tag.vue
+++ b/src/components/Tag.vue
@@ -31,6 +31,7 @@ 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) {
@@ -45,7 +46,7 @@ const filterDict = (data, value) => {
       tagConfig.value = data.find(item => item.value == value)
     }
   }
-  return tagConfig.value.label
+  return tagConfig.value?.label || '未知'
 }
 </script>
 
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index c95f922..dded12f 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -11,7 +11,12 @@
           :class="stepClass(index)"
           @click="handleStep(item.key, index)"
 
-      />
+      >
+        <template #icon>
+          <el-icon style="font-size: 20px;" :class="index == localActive ? 'is-active' : 'is-end'" v-if="localStepSuccess.includes(index)"><SuccessFilled /></el-icon>
+          <el-icon style="font-size: 20px; color: gray;" v-else><WarningFilled /></el-icon>
+        </template>
+      </el-step>
     </el-steps>
   </div>
 
@@ -311,4 +316,10 @@ watchEffect(() => {
 .step-error {
   cursor: not-allowed;
 }
+.is-active {
+  color: #BEA266;
+}
+.is-end {
+  color: #67c23a;
+}
 </style>
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index e12e82a..71fa18e 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -308,6 +308,7 @@ 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/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index d74bf80..d8a138d 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -141,7 +141,7 @@ const handleSubmit = async () => {
 }
 const getBaseInfo = async () => {
   const {code, data} = await getBaseInfoApi(route.query.id)
-  tableForm.value.projectName = data.projectName
+  tableForm.value.projectName = data?.projectName || ''
 }
 getBaseInfo()
 const init = async () => {
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index a42e83b..dded12f 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -11,7 +11,12 @@
           :class="stepClass(index)"
           @click="handleStep(item.key, index)"
 
-      />
+      >
+        <template #icon>
+          <el-icon style="font-size: 20px;" :class="index == localActive ? 'is-active' : 'is-end'" v-if="localStepSuccess.includes(index)"><SuccessFilled /></el-icon>
+          <el-icon style="font-size: 20px; color: gray;" v-else><WarningFilled /></el-icon>
+        </template>
+      </el-step>
     </el-steps>
   </div>
 
@@ -96,21 +101,21 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 24
+        span: 12
       }
     },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
       colProps: {
-        span: 24
+        span: 12
       }
     },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
-        span: 24
+        span: 12
       }
     }
 
@@ -311,4 +316,10 @@ watchEffect(() => {
 .step-error {
   cursor: not-allowed;
 }
+.is-active {
+  color: #BEA266;
+}
+.is-end {
+  color: #67c23a;
+}
 </style>