diff --git a/src/api/basicdata/basicdataTeamGroup.js b/src/api/basicdata/basicdataTeamGroup.js
index bde1046e..188df348 100644
--- a/src/api/basicdata/basicdataTeamGroup.js
+++ b/src/api/basicdata/basicdataTeamGroup.js
@@ -12,6 +12,18 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getListTeam = (current, size, params) => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataTeamGroup/listTeam',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-basicdata/basicdataTeamGroup/detail',
diff --git a/src/api/distribution/distributionStockup.js b/src/api/distribution/distributionStockup.js
index 5d103697..87788f43 100644
--- a/src/api/distribution/distributionStockup.js
+++ b/src/api/distribution/distributionStockup.js
@@ -46,6 +46,14 @@ export const add = (row) => {
   })
 }
 
+export const addAssign = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockup/saveAssign',
+    method: 'post',
+    data: row
+  })
+}
+
 export const update = (row) => {
   return request({
     url: '/api/logpm-distribution/distributionStockup/submit',
diff --git a/src/option/distribution/distributionStockup.js b/src/option/distribution/distributionStockup.js
index bfed4787..67bfe820 100644
--- a/src/option/distribution/distributionStockup.js
+++ b/src/option/distribution/distributionStockup.js
@@ -79,7 +79,7 @@ export default {
       search: true,
     },
     {
-      label: "指派状态;1-未指派、2-已指派",
+      label: "指派状态",
       prop: "assignStatus",
       search: true,
     },
diff --git a/src/views/distribution/inventory/distributionStockArticle.vue b/src/views/distribution/inventory/distributionStockArticle.vue
index e8b7458c..c64ea1b4 100644
--- a/src/views/distribution/inventory/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/distributionStockArticle.vue
@@ -466,6 +466,10 @@ export default {
     //提货跳转
     handlebill(row){
       console.log(">>>>",this.ids);
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
       this.$router.push({
         path: '/distribution/inventory/distrilbutionBillLading',
         query:{
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 53267999..9296bfd6 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -30,8 +30,12 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+            <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>
+            <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button>
+            <el-button icon="el-icon-search" @click="getStockUp('1')" >待备货</el-button>
+
+<!--            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
+<!--            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
           </div>
         </div>
       </el-row>
@@ -61,7 +65,7 @@
             <template #="{row}">
               <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
               <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
+<!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
             </template>
           </el-table-column>
         </el-table>
@@ -205,12 +209,13 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getListUser } from "@/api/distribution/distributionStockup";
+import { getList, getDetail, add, update, remove,getListUser,addAssign } from "@/api/distribution/distributionStockup";
 import { getPostList } from '@/api/system/post';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
-import { getListOwn } from '@/api/system/user';
+import { getListOwn,getUser } from '@/api/system/user';
 import option from "@/option/distribution/distributionStockup";
 import { mapGetters } from "vuex";
+import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 
 export default {
   data () {
@@ -265,6 +270,26 @@ export default {
     }
   },
   methods: {
+    //查询备货
+    getStockUp(row){
+      console.log("row",row);
+      let params = {};
+      switch (row) {
+          case '1':
+            params.stockupStatus = '2'
+            break;
+          case '2':
+            params.stockupStatus = '3'
+            break;
+      }
+      getList(this.page.currentPage, this.page.pageSize, params).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
     //查询叉车人员
     async getFork(){
       let ides = '';
@@ -289,8 +314,7 @@ export default {
         // roleId: '', //角色
       }
       getListOwn(Object.assign(params, this.query)).then(res =>{
-
-        console.log(".............",res.data.data);
+        // console.log(".............",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
@@ -301,12 +325,27 @@ export default {
         });
         this.forkliftData = fo;
       })
-      this.getStorageArea();
+     await this.getStorageArea();
+     await this.getTeam();
 
     },
     //查询班组
     async getTeam(){
-
+      let params ={
+        department: this.deptId
+      }
+      getListTeam(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res =>{
+        // console.log(">><><",res.data.data.records);
+        let fo= [];
+        res.data.data.records.forEach(i =>{
+          let a= {
+            dictKey: i.id,
+            dictValue: i.name +'-'+i.groupName
+          }
+          fo.push(a);
+        });
+        this.loaderData = fo;
+      })
     },
     //备货区
     async getStorageArea(){
@@ -314,7 +353,7 @@ export default {
         department: this.deptId
       }
       stockUp(params).then(res =>{
-        console.log("res>>>",res.data.data);
+        // console.log("res>>>",res.data.data);
         let fo =[];
         res.data.data.forEach(i =>{
           let v = {
@@ -327,15 +366,26 @@ export default {
       })
     },
      handleForklift(){
-      // console.log(">>");
+       if (this.selectionList.length === 0) {
+         this.$message.warning("请选择至少一条数据");
+         return;
+       }
       this.dialogFormCustomer = true;
       this.getFork();
       this.getTeam()
 
-
     },
-    //确定通知提货按钮
-    callFordelivery(inde){
+    //确定指派
+    callFordelivery(){
+      this.form.ids = this.ids;
+      addAssign(this.form).then(res =>{
+        this.$message({
+          type: "success",
+          message: "操作成功！"
+        });
+        this.onLoad(this.page);
+        this.dialogFormCustomer = false;
+      })
 
     },
     init () {
@@ -458,8 +508,26 @@ export default {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
-        this.loading = false;
+       this.data.forEach(async i =>{
+         let a = await getUser(i.forklift);
+         i.forklift =a.data.data.name;
+         i.loader = i.groupName;
+         i.stockupArea = i.headline;
+         if(i.assignStatus == '2'){
+           i.assignStatus = '已指派';
+         }else{
+           i.assignStatus = '未指派';
+         }
+         if(i.stockupStatus == '2'){
+           i.stockupStatus = '待备货';
+         }else if(i.stockupStatus == '3'){
+           i.stockupStatus = '已备货';
+         }else{
+           i.stockupStatus = '未备货';
+         }
+       });
         this.selectionClear();
+        this.loading = false;
       });
     }
   }