下拉可选可输入框改成input

frontend/src/views/machine/device/components/devicePopup.vue

@@ -82,6 +82,14 @@
                             />
                         </el-form-item>
                          <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
+                            <el-input v-model="formContent.hardwareVersion"   clearable
+                                placeholder="请输入固件版本" />
+                        </el-form-item>
+                         <el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
+                            <el-input v-model="formContent.softwareVersion"   clearable
+                                placeholder="请输入软件版本"  />
+                        </el-form-item>
+                        <!-- <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
                             <el-select
                                 v-model="formContent.hardwareVersion"
                                 clearable
@@ -112,7 +120,7 @@
                                     :value="item.value"
                                 />
                             </el-select>
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item label="定检日期" prop="inspectDate" v-if="MonIsShow">
                             <el-date-picker
                                 v-model="formContent.inspectDate"
@@ -218,6 +226,18 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="所属地市" prop="cityName" v-if="MonIsShow">
+                            <el-input v-model="formContent.cityName"   clearable
+                                placeholder="请输入所属地市" :disabled="formContent.importFlag == 1" />
+                        </el-form-item>
+                         <el-form-item label="所属供电公司" prop="gdName" v-if="MonIsShow">
+                            <el-input v-model="formContent.gdName"   clearable
+                                placeholder="请输入所属供电公司" :disabled="formContent.importFlag == 1" />
+                        </el-form-item>
+                         <el-form-item label="所属电站" prop="subName" v-if="MonIsShow">
+                            <el-input v-model="formContent.subName"   clearable
+                                placeholder="请输入所属电站" :disabled="formContent.importFlag == 1" />
+                        </el-form-item>
+                        <!-- <el-form-item label="所属地市" prop="cityName" v-if="MonIsShow">
                             <el-select
                                 v-model="formContent.cityName"
                                 clearable
@@ -267,7 +287,7 @@
                                     :value="item.value"
                                 />
                             </el-select>
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item
                             v-auth.device="'factorFlag'"
                             label="是否支持系数校准"
@@ -486,8 +506,10 @@ const rules = computed(() => {
     }
     if (scene.value !== '0') {
         dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }]
-        dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必选！', trigger: 'change' }]
+        // dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必选！', trigger: 'change' }]
-        dynamicRules.softwareVersion = [{ required: true, message: '软件版本必选！', trigger: 'change' }]
+        // dynamicRules.softwareVersion = [{ required: true, message: '软件版本必选！', trigger: 'change' }]
+         dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }]
+         dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }]
         dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }]
     }
 
@@ -498,9 +520,12 @@ const rules = computed(() => {
 
     if (mode.value === '比对式') {
         dynamicRules.inspectDate = [{ required: true, message: '定检日期必填！', trigger: 'blur' }]
-        dynamicRules.cityName = [{ required: true, message: '所属地市必选！', trigger: 'change' }]
+        // dynamicRules.cityName = [{ required: true, message: '所属地市必选！', trigger: 'change' }]
-        dynamicRules.gdName = [{ required: true, message: '所属供电公司必选！', trigger: 'change' }]
+        // dynamicRules.gdName = [{ required: true, message: '所属供电公司必选！', trigger: 'change' }]
-        dynamicRules.subName = [{ required: true, message: '所属电站必选！', trigger: 'change' }]
+        // dynamicRules.subName = [{ required: true, message: '所属电站必选！', trigger: 'change' }]
+        dynamicRules.cityName = [{ required: true, message: '所属地市必填！', trigger: 'blur' }]
+        dynamicRules.gdName = [{ required: true, message: '所属供电公司必填！', trigger: 'blur' }]
+        dynamicRules.subName = [{ required: true, message: '所属电站必填！', trigger: 'blur' }]
     }
 
     return dynamicRules

frontend/src/views/machine/device/components/monitorPopup.vue

@@ -24,6 +24,9 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="所属母线" prop="busbar">
+                    <el-input v-model="formContent.busbar"   clearable placeholder="请输入所属母线"  />
+                </el-form-item>
+                <!-- <el-form-item label="所属母线" prop="busbar">
                     <el-select
                         v-model="formContent.busbar"
                         clearable
@@ -38,7 +41,7 @@
                             :value="item.value"
                         />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="接线方式" prop="connection">
                     <el-select v-model="formContent.connection" clearable placeholder="请选择接线方式">
                         <el-option
@@ -197,7 +200,8 @@ const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
     name: [{ required: true, message: '监测点名称必填！', trigger: 'blur' }],
     num: [{ required: true, message: '线路号必选', trigger: 'change' }],
     connection: [{ required: true, message: '接线方式必选！', trigger: 'change' }],
-    busbar: [{ required: true, message: '所属母线必选！', trigger: 'change' }],
+    //busbar: [{ required: true, message: '所属母线必选！', trigger: 'change' }],
+    busbar: [{ required: true, message: '所属母线必填！', trigger: 'blur' }],
     // harmSysId : [{ required: true, message: '谐波系统检测点id必填！', trigger: 'blur' }],
     checkFlag: [{ required: true, message: '是否参与检测必选！', trigger: 'change' }]
 })