From ec2ff7ebf2f4b1baa9fb931d0e6fcf7134106f51 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 29 Jan 2026 10:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
index ad4958c..374884a 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
@@ -13,6 +13,7 @@
<el-input class="command-input" v-model="formData.disposeWay" maxlength="200" type="textarea" placeholder="请输入" clearable />
</el-form-item>
</el-col>
+ <div v-if="checkAreaBind" class="warning-text"> 注：该设备已绑定区域，报废设备该区域无法正常使用，是否报废？</div>
</el-row>
</el-form>
<template #footer>
@@ -35,7 +36,7 @@
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { fieldRules } from '@ztzf/utils'
-import { fwDeviceScrapSaveApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
+import { fwDeviceScrapSaveApi,fivDevicelcheckAreaBindApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
import dayjs from 'dayjs'
import { saveOperationLog } from '@ztzf/apis'
import { useRoute } from 'vue-router'
@@ -105,9 +106,30 @@
dialogMode.value = mode || 'add'
visible.value = true
formData.value.deviceId = row.id
+ getCheckAreaBind()
+}
+const checkAreaBind = ref(false)
+function getCheckAreaBind() {
+ fivDevicelcheckAreaBindApi({
+ deviceId: formData.value.deviceId
+ }).then(res => {
+ checkAreaBind.value = res.data.data
+ })
}
-onMounted(() => {})
+onMounted(() => {
+ getCheckAreaBind()
+})
defineExpose({ open })
</script>
+
+<style scoped lang="scss">
+.warning-text {
+ width: 100%;
+ color: red;
+ font-size: 14px;
+ text-align: center;
+ margin: -10px 0 10px 0;
+}
+</style>
--
Gitblit v1.9.3