设备台账调整

src/router/modules/remaining.ts

@@ -70,6 +70,41 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
+  {
+    path: '/iotpms/iotdevicepms', // 商品中心
+    component: Layout,
+    name: 'PmsDeviceCenter',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'device/detail/add',
+        component: () => import('@/views/pms/device/IotDeviceForm.vue'),
+        name: 'DeviceDetailAdd',
+        meta: {
+          noCache: false,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:edit',
+          title: '设备台账添加',
+          activeMenu: '/device/base'
+        }
+      },
+      {
+        path: 'device/detail/edit/:id(\\d+)',
+        component: () => import('@/views/pms/device/IotDeviceForm.vue'),
+        name: 'DeviceDetailEdit',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:edit',
+          title: '设备台账编辑',
+          activeMenu: '/device/base'
+        }
+      }]
+  },
   {
     path: '/user',
     component: Layout,

src/views/pms/device/IotDeviceForm.vue

@@ -1,128 +1,292 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <ContentWrap v-loading="formLoading">
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
       label-width="100px"
-      v-loading="formLoading"
     >
-      <el-form-item label="资产编码" prop="deviceCode">
-        <el-input v-model="formData.deviceCode" placeholder="请输入资产编码" />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="deivceName">
-        <el-input v-model="formData.deivceName" placeholder="请输入设备名称" />
-      </el-form-item>
-      <el-form-item label="品牌" prop="brand">
-        <el-input v-model="formData.brand" placeholder="请输入品牌" />
-      </el-form-item>
-      <el-form-item label="规格型号" prop="model">
-        <el-input v-model="formData.model" placeholder="请输入规格型号" />
-      </el-form-item>
-      <el-form-item label="所在部门" prop="orgId">
-        <el-input v-model="formData.orgId" placeholder="请输入所在部门" />
-      </el-form-item>
-      <el-form-item label="设备状态" prop="deviceStatus">
-        <el-radio-group v-model="formData.deviceStatus">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="资产性质" prop="assetProperty">
-        <el-input v-model="formData.assetProperty" placeholder="请输入资产性质" />
-      </el-form-item>
-      <el-form-item label="图片" prop="picUrl">
-        <el-input v-model="formData.picUrl" placeholder="请输入图片" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
-      </el-form-item>
-      <el-form-item label="制造商id" prop="manufacturerId">
-        <el-input v-model="formData.manufacturerId" placeholder="请输入制造商id" />
-      </el-form-item>
-      <el-form-item label="供应商id" prop="supplierId">
-        <el-input v-model="formData.supplierId" placeholder="请输入供应商id" />
-      </el-form-item>
-      <el-form-item label="生产日期" prop="manDate">
-        <el-date-picker
-          v-model="formData.manDate"
-          type="date"
-          value-format="x"
-          placeholder="选择生产日期"
-        />
-      </el-form-item>
-      <el-form-item label="铭牌信息" prop="nameplate">
-        <el-input v-model="formData.nameplate" placeholder="请输入铭牌信息" />
-      </el-form-item>
-      <el-form-item label="质保到期" prop="expires">
-        <el-input v-model="formData.expires" placeholder="请输入质保到期" />
-      </el-form-item>
-      <el-form-item label="采购/租赁价格" prop="plPrice">
-        <el-input v-model="formData.plPrice" placeholder="请输入采购/租赁价格" />
-      </el-form-item>
-      <el-form-item label="采购/租赁日期" prop="plDate">
-        <el-date-picker
-          v-model="formData.plDate"
-          type="date"
-          value-format="x"
-          placeholder="选择采购/租赁日期"
-        />
-      </el-form-item>
-      <el-form-item label="折旧年限" prop="plYear">
-        <el-input v-model="formData.plYear" placeholder="请输入折旧年限" />
-      </el-form-item>
-      <el-form-item label="折旧开始日期" prop="plStartDate">
-        <el-date-picker
-          v-model="formData.plStartDate"
-          type="date"
-          value-format="x"
-          placeholder="选择折旧开始日期"
-        />
-      </el-form-item>
-      <el-form-item label="已提折旧月数" prop="plMonthed">
-        <el-input v-model="formData.plMonthed" placeholder="请输入已提折旧月数" />
-      </el-form-item>
-      <el-form-item label="已提折旧金额" prop="plAmounted">
-        <el-input v-model="formData.plAmounted" placeholder="请输入已提折旧金额" />
-      </el-form-item>
-      <el-form-item label="剩余金额" prop="remainAmount">
-        <el-input v-model="formData.remainAmount" placeholder="请输入剩余金额" />
-      </el-form-item>
-      <el-form-item label="资料分类id" prop="infoId">
-        <el-input v-model="formData.infoId" placeholder="请输入资料分类id" />
-      </el-form-item>
-      <el-form-item label="资料类型" prop="infoType">
-        <el-select v-model="formData.infoType" placeholder="请选择资料类型">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="资料名称" prop="infoName">
-        <el-input v-model="formData.infoName" placeholder="请输入资料名称" />
-      </el-form-item>
-      <el-form-item label="资料备注" prop="infoRemark">
-        <el-input v-model="formData.infoRemark" placeholder="请输入资料备注" />
-      </el-form-item>
-      <el-form-item label="资料附件" prop="infoUrl">
-        <el-input v-model="formData.infoUrl" placeholder="请输入资料附件" />
-      </el-form-item>
+      <div style="margin-bottom: 20px;margin-top: 10px;margin-left: 15px">
+        <el-button @click="baseInfoClick" style="font-size: 18px;border:none">
+          <Icon
+            color="black"
+            icon="ep:expand"
+            :size="18"
+            class="cursor-pointer"
+          />
+          基本信息
+          <Icon
+            color="black"
+            :icon="baseIsExpanded?'fa-solid:angle-double-down':'fa-solid:angle-double-right'"
+            :size="18"
+            class="cursor-pointer"
+          />
+        </el-button>
+      </div>
+      <div class="base-expandable-content" :class="{ 'is-expanded': baseIsExpanded }">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="资产编码" prop="deviceCode">
+              <el-input v-model="formData.deviceCode" placeholder="请输入资产编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input v-model="formData.deviceName" placeholder="请输入设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品牌" prop="brand">
+              <el-input v-model="formData.brand" placeholder="请输入品牌" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model="formData.model" placeholder="请输入规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所在部门" prop="orgId">
+              <el-input v-model="formData.orgId" placeholder="请输入所在部门" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+          <el-form-item label="设备状态" prop="deviceStatus">
+            <el-radio-group v-model="formData.deviceStatus">
+              <el-radio value="1">请选择字典生成</el-radio>
+            </el-radio-group>
+          </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="资产性质" prop="assetProperty">
+              <el-input v-model="formData.assetProperty" placeholder="请输入资产性质" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="图片" prop="picUrl">
+              <el-input v-model="formData.picUrl" placeholder="请输入图片" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="margin-bottom: 20px;margin-top: 10px;margin-left: 15px">
+        <el-button @click="zzInfoClick" style="font-size: 18px;border: none">
+          <Icon
+            color="black"
+            icon="ep:expand"
+            :size="18"
+            class="cursor-pointer"
+          />
+          制造信息
+          <Icon
+            color="black"
+            :icon="zzIsExpanded?'fa-solid:angle-double-down':'fa-solid:angle-double-right'"
+            :size="18"
+            class="cursor-pointer"
+          />
+        </el-button>
+      </div>
+      <div class="zz-expandable-content" :class="{ 'is-expanded': zzIsExpanded }">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="制造商id" prop="manufacturerId">
+              <el-input v-model="formData.manufacturerId" placeholder="请输入制造商id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供应商id" prop="supplierId">
+              <el-input v-model="formData.supplierId" placeholder="请输入供应商id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="生产日期" prop="manDate">
+              <el-date-picker
+                v-model="formData.manDate"
+                type="date"
+                value-format="x"
+                placeholder="选择生产日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="铭牌信息" prop="nameplate">
+              <el-input v-model="formData.nameplate" placeholder="请输入铭牌信息" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="质保到期" prop="expires">
+              <el-input v-model="formData.expires" placeholder="请输入质保到期" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="margin-bottom: 20px;margin-top: 10px;margin-left: 15px">
+        <el-button @click="cwInfoClick" style=" font-size: 18px;border: none">
+          <Icon
+            color="black"
+            icon="ep:expand"
+            :size="18"
+            class="cursor-pointer"
+          />
+          财务信息
+          <Icon
+            color="black"
+            :icon="cwIsExpanded?'fa-solid:angle-double-down':'fa-solid:angle-double-right'"
+            :size="18"
+            class="cursor-pointer"
+          />
+        </el-button>
+      </div>
+      <div class="cw-expandable-content" :class="{ 'is-expanded': cwIsExpanded }">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="采购价格" prop="plPrice">
+              <el-input v-model="formData.plPrice" type="number" placeholder="请输入采购/租赁价格" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="采购日期" prop="plDate">
+              <el-date-picker
+                v-model="formData.plDate"
+                type="date"
+                value-format="x"
+                placeholder="选择采购日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="折旧年限" prop="plYear">
+              <el-input v-model="formData.plYear" type="number" placeholder="请输入折旧年限" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="折旧开始日期" prop="plStartDate">
+              <el-date-picker
+                v-model="formData.plStartDate"
+                type="date"
+                value-format="x"
+                placeholder="选择折旧开始日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="已提折旧月数" prop="plMonthed">
+              <el-input v-model="formData.plMonthed" placeholder="请输入已提折旧月数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="已提折旧金额" prop="plAmounted">
+              <el-input v-model="formData.plAmounted" placeholder="请输入已提折旧金额" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="剩余金额" prop="remainAmount">
+              <el-input v-model="formData.remainAmount" placeholder="请输入剩余金额" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="margin-bottom: 20px;margin-top: 10px;margin-left: 15px">
+
+        <el-button @click="qtInfoClick" style="font-size: 18px;border: none">
+          <Icon
+            color="black"
+            icon="ep:expand"
+            :size="18"
+            class="cursor-pointer"
+          />其它信息
+          <Icon
+            color="black"
+            :icon="qtIsExpanded?'fa-solid:angle-double-down':'fa-solid:angle-double-right'"
+            :size="18"
+            class="cursor-pointer"
+          />
+        </el-button>
+
+      </div>
+      <div class="qt-expandable-content" :class="{ 'is-expanded': qtIsExpanded }">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="资料分类id" prop="infoId">
+            <el-input v-model="formData.infoId" placeholder="请输入资料分类id" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="资料类型" prop="infoType">
+            <el-select v-model="formData.infoType" placeholder="请选择资料类型">
+              <el-option label="请选择字典生成" value="" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="资料名称" prop="infoName">
+            <el-input v-model="formData.infoName" placeholder="请输入资料名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="资料备注" prop="infoRemark">
+            <el-input v-model="formData.infoRemark" placeholder="请输入资料备注" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="资料附件" prop="infoUrl">
+            <el-input v-model="formData.infoUrl" placeholder="请输入资料附件" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-form-item label="动态模板信息" prop="templateJson">
         <el-input v-model="formData.templateJson" placeholder="请输入动态模板信息" />
       </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+          </el-form-item>
+      </div>
     </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
+<!--    <template #footer>-->
+<!--      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>-->
+<!--      <el-button @click="dialogVisible = false">取 消</el-button>-->
+<!--    </template>-->
+  <el-form>
+    <el-form-item style="float: right">
+      <el-button type="success" @click="allzhankai">一键展开</el-button>
+      <el-button type="info" @click="allshouqi">一键收起</el-button>
+      <el-button v-if="!isDetail" :loading="formLoading" type="warning"  @click="submitForm">
+        保存
+      </el-button>
+      <el-button @click="close" type="primary">返回</el-button>
+    </el-form-item>
+  </el-form>
+  </ContentWrap>
 </template>
 <script setup lang="ts">
-import { IotDeviceApi, IotDeviceVO } from '@/api/rq/iotdevice'
+import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 
 /** 设备台账 表单 */
 defineOptions({ name: 'IotDeviceForm' })
+const baseIsExpanded = ref(true); // 控制表单是否展开的变量
+const zzIsExpanded = ref(false); // 控制表单是否展开的变量
+const cwIsExpanded = ref(false); // 控制表单是否展开的变量
+const qtIsExpanded = ref(false); // 控制表单是否展开的变量
 
+const { params, name } = useRoute() // 查询参数
+const id = params.id;
+const isDetail = params.isDetail;
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -130,7 +294,7 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   deviceCode: undefined,
-  deivceName: undefined,
+  deviceName: undefined,
   brand: undefined,
   model: undefined,
   orgId: undefined,
@@ -159,7 +323,7 @@ const formData = ref({
 })
 const formRules = reactive({
   deviceCode: [{ required: true, message: '资产编码不能为空', trigger: 'blur' }],
-  deivceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+  deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
   brand: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
   orgId: [{ required: true, message: '所在部门不能为空', trigger: 'blur' }],
   deviceStatus: [{ required: true, message: '设备状态不能为空', trigger: 'blur' }],
@@ -169,6 +333,18 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 
+const allshouqi = () =>{
+  baseIsExpanded.value = false
+  zzIsExpanded.value = false
+  cwIsExpanded.value = false
+  qtIsExpanded.value = false
+}
+const allzhankai = () => {
+  baseIsExpanded.value = true
+  zzIsExpanded.value = true
+  cwIsExpanded.value = true
+  qtIsExpanded.value = true
+}
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -187,6 +363,24 @@ const open = async (type: string, id?: number) => {
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
+const close = () => {
+  delView(unref(currentRoute))
+  push({ name: 'Suppliers',query: {
+      date: new Date().getTime(),
+    } })
+}
+const baseInfoClick = ()=> {
+  baseIsExpanded.value = !baseIsExpanded.value; // 切换展开状态
+}
+const zzInfoClick = ()=> {
+  zzIsExpanded.value = !zzIsExpanded.value; // 切换展开状态
+}
+const cwInfoClick = ()=> {
+  cwIsExpanded.value = !cwIsExpanded.value; // 切换展开状态
+}
+const qtInfoClick = ()=> {
+  qtIsExpanded.value = !qtIsExpanded.value; // 切换展开状态
+}
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
@@ -216,7 +410,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     deviceCode: undefined,
-    deivceName: undefined,
+    deviceName: undefined,
     brand: undefined,
     model: undefined,
     orgId: undefined,
@@ -245,4 +439,44 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>
+
+<style scoped lang="scss">
+  .base-expandable-content {
+    max-height: 0; /* 初始高度为0 */
+    overflow: hidden; /* 隐藏溢出的内容 */
+    transition: max-height 0.3s ease; /* 平滑过渡效果 */
+  }
+
+  .base-expandable-content.is-expanded {
+    max-height: 200px; /* 或者根据内容设定一个合适的最大高度 */
+  }
+  .zz-expandable-content {
+    max-height: 0; /* 初始高度为0 */
+    overflow: hidden; /* 隐藏溢出的内容 */
+    transition: max-height 0.3s ease; /* 平滑过渡效果 */
+  }
+
+  .zz-expandable-content.is-expanded {
+    max-height: 200px; /* 或者根据内容设定一个合适的最大高度 */
+  }
+  .cw-expandable-content {
+    max-height: 0; /* 初始高度为0 */
+    overflow: hidden; /* 隐藏溢出的内容 */
+    transition: max-height 0.3s ease; /* 平滑过渡效果 */
+  }
+
+  .cw-expandable-content.is-expanded {
+    max-height: 200px; /* 或者根据内容设定一个合适的最大高度 */
+  }
+  .qt-expandable-content {
+    max-height: 0; /* 初始高度为0 */
+    overflow: hidden; /* 隐藏溢出的内容 */
+    transition: max-height 0.3s ease; /* 平滑过渡效果 */
+  }
+
+  .qt-expandable-content.is-expanded {
+    max-height: 200px; /* 或者根据内容设定一个合适的最大高度 */
+  }
+
+</style>

src/views/pms/device/index.vue

@@ -14,16 +14,16 @@
           placeholder="请输入资产编码"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-240px"
+          class="!w-200px"
         />
       </el-form-item>
-      <el-form-item label="设备名称" prop="deivceName">
+      <el-form-item label="设备名称" prop="deviceName">
         <el-input
-          v-model="queryParams.deivceName"
+          v-model="queryParams.deviceName"
           placeholder="请输入设备名称"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-240px"
+          class="!w-200px"
         />
       </el-form-item>
       <el-form-item label="品牌" prop="brand">
@@ -32,25 +32,7 @@
           placeholder="请输入品牌"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="规格型号" prop="model">
-        <el-input
-          v-model="queryParams.model"
-          placeholder="请输入规格型号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="所在部门" prop="orgId">
-        <el-input
-          v-model="queryParams.orgId"
-          placeholder="请输入所在部门"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
+          class="!w-200px"
         />
       </el-form-item>
       <el-form-item label="设备状态" prop="deviceStatus">
@@ -58,208 +40,28 @@
           v-model="queryParams.deviceStatus"
           placeholder="请选择设备状态"
           clearable
-          class="!w-240px"
+          class="!w-200px"
         >
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="资产性质" prop="assetProperty">
+
+
+
+      <el-form-item v-show="ifShow" label="资产性质" prop="assetProperty">
         <el-input
           v-model="queryParams.assetProperty"
           placeholder="请输入资产性质"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="图片" prop="picUrl">
-        <el-input
-          v-model="queryParams.picUrl"
-          placeholder="请输入图片"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="制造商id" prop="manufacturerId">
-        <el-input
-          v-model="queryParams.manufacturerId"
-          placeholder="请输入制造商id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="供应商id" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="生产日期" prop="manDate">
-        <el-date-picker
-          v-model="queryParams.manDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="铭牌信息" prop="nameplate">
-        <el-input
-          v-model="queryParams.nameplate"
-          placeholder="请输入铭牌信息"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="质保到期" prop="expires">
-        <el-input
-          v-model="queryParams.expires"
-          placeholder="请输入质保到期"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="采购/租赁价格" prop="plPrice">
-        <el-input
-          v-model="queryParams.plPrice"
-          placeholder="请输入采购/租赁价格"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="采购/租赁日期" prop="plDate">
-        <el-date-picker
-          v-model="queryParams.plDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="折旧年限" prop="plYear">
-        <el-input
-          v-model="queryParams.plYear"
-          placeholder="请输入折旧年限"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="折旧开始日期" prop="plStartDate">
-        <el-date-picker
-          v-model="queryParams.plStartDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="已提折旧月数" prop="plMonthed">
-        <el-input
-          v-model="queryParams.plMonthed"
-          placeholder="请输入已提折旧月数"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="已提折旧金额" prop="plAmounted">
-        <el-input
-          v-model="queryParams.plAmounted"
-          placeholder="请输入已提折旧金额"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="剩余金额" prop="remainAmount">
-        <el-input
-          v-model="queryParams.remainAmount"
-          placeholder="请输入剩余金额"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="资料分类id" prop="infoId">
-        <el-input
-          v-model="queryParams.infoId"
-          placeholder="请输入资料分类id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="资料类型" prop="infoType">
-        <el-select
-          v-model="queryParams.infoType"
-          placeholder="请选择资料类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="资料名称" prop="infoName">
-        <el-input
-          v-model="queryParams.infoName"
-          placeholder="请输入资料名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="资料备注" prop="infoRemark">
-        <el-input
-          v-model="queryParams.infoRemark"
-          placeholder="请输入资料备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="资料附件" prop="infoUrl">
-        <el-input
-          v-model="queryParams.infoUrl"
-          placeholder="请输入资料附件"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="动态模板信息" prop="templateJson">
-        <el-input
-          v-model="queryParams.templateJson"
-          placeholder="请输入动态模板信息"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
+          class="!w-200px"
         />
       </el-form-item>
+
+
       <el-form-item>
+        <el-button v-if="!ifShow" @click="moreQuery(true)" type="warning"><Icon icon="ep:search" class="mr-5px"/> 更多查询</el-button>
+        <el-button v-if="ifShow" @click="moreQuery(false)" type="danger"><Icon icon="ep:search" class="mr-5px"/> 收起查询</el-button>
         <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-button
@@ -286,34 +88,44 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键id" align="center" prop="id" />
       <el-table-column label="资产编码" align="center" prop="deviceCode" />
-      <el-table-column label="设备名称" align="center" prop="deivceName" />
-      <el-table-column label="品牌" align="center" prop="brand" />
-      <el-table-column label="规格型号" align="center" prop="model" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+<!--      <el-table-column label="品牌" align="center" prop="brand" />-->
+<!--      <el-table-column label="规格型号" align="center" prop="model" />-->
       <el-table-column label="所在部门" align="center" prop="orgId" />
       <el-table-column label="设备状态" align="center" prop="deviceStatus" />
       <el-table-column label="资产性质" align="center" prop="assetProperty" />
-      <el-table-column label="图片" align="center" prop="picUrl" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="制造商id" align="center" prop="manufacturerId" />
-      <el-table-column label="供应商id" align="center" prop="supplierId" />
-      <el-table-column label="生产日期" align="center" prop="manDate" />
-      <el-table-column label="铭牌信息" align="center" prop="nameplate" />
-      <el-table-column label="质保到期" align="center" prop="expires" />
-      <el-table-column label="采购/租赁价格" align="center" prop="plPrice" />
-      <el-table-column label="采购/租赁日期" align="center" prop="plDate" />
-      <el-table-column label="折旧年限" align="center" prop="plYear" />
-      <el-table-column label="折旧开始日期" align="center" prop="plStartDate" />
-      <el-table-column label="已提折旧月数" align="center" prop="plMonthed" />
-      <el-table-column label="已提折旧金额" align="center" prop="plAmounted" />
-      <el-table-column label="剩余金额" align="center" prop="remainAmount" />
-      <el-table-column label="资料分类id" align="center" prop="infoId" />
-      <el-table-column label="资料类型" align="center" prop="infoType" />
-      <el-table-column label="资料名称" align="center" prop="infoName" />
-      <el-table-column label="资料备注" align="center" prop="infoRemark" />
-      <el-table-column label="资料附件" align="center" prop="infoUrl" />
-      <el-table-column label="动态模板信息" align="center" prop="templateJson" />
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+<!--      <el-table-column label="图片" align="center" prop="picUrl" />-->
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+<!--      <el-table-column label="制造商id" align="center" prop="manufacturerId" />-->
+<!--      <el-table-column label="供应商id" align="center" prop="supplierId" />-->
+<!--      <el-table-column label="生产日期" align="center" prop="manDate" />-->
+<!--      <el-table-column label="铭牌信息" align="center" prop="nameplate" />-->
+<!--      <el-table-column label="质保到期" align="center" prop="expires" />-->
+<!--      <el-table-column label="采购/租赁价格" align="center" prop="plPrice" />-->
+<!--      <el-table-column label="采购/租赁日期" align="center" prop="plDate" />-->
+<!--      <el-table-column label="折旧年限" align="center" prop="plYear" />-->
+<!--      <el-table-column label="折旧开始日期" align="center" prop="plStartDate" />-->
+<!--      <el-table-column label="已提折旧月数" align="center" prop="plMonthed" />-->
+<!--      <el-table-column label="已提折旧金额" align="center" prop="plAmounted" />-->
+<!--      <el-table-column label="剩余金额" align="center" prop="remainAmount" />-->
+<!--      <el-table-column label="资料分类id" align="center" prop="infoId" />-->
+<!--      <el-table-column label="资料类型" align="center" prop="infoType" />-->
+<!--      <el-table-column label="资料名称" align="center" prop="infoName" />-->
+<!--      <el-table-column label="资料备注" align="center" prop="infoRemark" />-->
+<!--      <el-table-column label="资料附件" align="center" prop="infoUrl" />-->
+<!--      <el-table-column label="动态模板信息" align="center" prop="templateJson" />-->
       <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
           <el-button
@@ -345,28 +157,31 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <IotDeviceForm ref="formRef" @success="getList" />
+<!--  <IotDeviceForm ref="formRef" @success="getList" />-->
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { IotDeviceApi, IotDeviceVO } from '@/api/rq/iotdevice'
+import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import IotDeviceForm from './IotDeviceForm.vue'
 
 /** 设备台账 列表 */
-defineOptions({ name: 'IotDevice' })
+defineOptions({ name: 'IotDevicePms' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
+const { push } = useRouter() // 路由跳转
 
 const loading = ref(true) // 列表的加载中
+const ifShow = ref(false)
+const isDetail = ref(false) // 是否查看详情
 const list = ref<IotDeviceVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   deviceCode: undefined,
-  deivceName: undefined,
+  deviceName: undefined,
   brand: undefined,
   model: undefined,
   orgId: undefined,
@@ -413,7 +228,9 @@ const handleQuery = () => {
   queryParams.pageNo = 1
   getList()
 }
-
+const moreQuery = (show) => {
+  ifShow.value = show
+}
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
@@ -423,7 +240,13 @@ const resetQuery = () => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+  //修改
+  if (typeof id === 'number') {
+    push({ name: 'DeviceDetailEdit', params: { id:id, isDetail: type } })
+    return
+  }
+  // 新增
+  push({ name: 'DeviceDetailAdd', params:{isDetail: type} })
 }
 
 /** 删除按钮操作 */
@@ -458,4 +281,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>