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

src/views/equipment/basicInfo.vue

@@ -403,7 +403,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      // this.dateRange = []
+      this.queryParams = {
+        page: 1,
+        rows: 10,
+        ptype: ''
+      }
       this.resetForm('queryForm')
       this.handleQuery()
     },

src/views/equipment/income.vue

@@ -27,7 +27,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-table border :data="tableData" style="width: 86.4%; padding-left: 13.6%;">
+    <el-table border :data="tableData" :gutter="40" style="width: 85%; margin-left: 80px; padding-left: 8.6%;">
       <el-table-column type="index" label="序号" width="50px"/>
       <el-table-column label="pn" prop="businessId">
         <template slot-scope="scope">
@@ -269,9 +269,9 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        const newRow = {
-          plocation
-        }
+        // const newRow = {
+        //   plocation
+        // }
         this.$refs.form.validate((valid) => {
           if (valid) {
             console.log('form', this.form)
@@ -286,15 +286,11 @@ export default {
                 this.form.plocation = ''
               } else if (res.code === null) {
                 this.$message.error(res.message)
-                this.tableData = []
-                this.form.plocation = ''
+                // this.tableData = []
+                // this.form.plocation = ''
               }
             })
           } else {
-            this.tableData = []
-            this.tableData.push(newRow)
-            // 清空输入框
-            this.from.plocation = ''
             // 校验失败，显示错误信息或进行其他操作
           }
         })
@@ -330,5 +326,23 @@ export default {
 
 }
 
+.form-table-container {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.form-table-container > .el-row {
+  flex: 1 1 100%;
+}
+
+.form-table-container > .el-form-item {
+  width: 50%;
+}
+
+.form-table-container > .el-table {
+  width: 100%;
+  padding-left: 8.6%;
+}
+
 </style>
 

src/views/equipment/management.vue

@@ -127,7 +127,7 @@
           <el-input ref="input3" v-model.trim="form.plocation" :maxlength="30" placeholder="请输入plocation" @keyup.enter.native="handelTab(3,$event)" />
         </el-form-item>
         <el-form-item label="厚度" prop="phd">
-          <el-input ref="input4" v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" @keyup.enter.native="handelTab(4,$event)" />
+          <el-input ref="input4" v-model.trim="form.phd" :maxlength="9" placeholder="请输入厚度" @keyup.enter.native="handelTab(4,$event)" />
         </el-form-item>
         <el-form-item label="psm" prop="psm">
           <el-input ref="input5" v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
@@ -136,7 +136,7 @@
           <el-input ref="input6" v-model.trim="form.pzl" :maxlength="30" 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="30" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
+          <el-input ref="input7" v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/processManagement/inventoryRecord/index.vue

@@ -4,6 +4,7 @@
       <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
 
         <el-form-item label="pn" prop="pn">
+
           <el-input
             ref="autoGetFocusInput"
             v-model="queryEntity.entity.pn"
@@ -474,7 +475,6 @@ export default {
           return ''
       }
     },
-
     /** TODO: 查询按钮操作 */
     handleQuery() {
       this.queryParams.page = 1