Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-09 d07c8e0b866dfadd65f12cbe3c9c74c800b0619a

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

@@ -58,7 +58,7 @@
      <div>
         <el-button type="primary" @click="handleAdd">新增</el-button>
         <el-button type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
         <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
         <!--         <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>-->
      </div>
      <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
@@ -87,7 +87,8 @@
               <el-link @click="handleView(row)" type="primary">查看</el-link>
               <el-link @click="handleEdit(row)" type="warning">编辑</el-link>
               <el-link @click="outbound(row)" type="warning">出库</el-link>
               <el-link @click="handleDelete(row)" type="danger">删除</el-link>
               <el-link @click="scrap(row)" type="warning" v-if="row.status !== 3">报废</el-link>
               <!--               <el-link @click="handleDelete(row)" type="danger">删除</el-link>-->
            </template>
         </el-table-column>
      </el-table>
@@ -102,6 +103,7 @@

      <FormDiaLog ref="dialogRef" @success="getList" />
      <DeviceTrackDiaLog ref="outboundDialogRef" @success="getList" />
      <DeviceScrapDiaLog ref="scrapDialogRef" @success="getList" />
   </basic-container>
</template>

@@ -115,6 +117,7 @@
import { blobDownload, dateRangeFormat, getDictLabel } from '@ztzf/utils'
import { DEVICE_STATUS } from '@ztzf/constants'
import DeviceTrackDiaLog from '@/views/basicManage/deviceStock/DeviceTrackDiaLog.vue'
import DeviceScrapDiaLog from '@/views/basicManage/deviceStock/DeviceScrapDiaLog.vue'

const initSearchParams = () => ({
   deviceName: '', // 设备名称
@@ -126,10 +129,12 @@
const searchParams = ref(initSearchParams()) // 查询参数
const loading = ref(false) // 列表加载中
const list = ref([]) // 列表数据
const total = ref(0) // 总数
const selectedIds = ref([]) // 勾选的设备ID列表
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
const outboundDialogRef = ref(null) // 弹框实例
const scrapDialogRef = ref(null) // 弹框实例
const dictObj = ref({
   deviceType: [], //设备类型
   deviceAtt: [], //设备属性
@@ -183,7 +188,11 @@
}

function outbound(row) {
   outboundDialogRef.value?.open({ mode: 'add', row: { ...row } })
   outboundDialogRef.value?.open({ mode: 'edit', row: { ...row } })
}

function scrap(row) {
   scrapDialogRef.value?.open({ mode: 'edit', row: { ...row } })
}

// 删除