查询完成

src/views/equipment/check.vue

@@ -22,10 +22,10 @@
           @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="请输入设备位置"
+          placeholder="请输入plocation"
           clearable
           size="small"
           style="width: 150px"
@@ -34,6 +34,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
@@ -46,6 +47,17 @@
             {{ check }}
           </el-button>
         </el-form-item>
+        <!-- 这俩都没写接口以及方法 -->
+        <el-form-item>
+          <el-button
+            style="padding: 8px 7px;"
+            type="danger"
+            :size="smallSize"
+            icon="el-icon-minus"
+          >结束盘点
+            {{ check }}
+          </el-button>
+        </el-form-item>
       </div>
     </el-form>
     <div class="placeholder" />
@@ -84,7 +96,7 @@
             <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">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
           <template slot-scope="scope">
             <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
               详情

src/views/equipment/checkProcess.vue

@@ -22,10 +22,10 @@
           @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="请输入设备位置"
+          placeholder="请输入plocation"
           clearable
           size="small"
           style="width: 150px"
@@ -34,6 +34,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
@@ -46,6 +47,16 @@
             {{ check }}
           </el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            style="padding: 8px 7px;"
+            type="danger"
+            :size="smallSize"
+            icon="el-icon-minus"
+          >结束盘点
+            {{ check }}
+          </el-button>
+        </el-form-item>
       </div>
     </el-form>
     <div class="placeholder" />
@@ -74,7 +85,7 @@
             {{ scope.row.phd || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建员" prop="createBy">
+        <el-table-column label="操作员" prop="createBy">
           <template slot-scope="scope">
             {{ scope.row.createBy || '-' }}
           </template>
@@ -84,7 +95,7 @@
             <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">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
           <template slot-scope="scope">
             <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
               详情

src/views/equipment/equipmentAbandonment.vue

@@ -25,7 +25,7 @@
       <el-form-item label="位置" prop="plocation">
         <el-input
           v-model="queryParams.plocation"
-          placeholder="请输入设备位置"
+          placeholder="请输入plocation"
           clearable
           size="small"
           style="width: 150px"
@@ -34,9 +34,10 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button
             style="padding: 8px 7px;"
             :type="typePrimary"
@@ -45,7 +46,7 @@
           >开始盘点
             {{ check }}
           </el-button>
-        </el-form-item>
+        </el-form-item> -->
       </div>
     </el-form>
     <div class="placeholder" />
@@ -74,9 +75,9 @@
             {{ scope.row.phd || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
@@ -301,7 +302,7 @@ export default {
         roleName: undefined,
         roleKey: undefined,
         flag: undefined,
-        
+        ptype:2
       },
       // 表单参数
       form: {