基础信息,设备申请

src/api/equipment/draw.js

@@ -7,10 +7,10 @@ export function listWbApply(query) {
     params: query
   })
 }
-// apply_detail分页查询接口
+// warehouse表单分页查询接口
 export function detailList(query) {
   return request({
-    url: '/wbapplydetail/queryWbApplyDetailByPagination',
+    url: '/wbwarehouse/queryWbWarehouseByPagination',
     method: 'get',
     params: query
   })
@@ -22,3 +22,14 @@ export function deleteLogical(id) {
     method: 'delete'
   })
 }
+// 处理的接口
+export function batchAddition(data) {
+  return request({
+    url: '/wbapply/batchAddition',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

src/views/equipment/basicInfo.vue

@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item label="pgx" prop="pgx">
         <el-select
-          v-model="form.pgx"
+          v-model="queryParams.pgx"
           clearable
           placeholder="请选择pgx"
           :style="{ width: '150px', height: '30px' }"
@@ -29,7 +29,7 @@
       </el-form-item>
       <el-form-item label="ptype" prop="ptype">
         <el-select
-          v-model="form.ptype"
+          v-model="queryParams.ptype"
           placeholder="请选择ptype"
           clearable
           size="small"
@@ -152,7 +152,7 @@
             v-model="form.pgx"
             clearable
             placeholder="请选择pgx"
-            :style="{ width: '150px', height: '30px' }"
+            :style="{ width: '341px', height: '30px' }"
           >
             <el-option
               v-for="(dict,index) in pgxList"
@@ -168,7 +168,7 @@
             placeholder="请选择ptype"
             clearable
             size="small"
-            style="width: 150px"
+            style="width: 341px"
           >
             <el-option
               v-for="dict in ptypeOptions"
@@ -179,7 +179,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="prank" prop="prank">
-          <el-input v-model.trim="form.prank" :maxlength="10" placeholder="请输入prank" />
+          <el-input v-model.trim="form.prank" :maxlength="5" 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="10" placeholder="请输入psm" />
+          <el-input v-model.trim="form.psm" :maxlength="5" placeholder="请输入psm" />
         </el-form-item>
         <el-form-item label="psy" prop="psy">
-          <el-input v-model.trim="form.psy" :maxlength="10" placeholder="请输入psy" />
+          <el-input v-model.trim="form.psy" :maxlength="5" placeholder="请输入psy" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -288,22 +288,27 @@ export default {
       // 表单校验
       rules: {
         pn: [
-          { required: true, message: '请输入pn', trigger: 'blur' },
-          { pattern: /^\d{1,5}$/, message: '请输入少于五位数字', trigger: 'blur' }
+          { required: true, message: '请输入pn', trigger: 'change' },
+          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
         ],
         ptype: [
-          { required: true, message: '请输入ptype', trigger: 'blur' }
+          { required: true, message: '请选择ptype', trigger: 'change' }
         ],
         pgx: [
-          { required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }
+          { required: true, message: '请选择pgx', trigger: 'change' }
         ],
-        prank: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        prank: [
+          { required: true, message: '请输入prank', trigger: 'change' },
+          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
         pissb: [
           { required: true, message: '请选择pissb', trigger: 'blur' }
         ],
-        psm: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        psm: [
+          { required: true, message: '请输入psm', trigger: 'change' },
+          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
         psy: [
-          { required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }
+          { required: true, message: '请输入psy', trigger: 'change' },
+          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
         ]
       },
       deptOptions: []