Merge remote-tracking branch 'origin/develop' into develop

openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue

@@ -582,6 +582,26 @@
                 <span>{{ scope.row.refundMethod || '-' }}</span>
               </template>
             </el-table-column>
+            <!-- 操作列：只在全部和正常挂号标签页显示，退号记录标签页不显示 -->
+            <el-table-column
+              v-if="queryType !== 'returned'"
+              label="操作"
+              align="center"
+              width="120"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button
+                  link
+                  type="primary"
+                  :disabled="scope.row.statusEnum === 6 || scope.row.statusEnum !== 1"
+                  :title="getReturnTooltip(scope.row)"
+                  @click="handleReturn(scope.row)"
+                >
+                  退号
+                </el-button>
+              </template>
+            </el-table-column>
           </el-table>
           <pagination
             v-show="total > 0"