Merge remote-tracking branch 'origin/master'

# Conflicts: # src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
2026-07-03 16:06:58 +08:00
parent baa9a3fde6 826c17c688
commit efcc03e7fa
8 changed files with 185 additions and 31 deletions
@@ -213,7 +213,7 @@
            <span v-else>-</span>
          </template>
          <template v-if="column.key === 'feedbackAction'">
-            <a-button type="link" size="small" @click="handleEditFeedback(record)">编辑</a-button>
+            <a-button type="link" size="small" @click="handleEditFeedback(record)">{{ showJiJianFields && nonJiJianFieldsReadonly ? '督察' : '编辑' }}</a-button>
            <a-popconfirm title="确定删除该反馈吗？" @confirm="handleDeleteFeedback(record)">
              <a-button type="link" size="small" danger>删除</a-button>
            </a-popconfirm>