From 0c92fd00fae033a2aa04bb65b2d32bd2c8f9fd4a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 04 Feb 2026 15:48:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 2e63d4d..92a83a7 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -183,7 +183,7 @@
import { ElMessage } from 'element-plus'
import { fwDeviceDetailApi, fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'
import { getUserListApi } from '@/api/system/user'
-import { fieldRules, getDictLabel } from '@ztzf/utils'
+import { contactPhoneRules, fieldRules, getDictLabel } from '@ztzf/utils'
import { fwDeviceTrackPageApi } from '@/views/basicManage/deviceStock/fwDeviceTrackApi'
import { saveOperationLog } from '@ztzf/apis'
import { useRoute } from 'vue-router'
@@ -244,7 +244,7 @@
source: fieldRules(true, 50),
purpose: fieldRules(true, 50),
belongDept: fieldRules(true),
- contactPhone: fieldRules(true, 50),
+ contactPhone: contactPhoneRules(true, 50),
charger: fieldRules(true),
}
@@ -272,9 +272,16 @@
const isValid = await formRef.value?.validate().catch(() => false)
if (!isValid) return
submitting.value = true
+
+ let deviceSet = {}
+
try {
- await fwDeviceSubmitApi(formData.value)
const actionText = dialogMode.value === 'add' ? '建档' : '编辑'
+ deviceSet = dialogMode.value === 'add' ? { status: 0 } : {}
+ await fwDeviceSubmitApi({
+ ...formData.value,
+ ...deviceSet
+ })
saveOperationLog({
requestUri: route.path,
title: `${route.name || '设备出入库'}-${actionText}`,
--
Gitblit v1.9.3