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

src/views/equipment/check.vue

@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item label="lot" prop="lot">
         <el-input
-          v-model="queryParams.roleKey"
+          v-model="queryParams.lot"
           placeholder="请输入设备lot"
           clearable
           size="small"

src/views/equipment/checkProcess.vue

@@ -3,7 +3,7 @@
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
       <el-form-item label="pn" prop="pn">
         <el-input
-          v-model="queryParams.equipmentCode"
+          v-model="queryParams.pn"
           placeholder="请输入pn"
           clearable
           :maxlength="30"
@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item label="lot" prop="lot">
         <el-input
-          v-model="queryParams.roleKey"
+          v-model="queryParams.lot"
           placeholder="请输入设备lot"
           clearable
           size="small"
@@ -75,7 +75,7 @@
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="位置" prop="plocation">
+        <el-table-column label="plocation" prop="plocation">
           <template slot-scope="scope">
             {{ scope.row.plocation || '-' }}
           </template>
@@ -213,7 +213,7 @@ export default {
       // 是否显示弹出层（数据详情）
       openDetails: false,
       // // TODO: 模拟测试数据
-      // equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
+      equipmentList: [],
       // check: '开始盘点',
       typeParent: 'text',
       typePrimary: 'primary',
@@ -302,9 +302,7 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        flag: undefined,
+        
         ptype: 2
       },
       // 表单参数
@@ -518,7 +516,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      // this.dateRange = []
+      this.queryParams={
+        page: 1,
+        rows: 10,
+        ptype: 2
+      }
       this.resetForm('queryForm')
       this.handleQuery()
     },

src/views/equipment/equipmentAbandonment.vue

@@ -22,7 +22,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="位置" prop="plocation">
+      <el-form-item label="plocation" prop="plocation">
         <el-input
           v-model="queryParams.plocation"
           placeholder="请输入plocation"
@@ -53,7 +53,7 @@
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">设备管理列表</div>
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+       
         <el-table-column type="index" label="序号" width="80" />
         <el-table-column label="pn" prop="pn" width="120">
           <template slot-scope="scope">
@@ -65,7 +65,7 @@
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="位置" prop="plocation">
+        <el-table-column label="plocation" prop="plocation">
           <template slot-scope="scope">
             {{ scope.row.plocation || '-' }}
           </template>