diff --git a/src/api/basicdata/basicdataDriverArtery.js b/src/api/basicdata/basicdataDriverArtery.js
index 454fe775..8fc6ea2c 100644
--- a/src/api/basicdata/basicdataDriverArtery.js
+++ b/src/api/basicdata/basicdataDriverArtery.js
@@ -67,15 +67,19 @@ export const update = (row) => {
   })
 }
 
-export const getDriverList = (current, size, params) => {
+/**
+ * 查询当前仓库司机列表
+ * @returns {AxiosPromise}
+ */
+export const getDriverList = () => {
   return request({
-    url: '/api/logpm-basicdata/driverArtery/list',
+    url: '/api/logpm-basicdata/driverArtery/getDriverList',
     method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    }
+    // params: {
+    //   ...params,
+    //   current,
+    //   size,
+    // }
   })
 }
 
diff --git a/src/api/basicdata/basicdataVehicle.js b/src/api/basicdata/basicdataVehicle.js
index eb5ee14d..3f9f7898 100644
--- a/src/api/basicdata/basicdataVehicle.js
+++ b/src/api/basicdata/basicdataVehicle.js
@@ -65,15 +65,15 @@ export const update = (row) => {
   })
 }
 
-export const getVehicleList = (current, size, params) => {
+export const getVehicleList = () => {
   return request({
-    url: '/api/logpm-basicdata/vehicle/page',
+    url: '/api/logpm-basicdata/vehicle/getVehicleList',
     method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    }
+    // params: {
+    //   ...params,
+    //   current,
+    //   size,
+    // }
   })
 
 
diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js
index 0dba21ab..b51c3787 100644
--- a/src/api/distribution/distributionReservation.js
+++ b/src/api/distribution/distributionReservation.js
@@ -227,11 +227,11 @@ export const getReservationZeroOrderDetail = (reservationId,id) => {
  * @param ids
  * @returns {AxiosPromise}
  */
-export const getDeliveryZeroOrderDetail = (deliveryId,id) => {
+export const getDeliveryZeroOrderDetail = (deliveryId,orderId) => {
   return request({
-    url: '/api/logpm-distribution/reservation/getDeliveryZeroOrderDetail',
+    url: '/api/logpm-distribution/deliveryList/getDeliveryZeroOrderDetail',
     method: 'get',
-    params: { id,deliveryId }
+    params: { deliveryId,orderId }
   });
 }
 
diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index 70296e77..b090f526 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -114,13 +114,13 @@ export const add = (row) => {
     data: row
   })
 }
-export const addStockRow = (row) => {
+export const addStockRow = params => {
   return request({
-    url: '/api/logpm-distribution/distributionStockArticle/saveStockRow',
-    method: 'post',
-    data: row
-  })
-}
+    url: '/api/logpm-distribution/distributionParcelList/packageTransfer',
+    method: 'get',
+    params,
+  });
+};
 /**
  * 转库存品
  * @param ids
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 007f48f2..1ecf1311 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -27,15 +27,22 @@ export default [
       },
     ],
   },
-  // {
-  //   path: '/tjpage',
-  //   name: '统计页面',
-  //   meta: {
-  //     i18n: 'dashboard',
-  //     menu: false,
-  //   },
-  //   component: () => import(/* webpackChunkName: "views" */ '@/views/wel/dataStatistics.vue'),
-  // },
+  {
+    path: '/distribution',
+    name: '统计页面',
+    meta: {
+      i18n: 'dashboard',
+      menu: false,
+    },
+    redirect: '/distribution/distributionStockArticleFrom',
+    component: Layout,
+    children: [
+      {
+        path: 'distributionStockArticleFrom',
+        component: () => import('@/views/distribution/inventory/distributionStockArticleFrom.vue'),
+      },
+    ],
+  },
   {
     path: '/test',
     component: Layout,
diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue
index c577c93c..26a36c0a 100644
--- a/src/views/basicdata/vehicle/basicdataVehicle.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicle.vue
@@ -76,6 +76,174 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import BasicdataVehicleform from '/src/views/basicdata/vehicle/basicdataVehicleform.vue';
 
+  // export default {
+  //   components: { BasicdataVehicleform },
+  //   data() {
+  //     return {
+  //       form: {},
+  //       query: {},
+  //       search: {},
+  //       loading: true,
+  //       vehicleformdata: {},
+  //       dicDatas: [],
+  //       edit: true, //修改
+  //       page: {
+  //         pageSize: 30,
+  //         currentPage: 1,
+  //         total: 0
+  //       },
+  //       selectionList: [],
+  //       option: {
+  //         height: 'auto',
+  //         calcHeight: 30,
+  //         tip: false,
+  //         searchShow: false,
+  //         searchMenuSpan: 6,
+  //         border: true,
+  //         index: true,
+  //         viewBtn: false,
+  //         editBtn: false,
+  //         selection: true,
+  //         dialogClickModal: false,
+  //         column: [
+  //           {
+  //             label: '主键',
+  //             prop: 'id',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '租户号',
+  //             prop: 'tenantId',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '创建人',
+  //             prop: 'createUser',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '创建时间',
+  //             prop: 'createTime',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '更新人',
+  //             prop: 'updateUser',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '更新时间',
+  //             prop: 'updateTime',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '状态',
+  //             prop: 'status',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '是否已删除;1-未删除，2-已删除',
+  //             prop: 'isDeleted',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '创建部门',
+  //             prop: 'createDept',
+  //             type: 'input',
+  //             addDisplay: false,
+  //             editDisplay: false,
+  //             viewDisplay: false,
+  //             hide: true
+  //           },
+  //           {
+  //             label: '车牌号',
+  //             prop: 'vehicleNub',
+  //             type: 'input',
+  //             search: true,
+  //             labelWidth: '150',
+  //             width: '100px',
+  //             align: 'center',
+  //             span: 11
+  //           },
+  //           {
+  //             label: '承运商名称',
+  //             labelWidth: '150',
+  //             // width: 'fit-content',
+  //             width: '100px',
+  //             align: 'center',
+  //             span: 11,
+  //             prop: 'carrierName',
+  //             type: 'input',
+  //             editDisplay: false,
+  //             addDisplay: false
+  //           },
+  //           {
+  //             label: '绑定驾驶人',
+  //             prop: 'vehicleOwners',
+  //             type: 'select',
+  //             labelWidth: '150',
+  //             width: '200px',
+  //             align: 'center',
+  //             span: 11,
+  //             multiple: true,
+  //             dicData: []
+  //             // dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
+  //             // props: {
+  //             //   label: 'vehicleNub',
+  //             //   value: 'id',
+  //             // },
+  //             // addDisplay: false,
+  //             // editDisplay: false,
+  //             // viewDisplay: false,
+  //             // hide: true,
+  //           },
+  //           {
+  //             label: '车辆来源',
+  //             prop: 'vehicleSource',
+  //             type: 'select',
+  //             search: true,
+  //             labelWidth: '150',
+  //             width: '100px',
+  //             align: 'center',
+  //             span: 11,
+  //             dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_source',
+  //             props: {
+  //               label: 'dictValue',
+  //               value: 'dictKey'
+  //             }
+  //           }
 export default {
   components: { BasicdataVehicleform },
   data() {
diff --git a/src/views/distribution/LsystemsInventory/LsystemsInventory.vue b/src/views/distribution/LsystemsInventory/LsystemsInventory.vue
index 21dc0542..224c0af2 100644
--- a/src/views/distribution/LsystemsInventory/LsystemsInventory.vue
+++ b/src/views/distribution/LsystemsInventory/LsystemsInventory.vue
@@ -7,7 +7,7 @@
     <div class="SoInput" v-show="searchSo">
       <el-form label-position="top" label-width="100px" :model="AddForm">
         <el-form-item label="盘点任务编码:">
-          <el-input v-model="AddForm.inventoryNo" placeholder="请输入盘点任务编码" />
+          <el-input v-model="AddData.inventoryNo" placeholder="请输入盘点任务编码" />
         </el-form-item>
       </el-form>
       <div class="SoBtn">
@@ -76,7 +76,11 @@
               :width="item.width"
               :fixed="item.fixed"
               align="center"
-            />
+            >
+              <template #default="props">
+                <span>{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
+              </template>
+            </el-table-column>
           </template>
 
           <template v-if="item.type === 4">
@@ -96,7 +100,7 @@
                     ? '同步中'
                     : props.row[item.prop] === 2
                     ? '同步完成'
-                     : props.row[item.prop] === 2
+                    : props.row[item.prop] === 2
                     ? '同步异常'
                     : '/'
                 }}</span>
@@ -290,8 +294,8 @@
                   <el-radio label="2" size="default" border>按钮样式风格</el-radio>
                 </el-radio-group>
               </el-tab-pane>
-              <el-tab-pane label="表格导出">Role</el-tab-pane>
-              <el-tab-pane label="待添加">Task</el-tab-pane>
+              <el-tab-pane label="待添加"></el-tab-pane>
+              <el-tab-pane label="待添加"></el-tab-pane>
             </el-tabs>
           </div>
           <!-- 按钮功能结束-->
@@ -319,10 +323,11 @@ const data = ref([]); // 表格数据
 const TabHeight = ref(); //动态获取表格高度
 const AddLalog = ref(false); //提交弹窗
 const AddForm = ref({}); //表单所有信息
+const AddData = ref({}); //获取数据列表
 const tableRef = ref(null); // 用于引用 table 实例
 const menu = ref(false); //功能菜单列表
 const menuHeight = ref(); //右侧菜单栏高度,用于固定表头
-const total = ref(100); //页码总数
+const total = ref(null); //页码总数
 const checkList = ref<(string | number)[]>([]); //隐藏
 const flexList = ref<(string | number)[]>([]); //冻结
 const loading = ref(false); //刷新功能
@@ -457,26 +462,27 @@ const menuData = ref([
     label: '仓库',
     type: 1,
     values: '',
-    width: '260',
+    width: '280',
     checkarr: [],
     fixed: false,
     sortable: true,
     head: true,
   },
 ]);
-
 // 获取表格数据
 function onLoad() {
+  loading.value = true; //开启加载效果
   // 获取表格数据API（$_TableList）
   $_SyncInventoryList({
     pageNum: currentPage.value,
     pageSize: pageSize.value,
-    inventoryNo: AddForm.value.inventoryNo,
-    //  inventoryNo:123123
+    inventoryNo: AddData.value.inventoryNo, //搜索字段(不必填写)
   }).then(res => {
+    loading.value = false; //关闭加载效果
     //表格信息
+    console.log(res, 'res=====>');
+    total.value = res.data.data.total;
     data.value = res.data.data.records;
-    console.log(res, 'res');
   });
 }
 // 	同步老系统盘点数据列表接口
@@ -484,12 +490,15 @@ const Sub = () => {
   onLoad();
 };
 
+const TabHeig = () => {
+  TabHeight.value = TabHeight.value.offsetHeight - 91;
+  menuHeight.value = window.innerHeight - 136;
+};
+
 // 动态获取DOM高度给表单防止页面出现滚动条
 onMounted(() => {
   //默认值88
-  TabHeight.value = TabHeight.value.offsetHeight - 91;
-  menuHeight.value = window.innerHeight - 136;
-  console.log('元素的高度：', menuHeight.value);
+  TabHeig();
   // 等待DOM高度被复制之后在请求数据，防止被数据撑开高度
   onLoad();
 });
@@ -502,20 +511,22 @@ const AddInfo = () => {
 const PageSizeChange = val => {
   pageSize.value = val;
   onLoad();
-  console.log('每一页', val, '条');
 };
 // 页码翻页触发
 const SizeChange = val => {
   currentPage.value = val;
   onLoad();
-  console.log('当前是第', val, '页');
 };
 
 // 表单信息提交
 const submit = () => {
   console.log(AddForm.value);
+  AddLalog.value = false;
   $_SyncInventorySubmit(AddForm.value).then(res => {
-    console.log(res);
+    console.log(res, 'res=======>>>>');
+    AddForm.value.inventoryNo = ''; //重置表单 重新请求列表
+
+    onLoad(); //重新渲染方法
   });
 };
 // 菜单触发功能
@@ -557,11 +568,13 @@ const ViewEvent = val => {
 };
 // 刷新功能触发事件
 const refresh = () => {
+  onLoad();
   //   loading.value = !loading.value;
 };
 // 搜索展开功能
 const search = () => {
   searchSo.value = !searchSo.value;
+  TabHeig();
 };
 // 顶部搜索功能
 const SoInput = () => {
@@ -569,7 +582,7 @@ const SoInput = () => {
 };
 // 顶部清空搜索
 const SoEmpty = () => {
-  AddForm.value.inventoryNo = '';
+  AddData.value.inventoryNo = '';
   onLoad();
 };
 </script>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index b5bd2434..11a65d34 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -7,7 +7,7 @@
           <el-form-item label="配送车次:">
             <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
           </el-form-item>
-          <el-form-item label="配送日期:" class='el-times'>
+          <el-form-item label="配送日期:" class="el-times">
             <el-date-picker
               v-model="query.taskTime"
               type="date"
@@ -160,9 +160,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left" style="margin-top: 20px">
-            <el-button type="primary" icon="el-icon-plus" @click="printBatchOrder"
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="printBatchOrder"
               >批量打印</el-button
-            >
+            > -->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -1181,15 +1181,15 @@ export default {
   margin-left: 8px !important;
 }
 .el-btn {
-  min-width:200px;
+  min-width: 200px;
   margin-right: 0 !important;
   :deep(.el-form-item__content) {
     width: 180px;
-    justify-content: flex-end ;
+    justify-content: flex-end;
   }
 }
 .el-form-item {
-  margin-right:10px;
+  margin-right: 10px;
 }
 .el-form {
   width: 100%;
@@ -1204,14 +1204,14 @@ export default {
   height: 30px;
 }
 // 日期选择框
-.el-times{
-  :deep(.el-tooltip__trigger){
-    height:30px !important;
+.el-times {
+  :deep(.el-tooltip__trigger) {
+    height: 30px !important;
   }
 }
-:deep(.avue-crud__header){
-  .avue-crud__left{
-    margin-top:0 !important;
+:deep(.avue-crud__header) {
+  .avue-crud__left {
+    margin-top: 0 !important;
   }
 }
 </style>
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 596c8717..3a411615 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -102,10 +102,10 @@
               >修改服务类型</el-button
             >
 
-<!--            <el-button type="danger"-->
-<!--                       icon="el-icon-delete"-->
-<!--                       @click="handleImport">导 入-->
-<!--            </el-button>-->
+            <!--            <el-button type="danger"-->
+            <!--                       icon="el-icon-delete"-->
+            <!--                       @click="handleImport">导 入-->
+            <!--            </el-button>-->
 
             <el-dialog title="零担导入" append-to-body v-model="excelBox" width="555px">
               <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
@@ -1093,7 +1093,9 @@ export default {
     },
     handleTemplate() {
       exportBlob(
-        `/api/logpm-distribution/distributionStockArticle/import-stockArticle?${this.website.tokenHeader}=${getToken()}`
+        `/api/logpm-distribution/distributionStockArticle/import-stockArticle?${
+          this.website.tokenHeader
+        }=${getToken()}`
       ).then(res => {
         downloadXls(res.data, '用户数据模板.xlsx');
       });
@@ -1290,6 +1292,14 @@ export default {
           '订单信息不完整，请完善包件信息！如没有请维护物料信息，在选择！！！'
         );
       }
+
+      if (this.selectionList.length === 1) {
+        console.log('111>>>>>>>>>>>>>>', this.selectionList[0]);
+        return this.$router.push(
+          '/distribution/inventory/distributionStockArticleFrom?id=' + this.selectionList[0].id
+        );
+      }
+
       this.getSock();
     },
     getSock() {
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 9a0d692c..f06774f9 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -584,16 +584,18 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'isZero',
-          label: '零担',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'isZero',
+        //   label: '零担',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [
+
+        //   ],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'warehouse',
           label: '所在仓库',
@@ -1482,9 +1484,9 @@ export default {
       let consigneeMobile = this.selectionList[0].consigneeMobile;
       let _mallName = this.selectionList[0].mallName;
       const flag = this.selectionList.every(i => {
-        if(_mallName !== i.mallName) {
-           this.$message.warning('请选择同一商场');
-          return false
+        if (_mallName !== i.mallName) {
+          this.$message.warning('请选择同一商场');
+          return false;
         }
 
         if (consigneeMobile != i.consigneeMobile && consigneePerson != i.consigneePerson) {
@@ -1759,9 +1761,6 @@ export default {
         type: 'error',
         message: '功能还在开发中',
       });
-      this.title = '新增';
-      this.form = {};
-      this.box = true;
     },
     handleEdit(row) {
       this.title = '编辑';
diff --git a/src/views/distribution/inventory/distributionStockArticleFrom.vue b/src/views/distribution/inventory/distributionStockArticleFrom.vue
index ed230945..366492f5 100644
--- a/src/views/distribution/inventory/distributionStockArticleFrom.vue
+++ b/src/views/distribution/inventory/distributionStockArticleFrom.vue
@@ -6,58 +6,69 @@
         <div class="avue-crud__left">
           <el-button type="primary" icon="el-icon-plus" @click="handleTrade">确定</el-button>
         </div>
-
       </div>
       <el-row>
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+        <el-table
+          ref="table"
+          v-loading="loading"
+          @selection-change="selectionChange"
+          :data="data"
+          :height="height"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <el-table-column
+            type="selection"
+            v-if="option.selection"
+            width="55"
+            align="center"
+          ></el-table-column>
           <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
           <el-table-column v-if="option.index" label="序号" type="index" width="70" align="center">
           </el-table-column>
-          <template v-for="(item,index) in option.column">
+          <template v-for="(item, index) in option.column">
             <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+            >
             </el-table-column>
           </template>
           <el-table-column prop="menu" label="转库存品数量" :width="220" align="center">
-            <template #="{row}">
-<!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
-<!--              <el-input v-model="row.inventoryQuantity"  @blur="handleNumberRange($event,row)" :disabled= !this.ids.includes(row.id) ></el-input>-->
-              <el-input v-model="row.quantity" disabled ></el-input>
+            <template #="{ row }">
+              <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
+              <!--              <el-input v-model="row.inventoryQuantity"  @blur="handleNumberRange($event,row)" :disabled= !this.ids.includes(row.id) ></el-input>-->
+              <el-input v-model="row.quantity" disabled></el-input>
             </template>
           </el-table-column>
           <!-- 操作栏模块 -->
-<!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
-<!--            <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>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+          <!--            <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>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
+        <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
-          <el-pagination align="right"
-                         background
-                         @size-change="sizeChange"
-                         @current-change="currentChange"
-                         :current-page="page.currentPage"
-                         :page-sizes="[30, 50,80, 120]"
-                         :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page.total">
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
           </el-pagination>
         </div>
       </el-row>
@@ -66,13 +77,13 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionParcelList";
-import option from "@/option/distribution/distributionStockArticleFrom";
-import { mapGetters } from "vuex";
+import { getList, getDetail, add, update, remove } from '@/api/distribution/distributionParcelList';
+import option from '@/option/distribution/distributionStockArticleFrom';
+import { mapGetters } from 'vuex';
 import { addStockRow } from '@/api/distribution/distributionStockArticle';
 
 export default {
-  data () {
+  data() {
     return {
       height: 0,
       // 弹框标题
@@ -91,7 +102,7 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -101,76 +112,72 @@ export default {
       option: option,
       // 表单列表
       data: [],
-    }
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
-    handleTrade(){
-      if(this.ids.length > 0){
-        let par ={
-          ids : this.ids,
-          id: this.$route.query.id
-        }
-        let a = addStockRow(par);
-        console.log(">>>>===",a.data);
-        if(a.data.success){
-          this.onLoad(this.page);
-        }
-      }else{
-        this.$message.warning("请选择需要转的包件信息！！！");
+    async handleTrade() {
+      if (this.ids.length > 0) {
+        let a = await addStockRow({ids: this.ids});
+        console.log('>>>>===', a.data);
+        // if (a.data.success) {
+        //   this.onLoad(this.page);
+        // }
+      } else {
+        this.$message.warning('请选择需要转的包件信息！！！');
       }
-
     },
     //数量校验
-    handleNumberRange(e,row) {
-      console.log("执行了2222",e,e.target.value,row);
-      if(e.target.value) {
-        e.target.value = e.target.value.replace(/[^\.\d]/g,'') //替换掉与数字无关的字符（中英文与符号都会被替换掉，只留下数字，此时值类型为字符串）
-        if(e.target.value) { //如果替换后还有值
+    handleNumberRange(e, row) {
+      console.log('执行了2222', e, e.target.value, row);
+      if (e.target.value) {
+        e.target.value = e.target.value.replace(/[^\.\d]/g, ''); //替换掉与数字无关的字符（中英文与符号都会被替换掉，只留下数字，此时值类型为字符串）
+        if (e.target.value) {
+          //如果替换后还有值
           e.target.value = parseInt(e.target.value); //把字符型转成整数型
         }
-        if((e.target.value > row.quantity )) {
-          this.$message.error('数量不能大于订单数')
+        if (e.target.value > row.quantity) {
+          this.$message.error('数量不能大于订单数');
           e.target.value = row.quantity;
-          return
+          return;
         }
       }
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
+    handleSubmit() {
       if (!this.form.id) {
         add(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
       } else {
@@ -178,41 +185,41 @@ export default {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-        })
+        });
       }
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -221,16 +228,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -238,36 +245,36 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
-      console.log("<><><><><==",list);
+      console.log('<><><><><==', list);
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       this.query.stockArticleId = this.$route.query.id;
-      this.query.conditions = "1";
+      this.query.conditions = '1';
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
@@ -275,7 +282,7 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index df6fa3ce..dfe67ee0 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -873,8 +873,6 @@ import { ElMessage } from 'element-plus'
     },
 
     methods: {
-
-
       //查询叉车人员
       async getFork() {
         await getListUser().then(res => {
@@ -932,7 +930,10 @@ import { ElMessage } from 'element-plus'
       },
       //查询班组
       async getTeam() {
-        let params = this.deptId;
+        const info = JSON.parse(localStorage.getItem('TWMS-userInfo'))
+        console.log('info >>>>>>>>', info);
+        // let params = this.deptId;
+        let params = info.content.dept_id;
         console.log('%%%%%%%%%', params);
         getListTeamInfo(params).then(res => {
           console.log('aaaaaaaaa', res.data.data);
@@ -1197,6 +1198,7 @@ import { ElMessage } from 'element-plus'
               return;
             }
           }
+
           entryNum(this.zeroOrderData).then(res => {
             if (res) {
               this.$message({
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index f34772fe..c1b21d1b 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -798,7 +798,10 @@
       },
       //查询班组
       async getTeam() {
-        let params = this.deptId;
+        const info = JSON.parse(localStorage.getItem('TWMS-userInfo'))
+        console.log('info >>>>>>>>', info);
+        // let params = this.deptId;
+        let params = info.content.dept_id;
         console.log('%%%%%%%%%', params);
         getListTeamInfo(params).then(res => {
           console.log('aaaaaaaaa', res.data.data);