基础信息和两个设备领用

src/views/equipment/basicInfo.vue

@@ -62,7 +62,7 @@
       <div class="mb12 font-small-bold">基本信息</div>
       <el-table v-loading="loading" border :data="basicInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="50" />
-        <el-table-column label="pn" prop="pn">
+        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
@@ -78,7 +78,7 @@
             {{ scope.row.ptype || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="prank" prop="prank">
+        <el-table-column label="prank" prop="prank" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.prank || '-' }}
           </template>
@@ -89,12 +89,12 @@
             <span v-else>是</span>
           </template>
         </el-table-column>
-        <el-table-column label="psm" prop="psm">
+        <el-table-column label="psm" prop="psm" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.prank || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="psy" prop="psy">
+        <el-table-column label="psy" prop="psy" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.prank || '-' }}
           </template>

src/views/equipment/draw.vue

@@ -58,7 +58,7 @@
       <div class="mb12 font-small-bold">设备领用</div>
       <el-table v-loading="loading" border :data="equipmentapplyList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="50" />
-        <el-table-column label="pn" prop="pn">
+        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
@@ -68,7 +68,7 @@
             {{ scope.row.phd || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="prank" prop="prank">
+        <el-table-column label="prank" prop="prank" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.prank || '-' }}
           </template>
@@ -459,6 +459,7 @@ export default {
     next()
   },
   created() {
+    this.resetQuery()
     if (this.$store.getters.searchParams[this.$route.path]) {
       const { searchParams } = this.$store.getters; const { path } = this.$route
       const param = JSON.parse(searchParams[path]) // 保留着的查询条件
@@ -598,8 +599,15 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        page: 1,
+        rows: 10,
+        pn: '',
+        phd: '',
+        prank: '',
+        pstatus: ''
+      }
       // this.dateRange = []
-      this.resetForm('queryForm')
       this.handleQuery()
     },
     // warehouse的重置按钮

src/views/processManagement/draw.vue

@@ -58,7 +58,7 @@
       <div class="mb12 font-small-bold">设备领用</div>
       <el-table v-loading="loading" border :data="equipmentapplyList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="50" />
-        <el-table-column label="pn" prop="pn">
+        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
@@ -68,7 +68,7 @@
             {{ scope.row.phd || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="prank" prop="prank">
+        <el-table-column label="prank" prop="prank" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.prank || '-' }}
           </template>
@@ -235,13 +235,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <!--      <pagination-->
-      <!--        v-show="totalDetail>0"-->
-      <!--        :total="totalDetail"-->
-      <!--        :page.sync="queryParams.page"-->
-      <!--        :limit.sync="queryParams.rows"-->
-      <!--        @pagination="getDeviceList"-->
-      <!--      />-->
     </el-dialog>
 
     <!-- TODO: 处理 -->
@@ -348,7 +341,7 @@
 import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
 import { parseTime } from '@/utils'
 export default {
-  name: 'Role',
+  name: 'Draw',
   data() {
     return {
       totalApplyDetail: 0,
@@ -431,7 +424,7 @@ export default {
         pn: undefined,
         lot: undefined,
         plocation: undefined,
-        ptype: 2,
+        ptype: 1,
         delFlag: 0
       },
       // 查询warehouse的参数
@@ -441,7 +434,7 @@ export default {
         pn: undefined,
         lot: undefined,
         plocation: undefined,
-        ptype: 1,
+        ptype: 2,
         delFlag: 0
       },
       // 表单参数
@@ -466,6 +459,7 @@ export default {
     next()
   },
   created() {
+    this.resetQuery()
     if (this.$store.getters.searchParams[this.$route.path]) {
       const { searchParams } = this.$store.getters; const { path } = this.$route
       const param = JSON.parse(searchParams[path]) // 保留着的查询条件
@@ -605,8 +599,15 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        page: 1,
+        rows: 10,
+        pn: '',
+        phd: '',
+        prank: '',
+        pstatus: ''
+      }
       // this.dateRange = []
-      this.resetForm('queryForm')
       this.handleQuery()
     },
     // warehouse的重置按钮