Merge remote-tracking branch 'websoft/master'

# Conflicts: # src/views/business/components/business-crud-page.vue
2026-08-25 00:11:14 +08:00
parent 1ef050dda6 21c4168867
commit e5992a0c63
36 changed files with 560 additions and 330 deletions
@@ -118,7 +118,7 @@
            >
              {{ row[column.prop] }}
            </el-link>
-            <el-tag v-else-if="column.status" :type="statusTagType(row.approvalStatus)">
+            <el-tag v-else-if="column.status" :type="statusTagType(row.approvalStatus)" class="status-text">
              {{ row[column.prop] || '-' }}
            </el-tag>
            <span v-else-if="column.money">