From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue
index bb77694..757fb42 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/DeviceTrackDiaLog.vue
@@ -1,5 +1,6 @@
<template>
- <el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close>
+ <el-dialog class="command-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close
+ :close-on-click-modal="false">
<el-form class="dialog-form" ref="formRef" :model="formData" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
@@ -23,7 +24,7 @@
placeholder="请选择"
clearable
>
- <el-option v-for="item in areaOptions" :key="item.value" :label="item.label" :value="item.label" />
+ <el-option v-for="item in areaOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -46,7 +47,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"
@@ -66,8 +67,10 @@
import { ElMessage } from 'element-plus'
import { getUserListApi } from '@/api/system/user'
import { getLazyTree } from '@/api/base/region'
-import { fieldRules } from '@ztzf/utils'
+import { contactPhoneRules, fieldRules } from '@ztzf/utils'
import { fwDeviceTrackSubmitApi } from '@/views/basicManage/deviceStock/fwDeviceTrackApi'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
const initForm = () => ({
charger: '', // 负责人
@@ -82,6 +85,7 @@
const visible = ref(false) // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false)
+const route = useRoute()
const dialogReadonly = computed(() => dialogMode.value === 'view')
const dialogTitle = computed(() => {
if (dialogMode.value === 'edit') {
@@ -97,7 +101,7 @@
const rules = {
charger: fieldRules(true), // 负责人
- contactPhone: fieldRules(true, 50), // 联系电话
+ contactPhone: contactPhoneRules(true, 50), // 联系电话
outTarget: fieldRules(true, 50),
outTime: fieldRules(true),
purpose: fieldRules(true, 50), // 用途
@@ -133,11 +137,18 @@
submitting.value = true
try {
const selected = areaOptions.value.find(item => item.value === formData.value.outTarget)
+
const payload = {
...formData.value,
outTarget: selected?.label ?? formData.value.outTarget,
+ outTargetCode: formData.value.outTarget
}
await fwDeviceTrackSubmitApi(payload)
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '设备出入库'}-出库`,
+ type: 1
+ })
ElMessage.success('出库成功')
visible.value = false
emit('success')
--
Gitblit v1.9.3