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

src/api/equipment/check.js

@@ -45,3 +45,10 @@ export function deleteByType(data){
     method:'delete'
   })
 }
+
+export function checkInventory(query) {
+  return request({
+    url: '/wbwarehouse/checkInventory/' + query,
+    method: 'get',
+  });
+}
\ No newline at end of file

src/api/magnagement.js

@@ -52,4 +52,11 @@ export function deletedevice(id) {
     method: 'delete'
   })
 }
-
+// 导出
+export function exportdevice() {
+  return request({
+    url: '/wbwarehouse/export',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

src/api/processMangement/InventoryRecord.js

 import request from '@/utils/request'
 
 // TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
-export function listLog(queryParams) {
+export function listLog(queryParams, queryMaps) {
   return request({
     url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
-    method: 'get',
-    params: queryParams
+    method: 'post',
+    params: queryParams,
+    data: queryMaps,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
   })
 }
 

src/api/sample/inventoryRecord.js

 import request from '@/utils/request'
 
 // TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
-export function listLog(queryParams) {
+export function listLog(queryParams, queryMaps) {
   return request({
     url: '/wbchemistrylog/queryWbChemistryLogByPagination',
-    method: 'get',
-    params: queryParams
+    method: 'post',
+    params: queryParams,
+    data: queryMaps,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
   })
 }
 

src/components/Table/BaseTable/index.vue

@@ -10,6 +10,7 @@
         :data="allTableArguments.List"
         style="width: 100%;"
         @selection-change="handleSelectionChange(row)"
+        @sort-change="changeTableSort"
       >
 
         <el-table-column type="index" label="序号" width="50" />
@@ -101,6 +102,9 @@ export default {
     }
   },
   methods: {
+    changeTableSort(val) {
+      this.$emit('change-table-sort', val)
+    },
     handleSelectionChange(row) {
       this.$emit('handle-selection-change', row)
     },

src/views/equipment/boundManagement.vue

@@ -99,27 +99,27 @@
 
     <!-- 添加或修改设备配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
         <el-form-item label="pn" prop="pn">
-          <el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
+          <el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
         </el-form-item>
         <el-form-item label="lot" prop="lot">
-          <el-input v-model.trim="form.lot" :maxlength="30" placeholder="请输入lot" />
+          <el-input ref="input2" v-model.trim="form.lot" :maxlength="30" placeholder="请输入lot" @keyup.enter.native="handelTab(2,$event)" />
         </el-form-item>
         <el-form-item label="plocation" prop="plocation">
-          <el-input v-model.trim="form.plocation" :maxlength="30" placeholder="请输入plocation" />
+          <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 v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" />
+          <el-input ref="input4" v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" @keyup.enter.native="handelTab(4,$event)" />
         </el-form-item>
         <el-form-item label="psm" prop="psm">
-          <el-input v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" />
+          <el-input ref="input5" v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
         </el-form-item>
         <el-form-item label="pzl" prop="pzl">
-          <el-input v-model.trim="form.pzl" :maxlength="30" placeholder="请输入pzl" />
+          <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 v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" />
+          <el-input ref="input7" v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -327,6 +327,11 @@ export default {
       formData: {}
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs.input1.$refs.input.focus()
+    })
+  },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
     this.$store.dispatch('searchSave/searchParamsSet', {
@@ -346,6 +351,17 @@ export default {
     this.getList()
   },
   methods: {
+    handelTab(i, e) {
+      const that = this
+      if (!that.$refs['input' + i]) {
+        return
+      }
+      that.$nextTick(() => {
+        e.target.blur()
+        const index = i + 1
+        that.$refs['input' + index].focus()
+      })
+    },
     // TODO: 获取所选行详情信息操作
     handleDetail(row) {
       this.singleDetails = this.formReset

src/views/equipment/check.vue

@@ -37,6 +37,10 @@
         <el-button   style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
+        <el-form-item>
+          <el-button style="padding: 8px 7px;" :type="'warning'" :size="smallSize" icon="el-icon-view" @click="checkInventory">查看盘点  </el-button>
+        </el-form-item>
+
         <el-form-item>
           <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="checkType">开始盘点 {{ check }} </el-button>
         </el-form-item>
@@ -49,26 +53,26 @@
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">设备管理列表</div>
+      <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">
+        <el-table-column label="pn" prop="pn" width="220">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="lot" prop="lot" width="120">
+        <el-table-column label="lot" prop="lot" width="220">
           <template slot-scope="scope">
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="位置" prop="plocation">
+        <el-table-column label="位置" prop="plocation" width="220">
           <template slot-scope="scope">
             {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="厚度" prop="phd">
+        <el-table-column label="厚度" prop="phd" width="220">
           <template slot-scope="scope">
             {{ scope.row.phd || '-' }}
           </template>
@@ -78,9 +82,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
@@ -202,14 +206,44 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 操作时间：" prop="createDate">
-              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
+            <el-form-item label=" 操作时间：" prop="updateDate">
+              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
             </el-form-item>
           </el-col>
         </el-row>
         
       </el-form>
     </el-dialog>
+    <el-drawer
+      title="库存盘点列表"
+      :visible.sync="table"
+      direction="rtl"
+      size="50%"
+       >
+      <el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;">
+        
+        <el-table-column label="pn" prop="pn" >
+          <template slot-scope="scope">
+            {{ scope.row.pn || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="lot" prop="lot" >
+          <template slot-scope="scope">
+            {{ scope.row.lot || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="位置" prop="plocation" >
+          <template slot-scope="scope">
+            {{ scope.row.plocation || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="厚度" prop="phd" >
+          <template slot-scope="scope">
+            {{ scope.row.phd || '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-drawer>
   </div>
 </template>
 
@@ -223,7 +257,7 @@ import {
   getRole,
   updateRole
 } from '@/api/system/role'
-import { checkType, listCheck,addList,deleteByType} from '@/api/equipment/check'
+import { checkType, listCheck,addList,deleteByType,checkInventory} from '@/api/equipment/check'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -236,6 +270,8 @@ export default {
          Ptype: '',
          checkList: [],
       },
+      table:false,
+      tableList:[],
       // 选中的列表
       selectList:[],
       // TODO: 表单里的单项详情参数
@@ -246,7 +282,7 @@ export default {
         location: '',
         thickness: '',
         createBy: '',
-        createTime: ''
+        updateDate: ''
       },
       // 是否显示弹出层（数据详情）
       openDetails: false,
@@ -348,6 +384,31 @@ export default {
         delFlag:0
         
       },
+
+
+
+
+
+
+
+
+
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
       // 表单参数
       form: {
 
@@ -394,6 +455,23 @@ export default {
     // });
   },
   methods: {
+    checkInventory() {
+      this.$confirm('确认查询盘点吗？')
+          .then(_ => {
+            this.table = true
+            checkInventory(1)
+            .then(response => {
+              // 处理返回的数据
+              this.tableList = response.data
+              console.log(response);
+            })
+            .catch(error => {
+              // 处理请求错误
+              console.error(error);
+            });
+            done();
+          }).catch(_ => {});
+    },
     // TODO: 获取所选行详情信息操作
     handleDetail(row) {
       this.singleDetails = this.formReset
@@ -414,7 +492,7 @@ export default {
         if (flag.data > 0 && flag.code === 200) {
           this.$message.success("结束盘点成功");
         } else {
-          this.$message.error("结束盘点失败");
+          this.$message.error("当前未开始盘点");
         }
       });
     })

src/views/equipment/checkProcess.vue

@@ -37,6 +37,10 @@
         <el-button  style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
+        <el-form-item>
+          <el-button style="padding: 8px 7px;" :type="'warning'" :size="smallSize" icon="el-icon-view" @click="checkInventory">查看盘点  </el-button>
+        </el-form-item>
+
         <el-form-item>
           <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="checkType">开始盘点 {{ check }} </el-button>
         </el-form-item>
@@ -48,26 +52,26 @@
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">设备管理列表</div>
+      <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">
+        <el-table-column label="pn" prop="pn" width="220">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="lot" prop="lot" width="120">
+        <el-table-column label="lot" prop="lot" width="220">
           <template slot-scope="scope">
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="plocation" prop="plocation">
+        <el-table-column label="plocation" prop="plocation" width="220">
           <template slot-scope="scope">
             {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="厚度" prop="phd">
+        <el-table-column label="厚度" prop="phd" width="220">
           <template slot-scope="scope">
             {{ scope.row.phd || '-' }}
           </template>
@@ -77,9 +81,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
@@ -201,14 +205,44 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 操作时间：" prop="createDate">
-              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
+            <el-form-item label=" 操作时间：" prop="updateDate">
+              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
             </el-form-item>
           </el-col>
         </el-row>
         
       </el-form>
     </el-dialog>
+    <el-drawer
+      title="库存盘点列表"
+      :visible.sync="table"
+      direction="rtl"
+      size="50%"
+       >
+      <el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;">
+        
+        <el-table-column label="pn" prop="pn" >
+          <template slot-scope="scope">
+            {{ scope.row.pn || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="lot" prop="lot" >
+          <template slot-scope="scope">
+            {{ scope.row.lot || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="位置" prop="plocation" >
+          <template slot-scope="scope">
+            {{ scope.row.plocation || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="厚度" prop="phd" >
+          <template slot-scope="scope">
+            {{ scope.row.phd || '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-drawer>
   </div>
 </template>
 
@@ -224,7 +258,7 @@ import {
   updateRole
 } from '@/api/system/role'
 import {listCheck } from '@/api/equipment/checkProcess'
-import { checkType, addList,deleteByType} from '@/api/equipment/check'
+import { checkType, addList,deleteByType,checkInventory} from '@/api/equipment/check'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -240,8 +274,10 @@ export default {
         location: '',
         thickness: '',
         createBy: '',
-        createTime: ''
+        updateDate: ''
       },
+      table:false,
+      tableList:[],
       // 是否显示弹出层（数据详情）
       openDetails: false,
       // // TODO: 模拟测试数据
@@ -385,6 +421,23 @@ export default {
     // });
   },
   methods: {
+    checkInventory() {
+      this.$confirm('确认查询盘点吗？')
+          .then(_ => {
+            this.table = true
+            checkInventory(2)
+            .then(response => {
+              // 处理返回的数据
+              this.tableList = response.data
+              console.log(response);
+            })
+            .catch(error => {
+              // 处理请求错误
+              console.error(error);
+            });
+            done();
+          }).catch(_ => {});
+    },
     // TODO: 获取所选行详情信息操作
     handleDetail(row) {
       this.singleDetails = this.formReset
@@ -405,7 +458,7 @@ export default {
         if (flag.data > 0) {
           this.$message.success("结束盘点成功");
         } else {
-          this.$message.error("结束盘点失败");
+          this.$message.error("当前未开始盘点");
         }
       });
     })

src/views/equipment/equipmentAbandonment.vue

@@ -51,26 +51,26 @@
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">设备管理列表</div>
+      <div class="mb12 font-small-bold">设备废弃列表</div>
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
        
         <el-table-column type="index" label="序号" width="80" />
-        <el-table-column label="pn" prop="pn" width="120">
+        <el-table-column label="pn" prop="pn" width="220">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="lot" prop="lot" width="120">
+        <el-table-column label="lot" prop="lot" width="220">
           <template slot-scope="scope">
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="plocation" prop="plocation">
+        <el-table-column label="plocation" prop="plocation" width="220">
           <template slot-scope="scope">
             {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="厚度" prop="phd">
+        <el-table-column label="厚度" prop="phd" width="220">
           <template slot-scope="scope">
             {{ scope.row.phd || '-' }}
           </template>
@@ -80,9 +80,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
@@ -203,8 +203,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 操作时间：" prop="createDate">
-              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
+            <el-form-item label=" 操作时间：" prop="updateDate">
+              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -289,7 +289,7 @@ export default {
         location: '',
         thickness: '',
         createBy: '',
-        createTime: ''
+        updateDate: ''
       },
       // 是否显示弹出层（数据详情）
       openDetails: false,
@@ -471,7 +471,7 @@ export default {
     handleDetail(row) {
       this.singleDetails = this.formReset
       this.singleDetails = row
-      this.title = '详情信息'
+      this.title = '废弃信息'
       this.openDetails = !this.openDetails
     },
     handelTab(i, e) {

src/views/equipment/management.vue

@@ -38,6 +38,17 @@
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
         <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
+
+      <el-form-item style="float: right">
+        <el-button
+          style="padding: 8px 7px;"
+          type="success"
+          size="small"
+          icon="el-icon-download"
+          @click="handleExport"
+        >导出</el-button>
+      </el-form-item>
+
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
@@ -180,8 +191,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 操作时间：" prop="updateDate">
-              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
+            <el-form-item label=" 入库日期：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -195,14 +206,12 @@ import {
   addRole,
   changeRoleStatus,
   dataScope,
-  exportRole,
   getRole,
   updateRole
 } from '@/api/system/role'
-import { listdevice, deletedevice } from '@/api/magnagement'
+import { listdevice, deletedevice, exportdevice } from '@/api/magnagement'
 import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
 import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
-// import { getRolesByInsId } from '../../../api/businessManage/template'
 export default {
   name: 'Role',
   data() {
@@ -669,23 +678,26 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams
-      this.$confirm('是否确认操作?', '警告', {
+      this.$confirm('是否确认导出设备管理信息?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return exportRole(queryParams).then(response => {
+        return exportdevice().then(response => {
           const blob = new Blob([response])
           const downloadElement = document.createElement('a')
-          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          // TODO: 创建下载的链接
+          const href = window.URL.createObjectURL(blob)
           downloadElement.href = href
-          downloadElement.download = '角色信息' + '.xls' // 下载后文件名
+          // TODO: 下载后文件名
+          downloadElement.download = '设备管理信息' + '.xls'
           document.body.appendChild(downloadElement)
-          downloadElement.click()// 点击下载
-          document.body.removeChild(downloadElement)// 下载完成移除元素
-          window.URL.revokeObjectURL(href)// 释放掉blob对象
-          // this.download(response.msg);
+          // TODO: 点击下载
+          downloadElement.click()
+          // TODO: 下载完成移除元素
+          document.body.removeChild(downloadElement)
+          // TODO: 释放掉blob对象
+          window.URL.revokeObjectURL(href)
         })
       })
     }

src/views/processManagement/basicProcessManagement/index.vue

@@ -38,6 +38,15 @@
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
         <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
+      <el-form-item style="float: right">
+        <el-button
+          style="padding: 8px 7px;"
+          type="success"
+          size="small"
+          icon="el-icon-download"
+          @click="handleExport"
+        >导出</el-button>
+      </el-form-item>
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
@@ -190,11 +199,10 @@ import {
   changeRoleStatus,
   dataScope,
   delRole,
-  exportRole,
   getRole,
   updateRole
 } from '@/api/system/role'
-import { listdevice } from '@/api/magnagement'
+import { listdevice, exportdevice } from '@/api/magnagement'
 import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
 import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -666,22 +674,26 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams
-      this.$confirm('是否确认操作?', '警告', {
+      this.$confirm('是否确认导出工序库信息?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return exportRole(queryParams).then(response => {
+        return exportdevice().then(response => {
           const blob = new Blob([response])
           const downloadElement = document.createElement('a')
-          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          // TODO: 创建下载的链接
+          const href = window.URL.createObjectURL(blob)
           downloadElement.href = href
-          downloadElement.download = '角色信息' + '.xls' // 下载后文件名
+          // TODO: 下载后文件名
+          downloadElement.download = '设备工序库信息' + '.xls'
           document.body.appendChild(downloadElement)
-          downloadElement.click()// 点击下载
-          document.body.removeChild(downloadElement)// 下载完成移除元素
-          window.URL.revokeObjectURL(href)// 释放掉blob对象
+          // TODO: 点击下载
+          downloadElement.click()
+          // TODO: 下载完成移除元素
+          document.body.removeChild(downloadElement)
+          // TODO: 释放掉blob对象
+          window.URL.revokeObjectURL(href)
           // this.download(response.msg);
         })
       })

src/views/processManagement/inventoryRecord/index.vue

 <template>
   <div class="app-container">
     <div class="ToolBar">
-      <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
+      <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
-            v-model="queryParams.pn"
+            ref="autoGetFocusInput"
+            v-model="queryEntity.entity.pn"
             placeholder="请输入pn"
             clearable
             :maxlength="20"
@@ -16,7 +17,7 @@
 
         <el-form-item label="lot" prop="lot">
           <el-input
-            v-model="queryParams.lot"
+            v-model="queryEntity.entity.lot"
             placeholder="请输入lot"
             clearable
             :maxlength="20"
@@ -27,7 +28,7 @@
 
         <el-form-item label="plocation" prop="plocation">
           <el-input
-            v-model="queryParams.plocation"
+            v-model="queryEntity.entity.plocation"
             placeholder="请输入plocation"
             clearable
             :maxlength="20"
@@ -38,7 +39,7 @@
 
         <el-form-item label="库类型" prop="ptype">
           <el-select
-            v-model="queryParams.ptype"
+            v-model="queryEntity.entity.ptype"
             placeholder="请选择库类型"
             filterable
             clearable
@@ -55,7 +56,7 @@
 
         <el-form-item label="库状态" prop="poperate">
           <el-select
-            v-model="queryParams.poperate"
+            v-model="queryEntity.entity.poperate"
             placeholder="请选择库状态"
             filterable
             clearable
@@ -115,6 +116,7 @@
         :key="queryParams.rows"
         :all-table-arguments="allTableArguments"
         @handle-detail="handleDetail"
+        @change-table-sort="changeTableSort"
       />
     </transition>
     <!--TODO: 分页组件-->
@@ -277,17 +279,25 @@ export default {
       dateRange: [],
       queryParams: {
         page: 1,
-        rows: 10,
+        rows: 10
+      },
+      queryEntity: {
+
+        // TODO: 0表示倒序排序，1表示顺序排序
+        tableSortMark: 0,
+
+        entity: {
           // TODO: 设备编码
-        pn: undefined,
+          pn: '',
           // TODO: lot
-        lot: undefined,
+          lot: '',
           // TODO: 位置
-        plocation: undefined,
+          plocation: '',
           // TODO: 库状态 1 入，2出，3修正，4废弃
-        poperate: undefined,
+          poperate: '',
           // TODO: 库类型 1设备库 2工序库
-        ptype: undefined
+          ptype: ''
+        }
       },
       // TODO: list记录表名
       listName: '出入库记录列表',
@@ -350,6 +360,7 @@ export default {
           {
             time: true,
             prop: 'createDate',
+            sortable: 'custom',
             label: '操作时间',
             align: 'center'
           },
@@ -417,12 +428,15 @@ export default {
   created() {
     this.getList()
   },
+  mounted() {
+    this.$refs.autoGetFocusInput.focus()
+  },
   methods: {
 
     /** TODO:查询工序库的出入库记录列表 */
     getList() {
       this.loading = true
-      listLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
         this.inventoryRecordList = response.rows
         this.total = response.total
         // 暂时还没写后端 this.selectOptionsAboutPoperate = selectOptionsAboutPoperate
@@ -474,6 +488,18 @@ export default {
       this.activateAbandonedState = false
       this.singleLogIdAndFqYs = {}
     },
+    /* TODO: 进行排序 */
+    changeTableSort: function(val) {
+      console.log('column', val)
+      // TODO:按照降序排序
+      if (val.order === 'descending') {
+        this.queryEntity.tableSortMark = 0
+      } else {
+        // TODO:按照升序排序
+        this.queryEntity.tableSortMark = 1
+      }
+      this.getList()
+    },
     /* TODO: 获取详情信息*/
     handleDetail: function(row) {
       /* TODO: 如果库状态为‘废弃’，即为‘4’时，则可以进入 */

src/views/sample/inventoryRecord/index.vue

 <template>
   <div class="app-container">
     <div class="ToolBar">
-      <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
+      <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
-            v-model="queryParams.pn"
+            ref="autoGetFocusInput"
+            v-model="queryEntity.entity.pn"
             placeholder="请输入pn"
             clearable
             :maxlength="20"
@@ -16,7 +17,7 @@
 
         <el-form-item label="lot" prop="lot">
           <el-input
-            v-model="queryParams.lot"
+            v-model="queryEntity.entity.lot"
             placeholder="请输入lot"
             clearable
             :maxlength="20"
@@ -25,20 +26,9 @@
           />
         </el-form-item>
 
-        <el-form-item label="plocation" prop="plocation">
-          <el-input
-            v-model="queryParams.plocation"
-            placeholder="请输入plocation"
-            clearable
-            :maxlength="20"
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
         <el-form-item label="库类型" prop="ptype">
           <el-select
-            v-model="queryParams.ptype"
+            v-model="queryEntity.entity.ptype"
             placeholder="请选择库类型"
             filterable
             clearable
@@ -53,23 +43,6 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="库状态" prop="poperate">
-          <el-select
-            v-model="queryParams.poperate"
-            placeholder="请选择库状态"
-            filterable
-            clearable
-            @keyup.enter.native="handleQuery"
-          >
-            <el-option
-              v-for="option in selectOptionsAboutPoperate"
-              :key="option.value"
-              :label="option.label"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item>
-
         <el-form-item label="操作时间" prop="date">
           <div class="block">
             <el-date-picker
@@ -113,9 +86,9 @@
       <component
         :is="BaseTable"
         :key="queryParams.rows"
-        :n-index="nIndex"
         :all-table-arguments="allTableArguments"
         @handle-detail="handleDetail"
+        @change-table-sort="changeTableSort"
       />
     </transition>
     <!--TODO: 分页组件-->
@@ -147,8 +120,8 @@
             <el-form-item label="lot：" prop="lot">
               <el-input v-model.trim="singleDetails.lot" :readonly="isReadOnly" />
             </el-form-item>
-            <el-form-item label="plocation：" prop="plocation">
-              <el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly" />
+            <el-form-item label="unit：" prop="unit">
+              <el-input v-model.trim="singleDetails.unit" :readonly="isReadOnly" />
             </el-form-item>
           </el-col>
 
@@ -156,15 +129,17 @@
             <el-form-item label="库类型：" prop="ptype">
               {{ selectedPtype(singleDetails.ptype) }}
             </el-form-item>
-            <el-form-item label="库状态：" prop="poperate">
-              {{ selectedPoperate(singleDetails.poperate) }}
+            <el-form-item label="qty：" prop="qty">
+              {{ singleDetails.qty }}
+            </el-form-item>
+            <el-form-item label="memo：" prop="memo">
+              <el-input v-model.trim="singleDetails.memo" :readonly="isReadOnly" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <!-- TODO: 这里是 库状态为废弃时才会触发显示的模块 -->
         <transition name="fade-transform" mode="out-in">
-
           <el-row v-if=" activateAbandonedState " style="height: 160px">
             <el-col :span="12">
               <el-form-item label="fq_ys：" prop="fq_ys">
@@ -189,7 +164,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <transition />
+        </transition>
 
         <el-row>
           <el-col :span="12">
@@ -205,15 +180,16 @@
           </el-col>
         </el-row>
 
-        </transition></el-form>
+      </el-form>
     </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { listLog, findSingleLogDetail, exportInventoryRecord } from '@/api/processMangement/InventoryRecord'
+import { exportInventoryRecord, findSingleLogDetail, listLog } from '@/api/sample/inventoryRecord'
 import BaseTable from '@/components/Table/BaseTable/index.vue'
+import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments'
 
 export default {
   name: 'InventoryRecord',
@@ -244,24 +220,6 @@ export default {
       // TODO: 数据总条数
       total: 0,
 
-      // TODO: 关于 Ptype的数据字典
-      selectOptionsAboutPoperate: [
-        {
-          value: '1',
-          label: '入库'
-        }, {
-          value: '2',
-          label: '出库'
-        },
-        {
-          value: '3',
-          label: '修正'
-        }, {
-          value: '4',
-          label: '废弃'
-        }
-      ],
-
       // TODO: 关于 Ptype的数据字典
       selectOptionsAboutPtype: [
         {
@@ -278,18 +236,23 @@ export default {
       dateRange: [],
       queryParams: {
         page: 1,
-        rows: 10,
+        rows: 10
+      },
+      queryEntity: {
+
+        // TODO: 0表示倒序排序，1表示顺序排序
+        tableSortMark: 0,
+        entity: {
           // TODO: 设备编码
-        pn: undefined,
+          pn: '',
           // TODO: lot
-        lot: undefined,
-        // TODO: 位置
-        plocation: undefined,
-        // TODO: 库状态 1 入，2出，3修正，4废弃
-        poperate: undefined,
+          lot: '',
           // TODO: 库类型 1设备库 2工序库
-        ptype: undefined
+          ptype: ''
+        }
       },
+      // TODO: list记录表名
+      listName: '出入库记录列表',
       // TODO: 用来接收数据源
       inventoryRecordList: [],
       // TODO: 用来说明每一列的类型
@@ -316,26 +279,26 @@ export default {
             label: 'lot'
           },
           {
-            ownDefined: true,
-            prop: 'ptype',
-            label: '库类型',
+            text: true,
+            prop: 'qty',
+            label: 'qty',
+            width: '180px',
             ownDefinedReturn: (row, $index) => {
-              return this.selectedPtype(row.ptype)
+              return this.selectedPoperate(row.poperate)
             }
           },
           {
             ownDefined: true,
-            prop: 'poperate',
-            label: '库状态',
-            width: '180px',
+            prop: 'ptype',
+            label: '库类型',
             ownDefinedReturn: (row, $index) => {
-              return this.selectedPoperate(row.poperate)
+              return this.selectedPtype(row.ptype)
             }
           },
           {
             text: true,
-            prop: 'plocation',
-            label: 'plocation',
+            prop: 'producer',
+            label: 'producer',
             sortable: false,
             width: '150px'
           },
@@ -349,10 +312,13 @@ export default {
           {
             time: true,
             prop: 'createDate',
+            sortable: 'custom',
             label: '操作时间',
             align: 'center'
           },
-          // TODO: 如果为操作列,则需要填写需要的操作按钮,类型为Object。operation(操作类型,可选edit,delete,see),type(按钮样式,参考el—botton类型),label(按钮文字)icon(参考el-icon),color(字体颜色)
+          /* TODO: 如果为操作列,则需要填写需要的操作按钮,类型为Object。operation(操作类型,可选edit,delete,see),type(按钮样式,参考el—botton类型),label(按钮文字)icon(参考el-icon),color(字体颜色)
+          *   clickType 1为详情 2为修改 3为删除
+          * */
           {
             isOperation: true,
             label: '操作',
@@ -394,13 +360,13 @@ export default {
     },
     // TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
     allTableArguments() {
-      return {
-        listName: '出入库记录列表',
-        loading: this.loading,
-        List: this.inventoryRecordList,
-        queryParams: this.queryParams,
-        columObj: this.columObj
-      }
+      const baseTableArgumentsTest = new BaseTableArgumentsTest()
+      baseTableArgumentsTest.listName = this.listName
+      baseTableArgumentsTest.loading = this.loading
+      baseTableArgumentsTest.List = this.inventoryRecordList
+      baseTableArgumentsTest.queryParams = this.queryParams
+      baseTableArgumentsTest.columObj = this.columObj
+      return baseTableArgumentsTest
     }
   },
   /** 路由离开前存储筛选条件*/
@@ -416,12 +382,14 @@ export default {
   created() {
     this.getList()
   },
+  mounted() {
+    this.$refs.autoGetFocusInput.focus()
+  },
   methods: {
-
     /** TODO:查询工序库的出入库记录列表 */
     getList() {
       this.loading = true
-      listLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
         this.inventoryRecordList = response.rows
         this.total = response.total
         // 暂时还没写后端 this.selectOptionsAboutPoperate = selectOptionsAboutPoperate
@@ -441,22 +409,6 @@ export default {
           return ''
       }
     },
-    /* TODO: poperate的库状态判断的公用方法 */
-    selectedPoperate(poperate) {
-      switch (poperate) {
-        case '1':
-          return '入库'
-        case '2':
-          return '出库'
-        case '3':
-          return '修正'
-        case '4':
-          return '废弃'
-        default:
-          return ''
-      }
-    },
-
     /** TODO: 查询按钮操作 */
     handleQuery() {
       this.queryParams.page = 1
@@ -473,6 +425,18 @@ export default {
       this.activateAbandonedState = false
       this.singleLogIdAndFqYs = {}
     },
+    /* TODO: 进行排序 */
+    changeTableSort: function(val) {
+      console.log('column', val)
+      // TODO:按照降序排序
+      if (val.order === 'descending') {
+        this.queryEntity.tableSortMark = 0
+      } else {
+        // TODO:按照升序排序
+        this.queryEntity.tableSortMark = 1
+      }
+      this.getList()
+    },
     /* TODO: 获取详情信息*/
     handleDetail: function(row) {
       /* TODO: 如果库状态为‘废弃’，即为‘4’时，则可以进入 */
@@ -481,6 +445,7 @@ export default {
       } else {
         /* TODO: 设置单项详情的查询的条件 */
         this.singleLogIdAndFqYs['businessId'] = row.businessId
+
         this.singleLogIdAndFqYs['fqYs'] = row.fqYs
         /* TODO: 进行查询，如果返回的code为200，则表示返回的值成功 */
         findSingleLogDetail(this.singleLogIdAndFqYs).then(
@@ -533,8 +498,8 @@ export default {
 }
 </script>
 
-  <style lang="scss" scoped>
-  .app-container {
+<style lang="scss" scoped>
+.app-container {
   padding: 0;
   font-size: 18px;
   .placeholder{
@@ -556,10 +521,10 @@ export default {
       }
     }
   }
-  }
+}
 
-  /* TODO: 专门用来解决el-input边框的问题 */
-  .aboutSingleDetails{
+/* TODO: 专门用来解决el-input边框的问题 */
+.aboutSingleDetails{
   .el-form{
     .el-form-item{
       .el-input >>> .el-input__inner {
@@ -573,7 +538,7 @@ export default {
     }
   }
 
-  }
+}
 
-  </style>
+</style>