Merge remote-tracking branch 'origin/master'

张含笑

2026-01-21 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e

 applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue

@@ -21,7 +21,7 @@
            </el-col>
            <el-col :span="12">
               <div class="label">入库时间</div>
               <div class="val">{{ formData.createTime }}</div>
               <div class="val">{{dayjs(formData.createTime).format('YYYY-MM-DD')}}</div>
            </el-col>
            <el-col :span="12">
               <div class="label">来源</div>
@@ -37,9 +37,9 @@
            </el-col>
            <el-col :span="12">
               <div class="label">报废时间</div>
               <div class="val">{{ formData.scrapTime }}</div>
               <div class="val">{{dayjs(formData.scrapTime).format('YYYY-MM-DD')}}</div>
            </el-col>
            <el-col :span="24">
            <el-col :span="12">
               <div class="label">报废原因</div>
               <div class="val">{{ formData.scrapReason }}</div>
            </el-col>
@@ -59,6 +59,7 @@
import { computed, ref } from 'vue'
import { getDictLabel } from '@ztzf/utils'
import { fwDeviceScrapDetailApi } from '@/views/basicManage/deviceStock/fwDeviceScrapApi'
import dayjs from 'dayjs'

const initForm = () => ({})
const emit = defineEmits(['success'])