Merge remote-tracking branch 'origin/master'

张含笑

2026-01-21 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e

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

@@ -1,35 +1,26 @@
<template>
   <el-dialog v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close>
      <el-form ref="formRef" :model="formData" :rules="rules" label-width="100px">
   <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="24">
               <el-form-item label="报废原因" prop="scrapReason">
                  <el-input v-model="formData.scrapReason" maxlength="200" type="textarea" placeholder="请输入" clearable />
                  <el-input class="command-input" v-model="formData.scrapReason" maxlength="200" type="textarea" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="24">
               <el-form-item label="处置方式" prop="disposeWay">
                  <el-input v-model="formData.disposeWay" maxlength="200" type="textarea" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="报废时间" prop="scrapTime">
                  <el-date-picker
                     v-model="formData.scrapTime"
                     type="date"
                     placeholder="选择日期"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     clearable
                  />
                  <el-input class="command-input" v-model="formData.disposeWay" maxlength="200" type="textarea" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
         </el-row>
      </el-form>
      <template #footer>
         <el-button @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
         <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
         <el-button
            v-if="!dialogReadonly"
            type="primary"
            color="#284FE3"
            :loading="submitting"
            :disabled="submitting"
            @click="handleSubmit"
@@ -45,6 +36,7 @@
import { ElMessage } from 'element-plus'
import { fieldRules } from '@ztzf/utils'
import { fwDeviceScrapSaveApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
import dayjs from 'dayjs'

const initForm = () => ({
   deviceId: '', // 设备ID
@@ -72,7 +64,6 @@
const rules = {
   scrapReason: fieldRules(true, 200),
   disposeWay: fieldRules(true, 200),
   scrapTime: fieldRules(true),
}

// 关闭弹框
@@ -86,8 +77,9 @@
   if (!isValid) return
   submitting.value = true
   try {
      formData.value.scrapTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
      await fwDeviceScrapSaveApi(formData.value)
      ElMessage.success(dialogMode.value === 'add' ? '出库成功' : '更新成功')
      ElMessage.success('报废成功')
      visible.value = false
      emit('success')
   } finally {