Merge remote-tracking branch 'origin/master'

张含笑

2026-01-14 46f71f1985eabbf84926d6416659370f1e8c8c3e

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

@@ -1,104 +1,89 @@
<template>
   <basic-container>
      <el-form ref="queryParamsRef" :model="searchParams">
         <el-row :gutter="16">
            <el-col :span="4">
               <el-form-item label="名称" prop="deviceName">
                  <el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @clear="handleSearch" />
               </el-form-item>
            </el-col>
            <el-col :span="4">
               <el-form-item label="类型" prop="deviceType">
                  <el-select v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
                     <el-option
                        v-for="item in dictObj.deviceType"
                        :key="item.dictKey"
                        :label="item.dictValue"
                        :value="item.dictKey"
                     />
                  </el-select>
               </el-form-item>
            </el-col>
            <el-col :span="4">
               <el-form-item label="部门" prop="belongDept">
                  <el-tree-select
                     v-model="searchParams.belongDept"
                     :data="deptTree"
                     :props="treeProps"
                     node-key="id"
                     check-strictly
                     clearable
                     @change="handleSearch"
                  />
               </el-form-item>
            </el-col>
            <el-col :span="4">
               <el-form-item label="时间">
                  <el-date-picker
                     popper-class="ztzf-date-picker-popper"
                     class="ztzf-date-picker"
                     v-model="dateRange"
                     type="daterange"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     @change="handleSearch"
                  />
               </el-form-item>
            </el-col>
            <el-col :span="4">
               <el-form-item>
                  <el-button @click="resetForm">重置</el-button>
                  <el-button type="primary" @click="handleSearch">查询</el-button>
               </el-form-item>
            </el-col>
         </el-row>
      <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
         <el-form-item label="名称" prop="deviceName">
            <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.deviceName" placeholder="请输入"
               clearable @clear="handleSearch" />
         </el-form-item>

         <el-form-item label="类型" prop="deviceType">
            <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
               v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
               <el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
                  :value="item.dictKey" />
            </el-select>
         </el-form-item>

         <el-form-item label="部门" prop="belongDept">
            <el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-tree-select-popper"
               v-model="searchParams.belongDept" :data="deptTree" :props="treeProps" node-key="id" check-strictly
               clearable @change="handleSearch" />
         </el-form-item>

         <el-form-item label="时间">
            <el-date-picker popper-class="ztzf-data-cockpit-date-picker-popper"
               class="ztzf-data-cockpit-date-picker" v-model="dateRange" type="daterange" range-separator="至"
               start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss"
               @change="handleSearch" />
         </el-form-item>

         <el-form-item class="history-search-actions">
            <el-button :icon="RefreshRight" @click="resetForm"></el-button>
            <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
         </el-form-item>
      </el-form>
      <div>
         <el-button type="primary" @click="handleAdd">新增</el-button>
         <el-button type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>

      <div class="ztzf-table-toolbar">
         <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
         <el-button :icon="Download" type="primary" @click="exportFile" :loading="exportLoading">导出</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" />
         <el-table-column type="index" width="60" label="序号" />
         <el-table-column prop="deviceName" label="设备名称" />
         <el-table-column prop="deviceType" label="类型">
            <template v-slot="{ row }">
               {{ getDictLabel(row.deviceType, dictObj.deviceType) }}
            </template>
         </el-table-column>
         <el-table-column prop="deviceModel" label="型号" />
         <el-table-column prop="deviceSpecification" label="规格" />
         <el-table-column prop="manufacturer" label="生产厂商" />
         <el-table-column prop="createTime" label="入库时间" />
         <el-table-column prop="source" label="来源" />
         <el-table-column prop="purpose" label="用途" />
         <el-table-column prop="belongDeptName" label="所属部门" />
         <el-table-column prop="charger" label="负责人" />
         <el-table-column prop="yxzt" label="运行状态">
            <template v-slot="{ row }">
               {{ DEVICE_STATUS[row.status] || '-' }}
            </template>
         </el-table-column>
         <el-table-column label="操作">
            <template v-slot="{ row }">
               <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="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>
      <div>
         <el-pagination
            v-model:current-page="searchParams.current"
            v-model:page-size="searchParams.size"
            :total="total"
            @change="getList"
         />

      <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
         <div class="ztzf-table-content ztzf-table-content-bg">
            <el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="46" />
               <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
               <el-table-column prop="deviceName" show-overflow-tooltip width="130" label="设备名称" />
               <el-table-column prop="deviceType" show-overflow-tooltip width="130" label="类型">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.deviceType, dictObj.deviceType) }}
                  </template>
               </el-table-column>
               <el-table-column prop="deviceModel" show-overflow-tooltip width="98" label="型号" />
               <el-table-column prop="deviceSpecification" show-overflow-tooltip width="112" label="规格" />
               <el-table-column prop="manufacturer" show-overflow-tooltip width="130" label="生产厂商" />
               <el-table-column prop="createTime" show-overflow-tooltip width="96" label="入库时间">
                  <template v-slot="{ row }">
                     {{ formatDateToSlash(row.createTime) }}
                  </template>
               </el-table-column>
               <el-table-column prop="source" show-overflow-tooltip width="112" label="来源" />
               <el-table-column prop="purpose" show-overflow-tooltip width="206" label="用途" />
               <el-table-column prop="belongDeptName" show-overflow-tooltip width="124" label="所属部门" />
               <el-table-column prop="charger" show-overflow-tooltip width="100" label="负责人" />
               <el-table-column prop="yxzt" show-overflow-tooltip width="116" label="运行状态">
                  <template v-slot="{ row }">
                     {{ DEVICE_STATUS[row.status] || '-' }}
                  </template>
               </el-table-column>
               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link @click="handleView(row)">查看</el-link>
                     <el-link @click="handleEdit(row)">编辑</el-link>
                     <el-link @click="outbound(row)">出库</el-link>
                     <el-link @click="scrap(row)" v-if="row.status !== 3">报废</el-link>
                     <!--               <el-link @click="handleDelete(row)" type="danger">删除</el-link>-->
                  </template>
               </el-table-column>
            </el-table>
         </div>

         <div class="ztzf-table-pagination">
            <el-pagination popper-class="ztzf-data-cockpit-select-popper"
               v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
               layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
         </div>
      </div>

      <FormDiaLog ref="dialogRef" @success="getList" />
