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

src/views/equipment/boundManagement.vue

@@ -98,7 +98,7 @@
     />
 
     <!-- 添加或修改设备配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
         <el-form-item label="pn" prop="pn">
           <el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
@@ -116,7 +116,7 @@
           <el-input ref="input5" v-model.trim="form.psm" :maxlength="8" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
         </el-form-item>
         <el-form-item label="pzl" prop="pzl">
-          <el-input ref="input6" v-model.trim="form.pzl" :maxlength="8" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
+          <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)" />

src/views/equipment/management.vue

@@ -115,7 +115,7 @@
     />
 
     <!-- 添加或修改设备配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
         <el-form-item label="pn" prop="pn">
           <el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
@@ -133,7 +133,7 @@
           <el-input ref="input5" v-model.trim="form.psm" :maxlength="8" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
         </el-form-item>
         <el-form-item label="pzl" prop="pzl">
-          <el-input ref="input6" v-model.trim="form.pzl" :maxlength="8" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
+          <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)" />

src/views/processManagement/deviceReuse/index.vue

@@ -41,15 +41,24 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12" style="padding-left: 8.9%;">
+        <el-col :span="12" style="padding-left: 8.6%;">
           <el-form-item label="prank:" style="flex-basis: 50%;" prop="prank">
             <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="8" @keyup.enter.native="handelTab(7,$event)" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          &nbsp;&nbsp;
+        </el-col>
       </el-row>
-      <div class="button">
+    </el-form>
+    <el-form label-width="80px">
+      <el-row style="padding-left: 8.7%; padding-top: 1%">
+        <el-col :span="12">
+          <el-form-item style="flex-basis: 50%;">
             <el-button type="primary" @click="submitForm">提交</el-button>
-      </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
   </div>
 </template>