基础信息和设备领用

src/views/equipment/basicInfo.vue

@@ -135,14 +135,14 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改设备基本信息配置对话框 -->
+    <!-- 添加或修改 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="pn" prop="pn">
           <el-input
             ref="input1"
             v-model.trim="form.pn"
-            :maxlength="5"
+            :maxlength="100"
             placeholder="请输入pn"
             @keyup.enter.native="handelTab(1,$event)"
           />
@@ -179,7 +179,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="prank" prop="prank">
-          <el-input v-model.trim="form.prank" :maxlength="5" placeholder="请输入prank" />
+          <el-input v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" />
         </el-form-item>
         <el-form-item label="pissb" prop="pissb">
           <el-select
@@ -198,10 +198,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="psm" prop="psm">
-          <el-input v-model.trim="form.psm" :maxlength="5" placeholder="请输入psm" />
+          <el-input v-model.trim="form.psm" :maxlength="9" placeholder="请输入psm" />
         </el-form-item>
         <el-form-item label="psy" prop="psy">
-          <el-input v-model.trim="form.psy" :maxlength="5" placeholder="请输入psy" />
+          <el-input v-model.trim="form.psy" :maxlength="10" placeholder="请输入psy" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -217,7 +217,7 @@ import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/
 import { parseTime } from '@/utils'
 import { getDictData } from '@/api/equipment/application'
 export default {
-  name: 'Role',
+  name: 'BasicInfo',
   data() {
     return {
       // 遮罩层
@@ -288,8 +288,7 @@ export default {
       // 表单校验
       rules: {
         pn: [
-          { required: true, message: '请输入pn', trigger: 'change' },
-          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
+          { required: true, message: '请输入pn', trigger: 'change' }
         ],
         ptype: [
           { required: true, message: '请选择ptype', trigger: 'change' }
@@ -299,16 +298,16 @@ export default {
         ],
         prank: [
           { required: true, message: '请输入prank', trigger: 'change' },
-          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
+          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }],
         pissb: [
           { required: true, message: '请选择pissb', trigger: 'blur' }
         ],
         psm: [
           { required: true, message: '请输入psm', trigger: 'change' },
-          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
+          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }],
         psy: [
           { required: true, message: '请输入psy', trigger: 'change' },
-          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
+          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }
         ]
       },
       deptOptions: []

src/views/equipment/draw.vue

@@ -235,13 +235,6 @@
           </template>
         </el-table-column>
       </el-table>
-<!--      <pagination-->
-<!--        v-show="totalDetail>0"-->
-<!--        :total="totalDetail"-->
-<!--        :page.sync="queryParams.page"-->
-<!--        :limit.sync="queryParams.rows"-->
-<!--        @pagination="getDeviceList"-->
-<!--      />-->
     </el-dialog>
 
     <!-- TODO: 处理 -->
@@ -348,7 +341,7 @@
 import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
 import { parseTime } from '@/utils'
 export default {
-  name: 'Role',
+  name: 'Draw',
   data() {
     return {
       totalApplyDetail: 0,