Merge remote-tracking branch 'origin/project1' into project1

src/views/equipment/application.vue

@@ -17,7 +17,7 @@
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="prank" style="flex-basis: 50%;" prop="prank">
-            <el-input ref="input3" v-model="form.prank" placeholder="请输入prank" style="width: 400px" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
+            <el-input ref="input3" v-model="form.prank" placeholder="请输入prank" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(3,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">

src/views/equipment/basicInfo.vue

@@ -174,7 +174,7 @@
           />
         </el-form-item>
         <el-form-item label="prank" prop="prank">
-          <el-input ref="input3" v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" @keyup.enter.native="handelTab(3,$event)" />
+          <el-input ref="input3" v-model.trim="form.prank" :maxlength="100" placeholder="请输入prank" @keyup.enter.native="handelTab(3,$event)" />
         </el-form-item>
         <el-form-item label="pissb" prop="pissb">
           <el-select

src/views/equipment/boundManagement.vue

@@ -119,7 +119,7 @@
           <el-input ref="input6" v-model.trim="form.pzl" :maxlength="7" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
         </el-form-item>
         <el-form-item label="parnk" prop="prank">
-          <el-input ref="input7" v-model.trim="form.prank" :maxlength="8" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
+          <el-input ref="input7" v-model.trim="form.prank" :maxlength="100" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -167,7 +167,7 @@
           </el-col>
         </el-row>
         <el-form-item label="parnk：" prop="prank">
-          <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+          <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlenth="100" />
         </el-form-item>
         <el-row>
           <el-col :span="12">
@@ -331,8 +331,7 @@ export default {
         ],
         phd: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }],
         psm: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }],
-        pzl: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }],
-        prank: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }]
+        pzl: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }]
       },
       deptOptions: [],
       formData: {}

src/views/equipment/check.vue

@@ -172,7 +172,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="prank：" prop="prank">
-              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/equipment/checkProcess.vue

@@ -172,7 +172,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="prank：" prop="prank">
-              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100"/>
             </el-form-item>
           </el-col>
         </el-row>

src/views/equipment/draw.vue

@@ -27,6 +27,7 @@
           v-model="queryParams.prankStr"
           placeholder="请输入prank"
           clearable
+          :maxlength="100"
           size="small"
           style="width: 150px"
           @keyup.enter.native="handleQuery"
@@ -147,7 +148,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="prank：" prop="prank">
-              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -241,7 +242,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="prank：" prop="prank">
-              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/equipment/equipmentAbandonment.vue

@@ -168,7 +168,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="prank：" prop="prank">
-              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/equipment/management.vue

@@ -136,7 +136,7 @@
           <el-input ref="input6" v-model.trim="form.pzl" :maxlength="7" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
         </el-form-item>
         <el-form-item label="parnk" prop="prank">
-          <el-input ref="input7" v-model.trim="form.prank" :maxlength="8" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
+          <el-input ref="input7" v-model.trim="form.prank" :maxlength="100" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -184,7 +184,7 @@
           </el-col>
         </el-row>
         <el-form-item label="parnk：" prop="prank">
-          <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+          <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100" />
         </el-form-item>
         <el-row>
           <el-col :span="12">
@@ -350,8 +350,7 @@ export default {
         ],
         phd: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }],
         psm: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }],
-        pzl: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }],
-        prank: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }]
+        pzl: [{ pattern: /^[1-9]\d{0,8}$/, message: '仅能输入整数', trigger: 'change' }]
       },
       deptOptions: [],
       formData: {}

src/views/processManagement/basicProcessManagement/index.vue

@@ -181,7 +181,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="parnk：" prop="prank">
-              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/processManagement/deviceReuse/index.vue

@@ -43,7 +43,7 @@
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="prank:" style="flex-basis: 50%;" prop="prank">
-            <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(7,$event)" />
+            <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">

src/views/processManagement/draw.vue

@@ -27,6 +27,7 @@
           v-model="queryParams.prankStr"
           placeholder="请输入prank"
           clearable
+          :maxlength="100"
           size="small"
           style="width: 150px"
           @keyup.enter.native="handleQuery"
@@ -147,7 +148,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="prank：" prop="prank">
-              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlengrh="100" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -246,7 +247,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="prank：" prop="prank">
-              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" :maxlength="100"/>
             </el-form-item>
           </el-col>
         </el-row>