diff --git a/src/api/pick.js b/src/api/pick.js
index 5e1daa4..6a1c9db 100644
--- a/src/api/pick.js
+++ b/src/api/pick.js
@@ -38,4 +38,4 @@ export function cancelAllocate(ids) {
     data: ids
   })
 }
-export default { add, edit, del, allocate ,cancelAllocate }
+export default { add, edit, del, allocate , cancelAllocate }
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index e6c9b6b..de358c2 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -19,14 +19,14 @@
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="tableKey">
+      <crudOperation :permission="permission" :table-key="this.$options.name">
         <el-button
             slot="right"
             class="filter-item"
             type="success"
             icon="el-icon-edit"
             size="mini"
-            :disabled="crud.selections.length !== 1 || this.crud.selections[0].orderQty<=this.crud.selections[0].allocatedQty"
+            :disabled="crud.selections.length !== 1 || this.crud.selections[0].status !=='OPEN'"
             @click="allocate(crud.selections)"
         >
           分配
@@ -38,7 +38,7 @@
             icon="el-icon-edit"
             size="mini"
             :loading="crud.delAllLoading"
-            :disabled="crud.selections.length !== 1 || this.crud.selections[0].status!=='ALLOCATE' || this.crud.selections[0].status!=='PICKUP'"
+            :disabled="crud.selections.length !== 1 || this.crud.selections[0].status !=='ALLOCATE'"
             @click="cancelAllocate(crud.selections)"
         >
           取消分配
@@ -121,13 +121,12 @@
 </template>
 
 <script>
-import crudPick, { allocate,cancelAllocate } from '@/api/pick'
+import crudPick from '@/api/pick'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudPickDetail from "@/api/pickDetail";
 
 const defaultForm = { id: null, deptId: null, billType: null, orderOrigin: null, priority: null, owner: null, relatedBill1: null, relatedBill2: null, sourceName: null, status: null, address: null, dispatchDate: null, erTime: null, createBy: null, updateBy: null, createTime: null, updateTime: null, orderDate: null }
 export default {
@@ -168,7 +167,7 @@ export default {
           ids.push(datas[i].id)
         }
         crudPick.allocate(ids).then(res => {
-          this.crud.notify(res.message, res.status)
+          this.crud.notify(res.data, res.status)
           this.crud.toQuery()
         }).catch(() => {
           this.crud.toQuery()
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 4066fa7..8f3b981 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="head-container">
       <Search />
-      <crudOperation>
+      <crudOperation :table-key="this.$options.name">
         <el-button
           slot="left"
           class="filter-item"
@@ -17,7 +17,7 @@
       </crudOperation>
     </div>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+    <el-table ref="table" border v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" inline class="demo-table-expand">