@@ -108,13 +93,14 @@
</template>

<script setup>
import { Search, RefreshRight, Plus, Download } from '@element-plus/icons-vue'
import { onMounted, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { exportFwDeviceApi, fwDevicePageApi, fwDeviceRemoveApi } from '@/views/basicManage/deviceStock/fwDevice'
import FormDiaLog from './FormDiaLog.vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDeptTree } from '@/api/system/dept'
import { blobDownload, dateRangeFormat, getDictLabel } from '@ztzf/utils'
import { blobDownload, dateRangeFormat, getDictLabel, formatDateToSlash } 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'
@@ -150,7 +136,7 @@
provide('deptTree', deptTree)

// 获取列表
async function getList() {
async function getList () {
   const range = dateRangeFormat(dateRange.value)
   loading.value = true
   try {
@@ -164,13 +150,13 @@
}

// 查询
function handleSearch() {
function handleSearch () {
   searchParams.value.current = 1
   getList()
}

// 重置查询
function resetForm() {
function resetForm () {
   dateRange.value = []
   queryParamsRef.value?.resetFields()
   searchParams.value.current = 1
@@ -178,25 +164,25 @@
}

// 查看
function handleView(row) {
function handleView (row) {
   dialogRef.value?.open({ mode: 'view', row: { ...row } })
}

// 编辑
function handleEdit(row) {
function handleEdit (row) {
   dialogRef.value?.open({ mode: 'edit', row: { ...row } })
}

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

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

// 删除
async function handleDelete(row) {
async function handleDelete (row) {
   const tips = row ? '该条' : '选中的项'
   await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', { type: 'warning' })
   const ids = row ? row.id : selectedIds.value.join(',')
@@ -207,11 +193,11 @@
}

// 勾选值设置
function handleSelectionChange(rows) {
function handleSelectionChange (rows) {
   selectedIds.value = rows.map(item => item.id)
}

function exportFile() {
function exportFile () {
   exportLoading.value = true
   exportFwDeviceApi()
      .then(res => {
@@ -223,21 +209,21 @@
}

// 获取字典
function getDictList() {
function getDictList () {
   getDictionaryByCode('deviceType,deviceAtt').then(res => {
      dictObj.value = res.data.data
   })
}

// 获取部门树
function getDeptTreeFun() {
function getDeptTreeFun () {
   getDeptTree().then(res => {
      deptTree.value = res.data.data
   })
}

// 新增
function handleAdd() {
function handleAdd () {
   dialogRef.value?.open({ mode: 'add' })
}