Merge remote-tracking branch 'origin/master'

张含笑

2026-01-23 cabb1279e9370edfebdef62f6eba272eeae8fe67

 applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue

@@ -16,7 +16,7 @@
         </el-row>
      </el-form>
      <template #footer>
         <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
         <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
         <el-button
            v-if="!dialogReadonly"
            type="primary"