分页，库存盘点

src/views/equipment/check.vue

@@ -54,9 +54,9 @@
       <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="编码" prop="equipmentCode" width="120">
+        <el-table-column label="编码" prop="pn" width="120">
           <template slot-scope="scope">
-            {{ scope.row.equipmentCode || '-' }}
+            {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="lot" prop="lot" width="120">
@@ -64,9 +64,9 @@
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="位置" prop="location">
+        <el-table-column label="位置" prop="plocation">
           <template slot-scope="scope">
-            {{ scope.row.location || '-' }}
+            {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="厚度" prop="thickness">
@@ -79,9 +79,9 @@
             {{ scope.row.createBy || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
@@ -96,8 +96,8 @@
     <pagination
       v-show="total > 0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
       @pagination="getList"
     />
 
@@ -147,20 +147,20 @@
     <!-- TODO: 单项详情信息表单配置 -->
     <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
-        <el-form-item label="编码：" prop="processName">
-          <el-input v-model.trim="singleDetails.equipmentCode" :readonly="true" />
+        <el-form-item label="编码：" prop="pn">
+          <el-input v-model.trim="singleDetails.pn" :readonly="true" />
         </el-form-item>
         <el-form-item label="lot：" prop="workshop">
           <el-input v-model.trim="singleDetails.lot" :readonly="true" />
         </el-form-item>
-        <el-form-item label="位置：" prop="location">
-          <el-input v-model.trim="singleDetails.location" :readonly="true" />
+        <el-form-item label="位置：" prop="plocation">
+          <el-input v-model.trim="singleDetails.plocation" :readonly="true" />
         </el-form-item>
         <el-form-item label="厚度：" prop="thickness">
           <el-input v-model.trim="singleDetails.thickness" :readonly="true" />
         </el-form-item>
-        <el-form-item label="操作时间：" prop="createTime">
-          {{ singleDetails.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
+        <el-form-item label=" 操作时间：" prop="createDate">
+          <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
         </el-form-item>
         <el-form-item label="操作员：" prop="createBy">
           <el-input v-model.trim="singleDetails.createBy" :readonly="true" />
@@ -289,11 +289,12 @@ export default {
       tOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         roleName: undefined,
         roleKey: undefined,
-        flag: undefined
+        flag: undefined,
+        ptype: 1
       },
       // 表单参数
       form: {
@@ -501,7 +502,7 @@ export default {
     },
     /** 查询按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */

src/views/equipment/checkProcess.vue

@@ -22,9 +22,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="位置" prop="location">
+      <el-form-item label="位置" prop="plocation">
         <el-input
-          v-model="queryParams.location"
+          v-model="queryParams.plocation"
           placeholder="请输入设备位置"
           clearable
           size="small"
@@ -54,9 +54,9 @@
       <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="编码" prop="equipmentCode" width="120">
+        <el-table-column label="编码" prop="pn" width="120">
           <template slot-scope="scope">
-            {{ scope.row.equipmentCode || '-' }}
+            {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="lot" prop="lot" width="120">
@@ -64,9 +64,9 @@
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="位置" prop="location">
+        <el-table-column label="位置" prop="plocation">
           <template slot-scope="scope">
-            {{ scope.row.location || '-' }}
+            {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="厚度" prop="thickness">
@@ -79,9 +79,9 @@
             {{ scope.row.createBy || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
@@ -289,11 +289,12 @@ export default {
       tOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         roleName: undefined,
         roleKey: undefined,
-        flag: undefined
+        flag: undefined,
+        ptype: 2
       },
       // 表单参数
       form: {