修改浙江无线测试用例bug

src/views/govern/manage/factory.vue

@@ -47,11 +47,11 @@
             :before-close="resetForm" draggable width="800px">
             <el-form :model="form" label-width="auto" :rules="rules" ref="ruleFormRef" class="form-two">
                 <el-form-item label="设备名称:" prop="name">
-                    <el-input maxlength="32" show-word-limit v-model="form.name" autocomplete="off" clearable
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" autocomplete="off" clearable
                         placeholder="请输入（项目名称+设备名称）"></el-input>
                 </el-form-item>
                 <el-form-item label="网络设备ID:" prop="ndid" class="top">
-                    <el-input maxlength="32" show-word-limit v-model="form.ndid" autocomplete="off"
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.ndid" autocomplete="off"
                         placeholder="请输入"></el-input>
                 </el-form-item>
                 <el-form-item label="设备类型:" prop="devType" class="top">
@@ -72,6 +72,9 @@
                         <el-option label="CLD" value="CLD"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="排序:" class="top" prop="sort">
+                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
+                </el-form-item>
 
                 <!-- <el-form-item label="合同号:" prop="cntractNo" class="top">
                     <el-input maxlength="32" show-word-limit v-model="form.cntractNo" autocomplete="off" placeholder="请输入"></el-input>
@@ -123,7 +126,8 @@ const form = reactive({
     devModel: '',
     devType: '',
     name: '',
-    ndid: ''
+    ndid: '',
+    sort: 0
 })
 const rules = reactive({
     name: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
@@ -131,7 +135,8 @@ const rules = reactive({
     devType: [{ required: true, message: '设备类型不能为空', trigger: 'change' }],
     devModel: [{ required: true, message: '设备型号不能为空', trigger: 'change' }],
     devAccessMethod: [{ required: true, message: '接入方式不能为空', trigger: 'blur' }],
-    cntractNo: [{ required: true, message: '合同号不能为空', trigger: 'blur' }]
+    cntractNo: [{ required: true, message: '合同号不能为空', trigger: 'blur' }],
+    sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
 })
 const dialogFormVisible = ref(false)
 const dialogTitle = ref('设备出厂管理')
@@ -233,7 +238,22 @@ const tableStore = new TableStore({
                     confirmButtonText: '确认',
                     cancelButtonText: '取消',
                     customClass: 'customInput',
-                    inputType: 'text'
+                    inputType: 'text',
+                    beforeClose: (action, instance, done) => {
+
+                        if (action === 'confirm') {
+                            if (instance.inputValue == null) {
+                                return ElMessage.warning('请输入密码')
+                            } else if (instance.inputValue?.length > 32) {
+                                return ElMessage.warning('密码长度不能超过32位,当前密码长度为' + instance.inputValue.length)
+                            } else {
+                                done();
+                            }
+
+                        } else {
+                            done();
+                        }
+                    }
                 }).then(({ value }) => {
                     passwordConfirm(value).then(res => {
                         editEquipmentDelivery({ ...row, status: row.status == 5 ? 1 : row.status, usageStatus: row.usageStatus == 1 ? 0 : 1 }).then(res => {