lipenghui před 3 měsíci
rodič
revize
415aecbc61

+ 42 - 35
src/views/pms/device/IotDeviceForm.vue

@@ -15,19 +15,20 @@
       </div>
       <div class="base-expandable-content" :class="{ 'is-expanded': baseIsExpanded }">
         <el-row>
-          <el-col :span="6">
+          <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="6">
+          <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="6">
+          <el-col :span="8">
             <el-form-item label="品牌" prop="brand">
               <el-select
+                clearable
                 v-model="formData.brand"
                 :model-value="brandLabel"
                 placeholder="请输入品牌"
@@ -35,19 +36,21 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="所在部门" prop="deptId">
               <el-tree-select
+                clearable
                 v-model="formData.deptId"
                 :data="deptList"
                 :props="defaultProps"
                 check-strictly
                 node-key="id"
+                filterable
                 placeholder="请选择所在部门"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="设备类别" prop="assetClass">
               <el-tree-select
                 v-model="formData.assetClass"
@@ -57,12 +60,13 @@
                 node-key="id"
                 placeholder="请选择设备类别"
                 @change="assetclasschange"
+                filterable
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="设备状态" prop="deviceStatus">
-              <el-select v-model="formData.deviceStatus" placeholder="请选择">
+              <el-select v-model="formData.deviceStatus" placeholder="请选择" clearable>
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.PMS_DEVICE_STATUS)"
                   :key="dict.label"
@@ -72,9 +76,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="资产性质" prop="deviceStatus">
-              <el-select v-model="formData.assetProperty" placeholder="请选择">
+              <el-select v-model="formData.assetProperty" placeholder="请选择" clearable>
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.PMS_ASSET_PROPERTY)"
                   :key="dict.id"
@@ -84,21 +88,24 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6" style="display: flex;flex-direction: row">
-            <el-form-item label="规格型号" prop="model" style="width: 83%">
-              <el-input
-                v-model="formData.model"
-                placeholder="请输入规格型号"
-              />
-            </el-form-item>
-            <el-button type="info" @click="openModelForm">请选择</el-button>
+          <el-col :span="8" >
+            <div style="display: flex;flex-direction: row">
+              <el-form-item label="规格型号" prop="model" style="width: 85%">
+                <el-input
+                  clearable
+                  v-model="formData.model"
+                  placeholder="请输入规格型号"
+                />
+              </el-form-item>
+              <el-button type="info" @click="openModelForm">请选择</el-button>
+            </div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="图片" prop="picUrl">
               <UploadImg v-model="formData.picUrl" :disabled="isDetail" height="60px" />
             </el-form-item>
           </el-col>
-          <el-col :span="18">
+          <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
             </el-form-item>
@@ -119,7 +126,7 @@
       </div>
       <div class="zz-expandable-content" :class="{ 'is-expanded': zzIsExpanded }">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="制造商" prop="manufacturerId">
               <el-select
                 v-model="formData.manufacturerId"
@@ -129,7 +136,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="生产日期" prop="manDate">
               <el-date-picker
                 style="width: 150%"
@@ -140,7 +147,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="供应商" prop="supplierId">
               <el-select
                 v-model="formData.supplierId"
@@ -150,7 +157,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="质保到期" prop="expires">
               <el-date-picker
                 style="width: 150%"
@@ -161,7 +168,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="16">
             <el-form-item label="铭牌信息" prop="nameplate">
               <el-input v-model="formData.nameplate" type="textarea" placeholder="请输入铭牌信息" />
             </el-form-item>
@@ -182,7 +189,7 @@
       </div>
       <div class="cw-expandable-content" :class="{ 'is-expanded': cwIsExpanded }">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item :label="formData.assetProperty==='zy'?'采购价格':'租赁价格'" prop="plPrice">
               <el-input
                 v-model="formData.plPrice"
@@ -191,7 +198,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item :label="formData.assetProperty==='zy'?'采购日期':'租赁日期'" prop="plDate">
               <el-date-picker
                 style="width: 150%"
@@ -202,12 +209,12 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item :label="formData.assetProperty==='zy'?'折旧年限':'租赁年限'" prop="plYear">
               <el-input v-model="formData.plYear" type="number" :placeholder="formData.assetProperty==='zy'?'请输入折旧年限':'请输入租赁年限'" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item :label="formData.assetProperty==='zy'?'折旧开始日期':'租赁开始日期'" prop="plStartDate">
               <el-date-picker
                 style="width: 150%"
@@ -218,7 +225,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item :label="formData.assetProperty==='zy'?'已提折旧月数':'已租赁月数'" prop="plMonthed">
               <el-input
                 v-model="formData.plMonthed"
@@ -227,7 +234,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item :label="formData.assetProperty==='zy'?'已提折旧金额':'已租赁金额'" prop="plAmounted">
               <el-input
                 v-model="formData.plAmounted"
@@ -236,7 +243,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="剩余金额" prop="remainAmount">
               <el-input
                 v-model="formData.remainAmount"
@@ -261,7 +268,7 @@
       </div>
       <div class="qt-expandable-content" :class="{ 'is-expanded': qtIsExpanded }">
         <el-row>
-          <el-col v-for="field in list" :key="field.sort" :span="6">
+          <el-col v-for="field in list" :key="field.sort" :span="8">
             <el-form-item :label="field.name" :prop="field.code" :rules="field.rules">
               <!-- 文本输入 -->
               <el-input
