详情

src/router/modules/remaining.ts

@@ -103,7 +103,20 @@ const remainingRouter: AppRouteRecordRaw[] = [
           title: '设备台账编辑',
           activeMenu: '/device/base'
         }
-      }]
+      },{
+        path: 'device/detail/:id',
+        component: () => import('@/views/pms/device/DeviceInfo.vue'),
+        name: 'DeviceDetailInfo',
+        meta: {
+          noCache: false,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:info',
+          title: '设备台账详情',
+          activeMenu: '/device/info'
+        }
+      },
+    ]
   },
   {
     path: '/user',

src/views/pms/device/DeviceInfo.vue

@@ -0,0 +1,275 @@
+<template>
+  <ContentWrap>
+    <div style="display: flex;flex-direction: row; height: 15em;margin-top: 10px">
+      <div style="flex: 1;height: 10em;margin-left: 20px">
+        <img :src="formData.picUrl" style="width: 30em;height: 15em"/>
+      </div>
+      <div style="flex: 2.5;height: 15em">
+        <el-form
+          ref="formRef"
+          :disabled="false"
+          :model="formData"
+          label-width="120px"
+        >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="资产编码:" prop="deviceCode">{{formData.deviceCode}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称:" prop="deviceName">{{formData.deviceName}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品牌:" prop="brand">
+              {{formData.brandName}}
+            </el-form-item>
+          </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="所在部门:" prop="orgId">
+                {{formData.deptName}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="资产类别:" prop="assetClass">
+                {{formData.assetClassName}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备状态:" prop="deviceStatus">
+                {{ getDictLabel(DICT_TYPE.PMS_DEVICE_STATUS, formData.deviceStatus) }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+          <el-col :span="8">
+            <el-form-item label="资产性质:" prop="assetProperty">
+              {{getDictLabel(DICT_TYPE.PMS_ASSET_PROPERTY, formData.assetProperty)}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号:" prop="model">
+              <el-select
+                v-model="formData.model"
+                :model-value="modelLabel"
+                placeholder="请输入规格型号"
+                @click="openModelForm"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      </div>
+    </div>
+  </ContentWrap>
+  <ContentWrap v-loading="formLoading">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="基础信息" name="info">
+        <el-form style="margin-top: 5px;margin-left: 15px">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="制造商:" prop="manufacturerId">
+                {{formData.zzName}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产日期:" prop="manDate">
+                {{formatDate(formData.manDate,'YYYY-MM-DD')}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="供应商" prop="supplierId">
+                {{formData.supplierName?formData.supplierName:'-'}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="铭牌信息:" prop="nameplate">
+                {{formData.nameplate?formData.nameplate:'-'}}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="质保到期:" prop="expires">
+                {{formData.expires?formatDate(formData.expires, 'YYYY-MM-DD'):'-'}}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="采购价格:" prop="plPrice">
+                {{formData.plPrice?formData.plPrice:'-'}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="采购日期:" prop="plDate">
+                {{formData.plDate?formatDate(formData.plDate, 'YYYY-MM-DD'):'-'}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="折旧年限" prop="plYear">
+                {{formData.plYear?formData.plYear:'-'}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="折旧开始日期" prop="plStartDate">
+                {{formData.plStartDate?formatDate(formData.plStartDate,'YYYY-MM-DD'):'-'}}
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="已提折旧月数" prop="plMonthed">
+                {{formData.plMonthed?formData.plMonthed:'-'}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="已提折旧金额" prop="plAmounted">
+                {{formData.plAmounted?formData.plAmounted:'-'}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="剩余金额" prop="remainAmount">
+                {{formData.remainAmount?formData.remainAmount:'-'}}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col v-for="field in list" :key="field.id" :span="6">
+              <el-form-item :label="field.label" :prop="field.model" :rules="field.rules">
+                {{formData[field.prop]}}
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane label="证件信息" name="cert">
+        <CertList
+          ref="certRef"
+          v-model:activeName="activeName"
+          :propFormData="formData"
+          :ifAlone="false"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="联系人信息" name="contact">
+        <ContactList
+          ref="contactRef"
+          v-model:activeName="activeName"
+          :propFormData="formData"
+          :ifAlone="false"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="核心产品" name="core">
+        <CoreList
+          ref="coreRef"
+          v-model:activeName="activeName"
+          :propFormData="formData"
+          :ifAlone="false"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="联系记录" name="connect">
+        <ConnectList
+          ref="connectRef"
+          v-model:activeName="activeName"
+          :propFormData="formData"
+          :ifAlone="false"
+        />
+      </el-tab-pane>
+    </el-tabs>
+    <!--    <el-form>-->
+    <!--      <el-form-item style="float: right">-->
+    <!--        <el-button v-if="!isDetail" :loading="formLoading" type="primary" @click="submitForm">-->
+    <!--          保存-->
+    <!--        </el-button>-->
+    <!--        <el-button @click="close">返回</el-button>-->
+    <!--      </el-form-item>-->
+    <!--    </el-form>-->
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import SupplierInfoForm from '@/views/supplier/base/form/SupplierInfoForm.vue'
+import CertList from '@/views/supplier/certificate/index.vue'
+import ContactList from '@/views/supplier/contact/index.vue'
+import CoreList from '@/views/supplier/coreproduct/index.vue'
+import ConnectList from '@/views/supplier/connect/index.vue'
+import {IotDeviceVO, IotDeviceApi} from "@/api/pms/device";
+import {defaultProps} from "@/utils/tree";
+import {DICT_TYPE, getDictLabel, getStrDictOptions} from "@/utils/dict";
+import {formatDate} from "../../../utils/formatTime";
+
+defineOptions({ name: 'DeviceDetailInfo' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { params } = useRoute() // 查询参数
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const activeName = ref('info') // Tag 激活的窗口
+const infoRef = ref() // 商品信息 Ref
+const id = params.id as unknown as number
+// SPU 表单数据
+const formData = ref({
+  id: undefined,
+  code: undefined,
+  name: undefined,
+  classification: undefined,
+  type: undefined,
+  nature: undefined,
+  creditCode: undefined,
+  tin: undefined,
+  corporation: undefined,
+  incorporationDate: undefined,
+  address: undefined,
+  bizScope: undefined,
+  registeredCapital: undefined,
+  annualTurnove: undefined,
+  size: undefined,
+  status: undefined,
+  remark: undefined,
+  deptName: undefined
+})
+
+/** 获得详情 */
+const getDetail = async () => {
+  if (id) {
+    formLoading.value = true
+    try {
+      const res = (await IotDeviceApi.getIotDevice(id)) as IotDeviceVO
+      // res.skus?.forEach((item) => {
+      //   if (isDetail.value) {
+      //     item.price = floatToFixed2(item.price)
+      //     item.marketPrice = floatToFixed2(item.marketPrice)
+      //     item.costPrice = floatToFixed2(item.costPrice)
+      //     item.firstBrokeragePrice = floatToFixed2(item.firstBrokeragePrice)
+      //     item.secondBrokeragePrice = floatToFixed2(item.secondBrokeragePrice)
+      //   } else {
+      //     // 回显价格分转元
+      //     item.price = formatToFraction(item.price)
+      //     item.marketPrice = formatToFraction(item.marketPrice)
+      //     item.costPrice = formatToFraction(item.costPrice)
+      //     item.firstBrokeragePrice = formatToFraction(item.firstBrokeragePrice)
+      //     item.secondBrokeragePrice = formatToFraction(item.secondBrokeragePrice)
+      //   }
+      // })
+      formData.value = res
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+/** 关闭按钮 */
+// const close = () => {
+//   delView(unref(currentRoute))
+//   push({ name: 'Suppliers' })
+// }
+
+/** 初始化 */
+onMounted(async () => {
+  await getDetail()
+})
+</script>
+<style scoped>
+
+</style>

src/views/pms/device/IotDeviceForm.vue

@@ -88,7 +88,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号" prop="model">
-              <el-input v-model="formData.model" placeholder="请输入规格型号" />
+              <el-select
+                v-model="formData.model"
+                :model-value="modelLabel"
+                placeholder="请输入规格型号"
+                @click="openModelForm"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -331,11 +336,13 @@
     </el-form>
   </ContentWrap>
   <BrandList ref="brandFormRef" @choose="brandChoose" />
+  <ModelList ref="modelFormRef" @choose="modelChoose" />
   <CustomerList ref="customerFormRef" @choose="customerChoose" />
 </template>
 <script setup lang="ts">
 import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import BrandList from '@/views/pms/device/BrandList.vue'
+import ModelList from '@/views/pms/device/ModelList.vue'
 import CustomerList from '@/views/pms/device/CustomerList.vue'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
@@ -364,6 +371,7 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const brandLabel = ref('') // 表单的类型：create - 新增；update - 修改
+const modelLabel = ref('') // 表单的类型：create - 新增；update - 修改
 const zzLabel = ref('') // 表单的类型：create - 新增；update - 修改
 const supplierLabel = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -426,6 +434,7 @@ const list = [
 
 const assetclasschange = () => {
   const assetClass = formData.value.assetClass
+  debugger
   // todo 调用获取动态模板接口
 }
 
@@ -433,6 +442,10 @@ const brandChoose = (row) => {
   formData.value.brand = row.id
   brandLabel.value = row.value
 }
+const modelChoose = (row) => {
+  formData.value.model = row.id
+  modelLabel.value = row.value
+}
 const customerChoose = (row) => {
   formData.value[row.customerNature + 'Id'] = row.id
   if (row.customerNature == 'supplier') {
@@ -446,6 +459,10 @@ const brandFormRef = ref()
 const openForm = () => {
   brandFormRef.value.open()
 }
+const modelFormRef = ref()
+const openModelForm = () =>{
+  modelFormRef.value.open()
+}
 const customerFormRef = ref()
 const openCustomer = (type) => {
   customerFormRef.value.open(type)

src/views/pms/device/ModelList.vue

@@ -0,0 +1,144 @@
+<template>
+  <Dialog v-model="dialogVisible" title="选择品牌" style="width: 1100px; max-height: 800px">
+    <ContentWrap>
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item label="型号名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入型号名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+    <ContentWrap>
+      <el-table
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        @row-click="handleRowClick"
+      >
+        <el-table-column width="60" label="选择">
+          <template #default="{ row }">
+            <el-radio
+              :model-value="selectedRow?.id"
+              :label="row.id"
+              @click.stop="selectRow(row)"
+              class="no-label-radio"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="型号名称" align="center" prop="name" />
+        <el-table-column label="符合标准" align="center" prop="standard" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          width="180"
+          :formatter="dateFormatter"
+        />
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import * as DictDataApi from '@/api/system/dict/dict.data'
+import { DictDataVO } from '@/api/system/dict/dict.data'
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+
+const emit = defineEmits(['choose']) // 定义 success 事件，用于操作成功后的回调
+const dialogVisible = ref(false) // 弹窗的是否展示
+const loading = ref(true) // 列表的加载中
+const queryFormRef = ref() // 搜索的表单
+const list = ref<DictDataVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: '',
+  status: undefined
+})
+
+const selectedRow = ref(null)
+
+// 处理单选逻辑
+const selectRow = (row) => {
+  selectedRow.value = selectedRow.value?.id === row.id ? null : row
+  emit('choose', row)
+  dialogVisible.value = false
+}
+
+// 点击整行选中
+const handleRowClick = (row) => {
+  selectRow(row)
+}
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DictDataApi.getDictDataPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+const choose = (row: DictDataVO) => {
+  emit('choose', row)
+  dialogVisible.value = false
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 查询字典（精简)列表
+})
+</script>
+<style lang="scss">
+.no-label-radio .el-radio__label {
+  display: none;
+}
+.no-label-radio .el-radio__inner {
+  margin-right: 0;
+}
+</style>

src/views/pms/device/index.vue

@@ -38,11 +38,16 @@
       <el-form-item label="设备状态" prop="deviceStatus">
         <el-select
           v-model="queryParams.deviceStatus"
-          placeholder="请选择设备状态"
+          placeholder="设备状态"
           clearable
-          class="!w-200px"
+          class="!w-240px"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.PMS_DEVICE_STATUS)"
+            :key="dict.id"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
 
@@ -89,7 +94,16 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="资产编码" align="center" prop="deviceCode" />
-      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" >
+        <template #default="scope">
+          <el-link :underline="false" type="primary" @click="handleDetail(scope.row.id)">
+            {{ scope.row.deviceName }}
+          </el-link>
+        </template>
+<!--        <template #default="{ row }">-->
+<!--          <div class="custom-cell">{{ row.deviceName }}</div>-->
+<!--        </template>-->
+      </el-table-column>
       <el-table-column label="所在部门" align="center" prop="deptName" />
       <el-table-column label="设备状态" align="center" prop="deviceStatus">
         <template #default="scope">
@@ -137,6 +151,13 @@
           >
             删除
           </el-button>
+<!--          <el-button-->
+<!--            link-->
+<!--            type="info"-->
+<!--            @click="handleDetail(scope.row.id)"-->
+<!--          >-->
+<!--            详情-->
+<!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -157,7 +178,7 @@
 import download from '@/utils/download'
 import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import IotDeviceForm from './IotDeviceForm.vue'
-import {DICT_TYPE} from "@/utils/dict";
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 import {dateFormatter} from "@/utils/formatTime";
 
 /** 设备台账 列表 */
@@ -257,6 +278,10 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+const handleDetail = (id: number) => {
+  push({ name: 'DeviceDetailInfo', params:{id} })
+}
+
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {
@@ -277,3 +302,5 @@ onMounted(() => {
   getList()
 })
 </script>
+<style scoped>
+</style>