@@ -343,7 +350,7 @@ import {DeviceAttrModelApi} from "@/api/pms/deviceattrmodel";
 
 
 /** 设备台账 表单 */
-defineOptions({ name: 'IotDeviceForm' })
+defineOptions({ name: 'DeviceDetailAdd' })
 const baseIsExpanded = ref(true) // 控制表单是否展开的变量
 const zzIsExpanded = ref(true) // 控制表单是否展开的变量
 const cwIsExpanded = ref(true) // 控制表单是否展开的变量
@@ -635,7 +642,7 @@ const resetForm = () => {
 }
 
 .base-expandable-content.is-expanded {
-  max-height: 200px; /* 或者根据内容设定一个合适的最大高度 */
+  min-height: 260px; /* 或者根据内容设定一个合适的最大高度 */
 }
 .zz-expandable-content {
   max-height: 0; /* 初始高度为0 */
@@ -644,7 +651,7 @@ const resetForm = () => {
 }
 
 .zz-expandable-content.is-expanded {
-  max-height: 200px; /* 或者根据内容设定一个合适的最大高度 */
+  min-height: 130px; /* 或者根据内容设定一个合适的最大高度 */
 }
 .cw-expandable-content {
   max-height: 0; /* 初始高度为0 */

+ 3 - 3
src/views/pms/failure/IotFailureReportForm.vue

@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="是否解决" prop="ifDeal">
-            <el-select v-model="formData.ifDeal" placeholder="请选择" @change="dealChange">
+            <el-select v-model="formData.ifDeal" placeholder="请选择" @change="dealChange" clearable>
               <el-option
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.label"
@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="是否协助" prop="needHelp">
-            <el-select v-model="formData.needHelp" placeholder="请选择" @change="helpChange">
+            <el-select v-model="formData.needHelp" placeholder="请选择" @change="helpChange" clearable>
               <el-option
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.label"
@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="是否停机" prop="ifStop">
-            <el-select v-model="formData.ifStop" placeholder="请选择">
+            <el-select v-model="formData.ifStop" placeholder="请选择" clearable>
               <el-option
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.label"

+ 2 - 0
src/views/pms/inspect/item/IotInspectItemForm.vue

@@ -11,12 +11,14 @@
         <el-col :span="12">
         <el-form-item label="设备类别" prop="deviceClassify">
           <el-tree-select
+            filterable
             v-model="formData.deviceClassify"
             :data="productClassifyList"
             :props="defaultProps"
             check-strictly
             node-key="id"
             placeholder="请选择设备类别"
+            clearable
           />
         </el-form-item>
           </el-col>

+ 1 - 1
src/views/pms/inspect/order/WriteOrder.vue

@@ -120,7 +120,7 @@
 <script setup>
 import {useTagsViewStore} from "@/store/modules/tagsView";
 
-
+defineOptions({ name: 'InspectOrderWrite' })
 const { t } = useI18n() // 国际化
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'

+ 4 - 2
src/views/pms/inspect/plan/IotInspectPlan.vue

@@ -17,7 +17,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="单位" prop="planUnit">
-              <el-select v-model="formData.planUnit" placeholder="请选择单位" :disabled = "formType==='update'">
+              <el-select v-model="formData.planUnit" placeholder="请选择单位" :disabled = "formType==='update'" clearable>
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.PMS_INSPECT_UNIT)"
                   :key="dict.label"
@@ -35,6 +35,8 @@
           <el-col :span="12">
             <el-form-item label="负责人" prop="charges">
               <el-select
+                clearable
+                filterable
                 v-model="formData.charges"
                 multiple
                 style="width: 100%"
@@ -147,7 +149,7 @@ import { IotInspectPlanApi, IotInspectPlanVO } from '@/api/pms/inspect/plan'
 import RouteInspectItemDrawer from '@/views/pms/inspect/plan/RouteInspectItemDrawer.vue'
 import * as JobApi from '@/api/infra/job'
 /** 维修工单 表单 */
-defineOptions({ name: 'IotMaintainAe' })
+defineOptions({ name: 'InspectPlanAdd' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

+ 3 - 1
src/views/pms/inspect/route/IotInspectRoute.vue

@@ -18,6 +18,8 @@
           <el-col :span="8">
             <el-form-item label="设备类别" prop="deviceClassify">
               <el-tree-select
+                filterable
+                clearable
                 v-model="formData.deviceClassify"
                 :data="productClassifyList"
                 :props="defaultProps"
@@ -122,7 +124,7 @@ import DeviceList from '@/views/pms/failure/DeviceList.vue'
 import {IotInspectRouteApi, IotInspectRouteVO} from "@/api/pms/inspect/route";
 
 /** 维修工单 表单 */
-defineOptions({ name: 'IotMaintainAe' })
+defineOptions({ name: 'RouteAdd' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

+ 1 - 1
src/views/pms/maintain/IotMaintain.vue

@@ -278,7 +278,7 @@ import { IotMainWorkOrderBomMaterialVO } from '@/api/pms/iotmainworkorderbommate
 import MaterialListDrawer from '@/views/pms/iotmainworkorder/SelectedMaterialDrawer.vue'
 import ChooseMaintain from "@/views/pms/maintain/material/ChooseMaintain.vue";
 /** 维修工单 表单 */
-defineOptions({ name: 'IotMaintainAe' })
+defineOptions({ name: 'MaintainAdd' })
 const addItemVisible = ref(false) // 弹窗的是否展示
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