From c716e7dfb3ad0b32cd5f4987a83fff71fff2ab64 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Thu, 17 Aug 2023 11:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=85=8D=E9=80=81=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionDeliveryList.js  |   12 +
 .../distribution/distributionStockArticle.js  |   12 +-
 src/router/views/index.js                     |    4 +-
 .../distributionDeliveryListmar.vue           |    2 +-
 .../turndelivery/deliveryDiscuss.vue          | 1464 +++++++++--------
 .../turndelivery/deliveryMarket.vue           |   56 +-
 6 files changed, 838 insertions(+), 712 deletions(-)

diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js
index 2b7d97d5..523de3ff 100644
--- a/src/api/distribution/distributionDeliveryList.js
+++ b/src/api/distribution/distributionDeliveryList.js
@@ -162,6 +162,18 @@ export const updateDeliveryList = (data) => {
     data: data
   })
 }
+/**
+ * 修改配送计划
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export const updateMarketDelivery = (data) => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/updateMarketDelivery',
+    method: 'put',
+    data: data
+  })
+}
 
 /**
  * 查询配送任务订单地图信息
diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index 69e41a8e..6b5799bb 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -184,4 +184,14 @@ export const selectStockArticleAndParcel = (params) => {
   })
 }
 
-
+export const selectStockArticleInfoList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleInfoList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 27359897..cd18881b 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -417,7 +417,7 @@ export default [
     children: [
       {
         path: '/distribution/reservation/atlas',
-        name: '地图展示',
+        name: '市配地图展示',
         id:'id',
         component: () => import('@/views/distribution/reservation/atlas.vue'),
       },
@@ -430,7 +430,7 @@ export default [
     children: [
       {
         path: '/distribution/reservation/atlas1',
-        name: '地图展示',
+        name: '配送地图展示',
         id:'id',
         component: () => import('@/views/distribution/reservation/atlas1.vue'),
       },
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index e6116385..20514e30 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -40,7 +40,7 @@
           <template #default="slotProps">
             <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
             <el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
-<!--            <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>-->
+            <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>
 <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
           </template>
         </tablecmt>
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 0574a3a8..baff682c 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -13,17 +13,17 @@
         <el-col :span="6">
           <el-form-item  label="车辆信息:" prop="vehicleIds">
             <el-select
-              filterable
-              multiple
-              v-model="vehicleIds"
-              placeholder="请选择车辆"
-              @change="changeVehicle"
+                    filterable
+                    multiple
+                    v-model="vehicleIds"
+                    placeholder="请选择车辆"
+                    @change="changeVehicle"
             >
               <el-option
-                v-for="item in vehicleData"
-                :key="item.id"
-                :label="item.vehicleNub"
-                :value="item.id"
+                      v-for="item in vehicleData"
+                      :key="item.id"
+                      :label="item.vehicleNub"
+                      :value="item.id"
               >
               </el-option>
             </el-select>
@@ -33,18 +33,18 @@
           <el-form-item label="配送司机信息:" prop="goodsShelfId">
             <!--                        @change="changeSlaveDriver"-->
             <el-select
-              v-model="deliveryDriver"
-              multiple
-              filterable
-              @change="changeDriver"
+                    v-model="deliveryDriver"
+                    multiple
+                    filterable
+                    @change="changeDriver"
 
-              placeholder="请选择司机"
+                    placeholder="请选择司机"
             >
               <el-option
-                v-for="item in driverData"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+                      v-for="item in driverData"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
               >
               </el-option>
             </el-select>
@@ -74,10 +74,10 @@
           <el-form-item label="外协来源:" prop="goodsShelfId">
             <el-select filterable v-model="waixieForm.tripartiteSource" placeholder="请选择来源">
               <el-option
-                v-for="item in tripartiteSourceData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey"
+                      v-for="item in tripartiteSourceData"
+                      :key="item.dictKey"
+                      :label="item.dictValue"
+                      :value="item.dictKey"
               >
               </el-option>
             </el-select>
@@ -113,10 +113,10 @@
           <el-form-item label="备货人员:" prop="forklift">
             <el-select filterable v-model="stockUpForm.forklift" placeholder="请选择备货人员">
               <el-option
-                v-for="item in this.forkliftData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey"
+                      v-for="item in this.forkliftData"
+                      :key="item.dictKey"
+                      :label="item.dictValue"
+                      :value="item.dictKey"
               >
               </el-option>
               <!--                            {{this.forkliftData}}-->
@@ -127,10 +127,10 @@
           <el-form-item label="装卸班组:" prop="loader">
             <el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
               <el-option
-                v-for="item in loaderData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey"
+                      v-for="item in loaderData"
+                      :key="item.dictKey"
+                      :label="item.dictValue"
+                      :value="item.dictKey"
               >
               </el-option>
             </el-select>
@@ -140,9 +140,9 @@
           <el-form-item label="班组职能:" prop="goodsAreaId">
             <el-checkbox-group v-model="loadAndUnload">
               <el-checkbox
-                v-for="item in loadAndUnloadData"
-                :label="item.dictKey"
-                :value="item.dictKey"
+                      v-for="item in loadAndUnloadData"
+                      :label="item.dictKey"
+                      :value="item.dictKey"
               >
                 <span>{{ item.dictValue }}</span>
               </el-checkbox>
@@ -162,10 +162,10 @@
           <el-form-item label="备货区域:" prop="goodsAreaId">
             <el-select filterable v-model="stockUpForm.goodsAreaId" placeholder="请选择备货区域">
               <el-option
-                v-for="item in goodsAreaData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey"
+                      v-for="item in goodsAreaData"
+                      :key="item.dictKey"
+                      :label="item.dictValue"
+                      :value="item.dictKey"
               >
               </el-option>
             </el-select>
@@ -182,7 +182,7 @@
             <!--              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>-->
             <el-radio-group v-model="stockUpForm.deliveryWay" v-for="item in this.deliveryWayData">
               <el-radio :label="item.dictKey" :value="item.dictKey"
-                >{{ item.dictValue }}&emsp;
+              >{{ item.dictValue }}&emsp;
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -193,7 +193,7 @@
             <!--              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>-->
             <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
               <el-checkbox :label="item.dictKey" :value="item.dictKey"
-                >{{ item.dictValue }}&emsp;
+              >{{ item.dictValue }}&emsp;
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
@@ -234,27 +234,27 @@
       <el-tab-pane label="订单">
         <el-button type="primary" link @click="handleAddOrder">新 增</el-button>
         <el-table
-          ref="table"
-          v-loading="loading"
-          :data="orderData"
-          :height="height"
-          style="width: 100%; height: 50%"
-          :border="option.border"
+                ref="table"
+                v-loading="loading"
+                :data="orderData"
+                :height="height"
+                style="width: 100%; height: 50%"
+                :border="option.border"
         >
           <el-table-column
-            v-if="option.index"
-            label="序号"
-            type="index"
-            width="80px"
-            align="center"
+                  v-if="option.index"
+                  label="序号"
+                  type="index"
+                  width="80px"
+                  align="center"
           ></el-table-column>
           <template v-for="(item, index) in option.columnStockArticles">
             <el-table-column
-              v-if="item.hide !== true"
-              :prop="item.prop"
-              :label="item.label"
-              :width="item.width"
-              :key="index"
+                    v-if="item.hide !== true"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                    :key="index"
             >
             </el-table-column>
           </template>
@@ -262,14 +262,14 @@
           <el-table-column prop="menu" label="操作" :width="220" align="center">
             <template #="{ row }">
               <el-button
-                type="primary"
-                link
-                icon="el-icon-view"
-                @click="viewStockArticlePackage(row)"
-                >查看包件
+                      type="primary"
+                      link
+                      icon="el-icon-view"
+                      @click="viewStockArticlePackage(row)"
+              >查看包件
               </el-button>
               <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)"
-                >移除
+              >移除
               </el-button>
             </template>
           </el-table-column>
@@ -279,7 +279,7 @@
 
     <el-form-item style="margin-left: 45%; margin-top: 10px">
       <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitBusiness"
-        >提交(商配订单)</el-button
+      >提交(商配订单)</el-button
       >
       <el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button>
     </el-form-item>
@@ -295,73 +295,96 @@
         <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
       </el-form-item>
       <el-form-item label="运单号:">
-        <el-input v-model="query.customerTelephone" placeholder="请输入运单号"></el-input>
+        <el-input v-model="query.waybillNumber" placeholder="请输入运单号"></el-input>
       </el-form-item>
       <el-form-item label="订单自编号:">
-        <el-input v-model="query.customerTelephone" placeholder="请输入运单号"></el-input>
+        <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
       </el-form-item>
       <el-form-item label="服务号:">
-        <el-input v-model="query.customerTelephone" placeholder="请输入运单号"></el-input>
+        <el-input v-model="query.serviceNumber" placeholder="请输入服务号"></el-input>
       </el-form-item>
 
       <el-form-item label="顾客姓名:">
-        <el-input v-model="query.customerName" placeholder="请输入服务类型"></el-input>
+        <el-input v-model="query.customerName" placeholder="请输入客户姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="顾客电话:">
+        <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
+      </el-form-item>
+      <el-form-item label="顾客地址:">
+        <el-input v-model="query.customerAddress" placeholder="请输入顾客地址"></el-input>
       </el-form-item>
       <!-- 查询按钮 -->
-      <!--            <el-form-item>-->
-      <!--                <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>-->
-      <!--                <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>-->
-      <!--            </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+        <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+      </el-form-item>
     </el-form>
 
     <!--        @selection-change="selectionChange"-->
 
     <el-table
-      ref="stockArticleTable"
-      v-loading="loading"
-      @selection-change="selectionStockArticleChange"
-      :data="stockArticleInfo"
-      :height="height"
-      style="width: 100%; height: 80%"
-      :border="option.border"
+            ref="stockArticleTable"
+            v-loading="loading"
+            @selection-change="selectionStockArticleChange"
+            :data="stockArticleInfo"
+            :height="height"
+            style="width: 100%; height: 80%"
+            :border="option.border"
     >
       <el-table-column
-        type="selection"
-        v-if="option.selection"
-        width="55"
-        align="center"
+              type="selection"
+              v-if="option.selection"
+              width="55"
+              align="center"
       ></el-table-column>
       <el-table-column
-        v-if="option.index"
-        label="序号"
-        type="index"
-        width="80px"
-        align="center"
+              v-if="option.index"
+              label="序号"
+              type="index"
+              width="80px"
+              align="center"
       ></el-table-column>
       <template v-for="(item, index) in option.columnStockArticles">
         <el-table-column
-          v-if="item.hide !== true"
-          :prop="item.prop"
-          :label="item.label"
-          :width="item.width"
-          :key="index"
+                v-if="item.hide !== true"
+                :prop="item.prop"
+                :label="item.label"
+                :width="item.width"
+                :key="index"
         >
         </el-table-column>
       </template>
     </el-table>
     <el-form-item style="margin-left: 45%; margin-top: 5px">
       <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
-        >提交(订单)</el-button
+      >提交(订单)</el-button
       >
       <el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
     </el-form-item>
+    <el-row>
+      <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="[10, 20, 30, 40, 50, 100]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
+        >
+        </el-pagination>
+      </div>
+    </el-row>
   </el-dialog>
 
   <el-dialog
-    v-model="stockListShow"
-    title="库存品信息"
-    width="100%"
-    :before-close="handleClose"
+          v-model="stockListShow"
+          title="库存品信息"
+          width="100%"
+          :before-close="handleClose"
   >
     <el-form :inline="true" :model="query">
       <el-form-item label="顾客电话:">
@@ -377,35 +400,35 @@
       </el-form-item>
     </el-form>
     <el-table
-      ref="table"
-      v-loading="loading"
-      @selection-change="selectionChange"
-      :data="inventoryInfo"
-      :height="height"
-      style="width: 90%; height: 80%"
-      :border="option.border"
+            ref="table"
+            v-loading="loading"
+            @selection-change="selectionChange"
+            :data="inventoryInfo"
+            :height="height"
+            style="width: 90%; height: 80%"
+            :border="option.border"
     >
       <el-table-column
-        type="selection"
-        v-if="option.selection"
-        width="55"
-        align="center"
+              type="selection"
+              v-if="option.selection"
+              width="55"
+              align="center"
       ></el-table-column>
       <el-table-column
-        v-if="option.index"
-        label="序号"
-        type="index"
-        width="80px"
-        align="center"
+              v-if="option.index"
+              label="序号"
+              type="index"
+              width="80px"
+              align="center"
       ></el-table-column>
       <template v-for="(item, index) in option.columnStockLists">
         <el-table-column
 
-          v-if="item.hide !== true"
-          :prop="item.prop"
-          :label="item.label"
-          :width="item.width"
-          :key="index"
+                v-if="item.hide !== true"
+                :prop="item.prop"
+                :label="item.label"
+                :width="item.width"
+                :key="index"
         >
         </el-table-column>
       </template>
@@ -417,7 +440,7 @@
     </el-table>
     <el-form-item style="margin-left: 45%; margin-top: 5px">
       <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
-        >提交(库存品)</el-button
+      >提交(库存品)</el-button
       >
       <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
     </el-form-item>
@@ -426,19 +449,19 @@
   <el-dialog v-model="isShowPackage" title="包件信息" width="100%">
     <!-- 列表模块 -->
     <el-table
-      ref="packageList"
-      v-loading="loading"
-      @selection-change="selectionChange"
-      :data="packageData"
-      :height="height"
-      style="width: 100%; height: 100%"
-      :border="option.border"
+            ref="packageList"
+            v-loading="loading"
+            @selection-change="selectionChange"
+            :data="packageData"
+            :height="height"
+            style="width: 100%; height: 100%"
+            :border="option.border"
     >
       <el-table-column
-        type="selection"
-        v-if="option.selection"
-        width="55"
-        align="center"
+              type="selection"
+              v-if="option.selection"
+              width="55"
+              align="center"
       >
         <!--        :selectable="checkPackage"-->
 
@@ -450,11 +473,11 @@
       <template v-for="(item, index) in option.columnPackage">
         <!-- table字段 -->
         <el-table-column
-          v-if="item.hide !== true"
-          :prop="item.prop"
-          :label="item.label"
-          :width="item.width"
-          :key="index"
+                v-if="item.hide !== true"
+                :prop="item.prop"
+                :label="item.label"
+                :width="item.width"
+                :key="index"
         >
         </el-table-column>
       </template>
@@ -462,14 +485,14 @@
       <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-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-form-item style="margin-left: 45%; margin-top: 5px">
       <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
-        >提交(包件)</el-button
+      >提交(包件)</el-button
       >
       <el-button icon="el-icon-circle-close" @click="isShowPackage = false">返 回</el-button>
     </el-form-item>
@@ -479,30 +502,30 @@
     <div style="display: flex">
       <div style="flex: 1">
         <el-table
-          ref="multipleTable"
-          v-loading="loading"
-          :data="driverInfo"
-          style="width: 100%"
-          :border="option.border"
-          @select-all="handleSelect"
-          @select="handleSelect"
+                ref="multipleTable"
+                v-loading="loading"
+                :data="driverInfo"
+                style="width: 100%"
+                :border="option.border"
+                @select-all="handleSelect"
+                @select="handleSelect"
         >
           <el-table-column
-            type="selection"
-            v-if="option.selection"
-            width="55"
-            align="center"
+                  type="selection"
+                  v-if="option.selection"
+                  width="55"
+                  align="center"
 
           ></el-table-column>
           <template v-for="(item, index) in option.columnDriverInfo">
             <!-- table字段 -->
             <el-table-column
-              v-if="item.hide !== true"
-              :prop="item.prop"
-              :label="item.label"
-              :width="item.width"
-              :key="index"
-              style="height: 50px"
+                    v-if="item.hide !== true"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                    :key="index"
+                    style="height: 50px"
 
             >
             </el-table-column>
@@ -512,22 +535,22 @@
       </div>
       <div style="flex: 1">
         <el-table
-          ref="table"
-          v-loading="loading"
-          :data="vehticleInfo"
-          style="width: 100%"
-          :border="option.border"
+                ref="table"
+                v-loading="loading"
+                :data="vehticleInfo"
+                style="width: 100%"
+                :border="option.border"
         >
           <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
           <template v-for="(item, index) in option.columnVehicleInfo">
             <!-- table字段 -->
             <el-table-column
-              v-if="item.hide !== true"
-              :prop="item.prop"
-              :label="item.label"
-              :width="item.width"
-              :key="index"
-              style="height: 50px"
+                    v-if="item.hide !== true"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                    :key="index"
+                    style="height: 50px"
             >
             </el-table-column>
           </template>
@@ -536,7 +559,7 @@
             <template #="{ row }">
               <span>
                 <el-button type="primary" text size="small" @click="moveUpVehictle(row)"
-                  >上移
+                >上移
                 </el-button>
               </span>
             </template>
@@ -562,11 +585,10 @@
   import { getListUser } from '@/api/distribution/distributionStockup';
   import { getPostList } from '@/api/system/post';
   import { getListOwn } from '@/api/system/user';
-  import { getPackageList } from '@/api/distribution/distributionParcelList';
   import { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea';
   import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
   import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
-  import { selectStockArticleAndParcel } from '@/api/distribution/distributionStockArticle';
+  import { selectStockArticleInfoList } from '@/api/distribution/distributionStockArticle';
   import { getInventoryList } from '@/api/distribution/distributionStockList';
   import { getDeliveryList ,updateDeliveryList} from '@/api/distribution/distributionDeliveryList';
   import { mapGetters } from 'vuex';
@@ -671,6 +693,11 @@
         loadAndUnload:[],
         //服务类型
         serveType:[],
+        page: {
+          currentPage: 1,
+          pageSize: 10,
+          total: 40
+        },
         //外协数据来源
         tripartiteSourceData:[],
         deliveryListId:'',
@@ -684,29 +711,29 @@
         isUpdate:false,
       };
     },
-   watch:{
-     // obj:{
-     //   deep:true,
-     //   handler(newVal,oldVal){
-     //     if (this.isInitialized){
-     //       console.log('输入框的值'+JSON.stringify(oldVal)+'从变成了'+JSON.stringify(newVal));
-     //       //这里就需要返回一个false;
-     //        this.isUpdate = true;
-     //      }else {
-     //        this.isInitialized=true;
-     //     }
-     //   }
-     // }
-   },
+    watch:{
+      // obj:{
+      //   deep:true,
+      //   handler(newVal,oldVal){
+      //     if (this.isInitialized){
+      //       console.log('输入框的值'+JSON.stringify(oldVal)+'从变成了'+JSON.stringify(newVal));
+      //       //这里就需要返回一个false;
+      //        this.isUpdate = true;
+      //      }else {
+      //        this.isInitialized=true;
+      //     }
+      //   }
+      // }
+    },
     created() {
       this.$watch(
-        () => this.$route.params,
-        () => {
-          this.fetchData();
-        },
-        // 组件创建完后获取数据，
-        // 此时 data 已经被 observed 了
-        { immediate: true }
+              () => this.$route.params,
+              () => {
+                this.fetchData();
+              },
+              // 组件创建完后获取数据，
+              // 此时 data 已经被 observed 了
+              { immediate: true }
       );
       this.getDictionary();
       this.getFork();
@@ -829,8 +856,6 @@
         console.log("selectionStockArticleChange",list);
         this.stockArticleList = list;
       },
-
-
       //查询车辆信息
       getvehicleData() {
         return new Promise((rv,rev)=>{
@@ -847,6 +872,16 @@
         if (this.$route.query.id) {
           this.deliveryListId = this.$route.query.id;
         }
+        this.loading = false;
+
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+        this.onLoad(this.page);
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+        this.onLoad(this.page);
       },
       checkPackage(row,index){
 
@@ -867,11 +902,11 @@
       },
       handleClose(done) {
         this.$confirm('确认关闭？')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {
-          });
+                .then(_ => {
+                  done();
+                })
+                .catch(_ => {
+                });
       },
       /**
        * 查看包件
@@ -886,7 +921,6 @@
           //编辑
           let params={};
           console.log("^^^^^^^^",row);
-          this.query.stockArticleId = row.id;
           //这里订单的对象中应该存在三个数组，一个数组是该订单下的所有包件细信息
           //一个数组是该订单被选择使用的包件信息
           //还有一个就是正在操作的包件信息
@@ -915,21 +949,14 @@
           //新增
           //默认打开包件信息，包件列表处于全选状态
           let params={};
-          console.log("^^^^^^^^",row);
-          this.query.stockArticleId = row.id;
-          getPackageList(Object.assign(params,this.query)).then(res=>{
-            console.log(res.data.data);
-            let data =res.data.data;
-            this.packageData =data.records;
-            this.packageData.forEach((item,index)=>{
-              this.$nextTick( ()=> {
-                this.$refs.packageList.toggleRowSelection(this.packageData[index],true);
-              })
+          this.packageData = row.parcelListVOS
+          this.packageData.forEach((item,index)=>{
+            this.$nextTick( ()=> {
+              this.$refs.packageList.toggleRowSelection(this.packageData[index],true);
             })
-            this.selectionClear();
           })
+          console.log("^^^^^^^^",row);
         }
-
         this.loading = false;
         this.isShowPackage = true;
 
@@ -986,257 +1013,260 @@
         } else {
           this.inventoryData = this.selectionList;
         }
-
-      this.stockListShow = false;
-    },
-    onSubmitOrder() {
-      console.log('>>>>>>>>>>>>', this.stockArticleList);
-      console.log('>>>>>>>>orderData', this.orderData);
-      if (this.orderData){
-        let a = this.orderData;
-        this.stockArticleList.forEach(item=>{
-          a.forEach(order=>{
-            console.log("order----------------->",order);
-            if (item.id === order.id){
-              item.packageListInfo = order.packageList;
-            }
+        this.stockListShow = false;
+      },
+      onSubmitOrder() {
+        console.log('>>>>>>>>>>>>', this.stockArticleList);
+        console.log('>>>>>>>>orderData', this.orderData);
+        const data = this.stockArticleList;
+        let info = [];
+        if (this.orderData){
+          let a = this.orderData;
+          data.forEach(item=>{
+            a.forEach(order=>{
+              if (item.id === order.id){
+                console.log("order----------------->",order);
+                item = order;
+              }
+            })
+            info.push(item);
           })
-        })
-      }
-      // this.orderData.forEach(item => {
-      //   item.reservationNum = 0;
-      //   this.stockArticleList.forEach((list, index) => {
-      //     if (item.id === list.id) {
-      //       list = item;
-      //     }
-      //   });
-      // });
-      this.orderData = this.stockArticleList;
-      console.log('+++++++++++++++', this.orderData);
-      this.orderShow = false;
-    },
-    /**
-     * 订单提交
-     */
-    onSubmitBusiness() {
-      if (this.deliveryListId){
-        let data = {};
-        let tripartite = {};
-        let stockup = {};
-        let allocationInfo = [];
-        //备货区数据构建
-        if (this.stockUpForm.loader) {
-          this.loaderData.forEach(a => {
-            if (this.stockUpForm.loader === a.dictKey) {
-              stockup.loaderName = a.dictValue;
-              stockup.loaderId = a.dictKey;
-            }
-          });
         }
-        console.log("this.stockUpForm.forklift-------->",this.stockUpForm.forklift);
-        this.forkliftData.forEach(b => {
-          if (this.stockUpForm.forklift === b.dictKey) {
-            stockup.forkliftName = b.dictValue;
-            stockup.forkliftId = b.dictKey;
-          }
-        });
-        this.goodsAreaData.forEach(c => {
-          if (this.stockUpForm.goodsAreaId === c.dictKey) {
-            stockup.goodsAreaId = c.dictKey;
-            stockup.goodsAreaName = c.dictValue;
+        this.orderData = info;
+
+        // this.orderData.forEach(item => {
+        //   item.reservationNum = 0;
+        //   this.stockArticleList.forEach((list, index) => {
+        //     if (item.id === list.id) {
+        //       list = item;
+        //     }
+        //   });
+        // });
+        console.log('+++++++++++++++', this.orderData);
+        this.orderShow = false;
+      },
+      /**
+       * 订单提交
+       */
+      onSubmitBusiness() {
+        if (this.deliveryListId){
+          let data = {};
+          let tripartite = {};
+          let stockup = {};
+          let allocationInfo = [];
+          //备货区数据构建
+          if (this.stockUpForm.loader) {
+            this.loaderData.forEach(a => {
+              if (this.stockUpForm.loader === a.dictKey) {
+                stockup.loaderName = a.dictValue;
+                stockup.loaderId = a.dictKey;
+              }
+            });
           }
-        });
-        if (this.stockUpForm.stockupDate) {
-          stockup.stockupDate = this.stockUpForm.stockupDate;
-        }
-        if (this.stockUpForm.remarks) {
-          stockup.remarks = this.stockUpForm.remarks;
-        }
-        if (this.stockUpForm.outboundDate){
-          stockup.outboundDate = this.stockUpForm.outboundDate;
-        }
-        stockup.loadAndUnload = this.loadAndUnload.join(',');
-        data.stockupInfo = stockup;
-        //将服务类型转为数组
-        if (this.serveType){
-          console.log("this.serveType---------->",this.serveType);
-          let serve = Object.values(this.serveType);
-          serve = serve.sort((a, b) => {
-            return a - b;
+          console.log("this.stockUpForm.forklift-------->",this.stockUpForm.forklift);
+          this.forkliftData.forEach(b => {
+            if (this.stockUpForm.forklift === b.dictKey) {
+              stockup.forkliftName = b.dictValue;
+              stockup.forkliftId = b.dictKey;
+            }
           });
-          this.stockUpForm.serveType = serve.join(',');
-          console.log("this.stockUpForm.serveType----------->",this.stockUpForm.serveType);
-        }
-        //判断是否是三方配送
-        if (this.waixieForm.tripartiteSource) {
-          //三方配送数据构建
-          if (this.waixieForm.driverName) {
-            tripartite.driverName = this.waixieForm.driverName;
+          this.goodsAreaData.forEach(c => {
+            if (this.stockUpForm.goodsAreaId === c.dictKey) {
+              stockup.goodsAreaId = c.dictKey;
+              stockup.goodsAreaName = c.dictValue;
+            }
+          });
+          if (this.stockUpForm.stockupDate) {
+            stockup.stockupDate = this.stockUpForm.stockupDate;
           }
-          if (this.waixieForm.driverPhone) {
-            tripartite.driverPhone = this.waixieForm.driverPhone;
+          if (this.stockUpForm.remarks) {
+            stockup.remarks = this.stockUpForm.remarks;
           }
-          if (this.waixieForm.vehicleNum) {
-            tripartite.vehicleNum = this.waixieForm.vehicleNum;
+          if (this.stockUpForm.outboundDate){
+            stockup.outboundDate = this.stockUpForm.outboundDate;
           }
-          if (this.waixieForm.deliveryFee) {
-            tripartite.deliveryFee = this.waixieForm.deliveryFee;
+          stockup.loadAndUnload = this.loadAndUnload.join(',');
+          data.stockupInfo = stockup;
+          //将服务类型转为数组
+          if (this.serveType){
+            console.log("this.serveType---------->",this.serveType);
+            let serve = Object.values(this.serveType);
+            serve = serve.sort((a, b) => {
+              return a - b;
+            });
+            this.stockUpForm.serveType = serve.join(',');
+            console.log("this.stockUpForm.serveType----------->",this.stockUpForm.serveType);
           }
+          //判断是否是三方配送
           if (this.waixieForm.tripartiteSource) {
-            this.tripartiteSourceData.forEach(item => {
-              if (this.waixieForm.tripartiteSource === item.dictKey) {
-                tripartite.distributionCompanyId = item.dictKey;
-                tripartite.distributionCompany = item.dictValue;
+            //三方配送数据构建
+            if (this.waixieForm.driverName) {
+              tripartite.driverName = this.waixieForm.driverName;
+            }
+            if (this.waixieForm.driverPhone) {
+              tripartite.driverPhone = this.waixieForm.driverPhone;
+            }
+            if (this.waixieForm.vehicleNum) {
+              tripartite.vehicleNum = this.waixieForm.vehicleNum;
+            }
+            if (this.waixieForm.deliveryFee) {
+              tripartite.deliveryFee = this.waixieForm.deliveryFee;
+            }
+            if (this.waixieForm.tripartiteSource) {
+              this.tripartiteSourceData.forEach(item => {
+                if (this.waixieForm.tripartiteSource === item.dictKey) {
+                  tripartite.distributionCompanyId = item.dictKey;
+                  tripartite.distributionCompany = item.dictValue;
+                }
+              });
+              data.tripartite = tripartite;
+            }
+          } else {
+            //自主配送数据构建
+            console.log("this.driverList",this.driverList);
+            console.log("this.vehticleList",this.vehticleList);
+            if (this.driverList.length !== this.vehticleList.length) {
+              this.$message({
+                message: '司机车辆数量有误!!!',
+                type: 'warning'
+              });
+              return;
+            } else {
+              let info = [];
+              for (let i = 0; i < this.driverInfo.length; i++) {
+                let obj = {};
+                obj.driverName = this.driverInfo[i].name;
+                obj.driverPhone = this.driverInfo[i].phone;
+                obj.driverId = this.driverInfo[i].id;
+                obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
+                obj.vehicleId = this.vehticleInfo[i].id;
+                info.push(obj);
+                this.driverInfo[i].name;
               }
-            });
-            data.tripartite = tripartite;
+              allocationInfo = info;
+            }
+            console.log(allocationInfo);
+            data.allocationInfo = allocationInfo;
           }
-        } else {
-          //自主配送数据构建
-          console.log("this.driverList",this.driverList);
-          console.log("this.vehticleList",this.vehticleList);
-          if (this.driverList.length !== this.vehticleList.length) {
-            this.$message({
-              message: '司机车辆数量有误!!!',
-              type: 'warning'
+          data.masterDriverName = this.driverForm.masterDriverName;
+          data.masterVehicleNub = this.driverForm.masterVehicleNub;
+          data.stockArticle = this.orderData;
+          let reservation = {};
+          reservation.deliveryType = this.stockUpForm.deliveryType;
+          reservation.deliveryWay = this.stockUpForm.deliveryWay;
+          reservation.serveType = this.stockUpForm.serveType;
+          reservation.otherFee = this.stockUpForm.otherFee;
+          data.taskTime = this.stockUpForm.taskTime;
+          data.reservation = reservation;
+          data.id = this.deliveryListId;
+          console.log('data>>>>>>>>>>>', data);
+          updateDeliveryList(data).then(res=>{
+            this.$router.push({
+              path: '/distribution/deliverylist/distributionDeliveryListdis'
+            });
+          })
+        }else {
+          let data = {};
+          let stockup = {};
+          let tripartite = {};
+          let allocationInfo = [];
+          //备货区数据构建
+          if (this.stockUpForm.loader) {
+            this.loaderData.forEach(a => {
+              if (this.stockUpForm.loader === a.dictKey) {
+                stockup.loaderName = a.dictValue;
+                stockup.loaderId = a.dictKey;
+              }
             });
-            return;
-          } else {
-            let info = [];
-            for (let i = 0; i < this.driverInfo.length; i++) {
-              let obj = {};
-              obj.driverName = this.driverInfo[i].name;
-              obj.driverPhone = this.driverInfo[i].phone;
-              obj.driverId = this.driverInfo[i].id;
-              obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
-              obj.vehicleId = this.vehticleInfo[i].id;
-              info.push(obj);
-              this.driverInfo[i].name;
-            }
-            allocationInfo = info;
           }
-          console.log(allocationInfo);
-          data.allocationInfo = allocationInfo;
-        }
-        data.masterDriverName = this.driverForm.masterDriverName;
-        data.masterVehicleNub = this.driverForm.masterVehicleNub;
-        data.stockArticle = this.orderData;
-        let reservation = {};
-        reservation.deliveryType = this.stockUpForm.deliveryType;
-        reservation.deliveryWay = this.stockUpForm.deliveryWay;
-        reservation.serveType = this.stockUpForm.serveType;
-        reservation.otherFee = this.stockUpForm.otherFee;
-        data.taskTime = this.stockUpForm.taskTime;
-        data.reservation = reservation;
-        data.id = this.deliveryListId;
-        console.log('data>>>>>>>>>>>', data);
-        updateDeliveryList(data).then(res=>{
-          this.$router.push({
-            path: '/distribution/deliverylist/distributionDeliveryListdis'
+          this.forkliftData.forEach(b => {
+            if (this.stockUpForm.forklift === b.dictKey) {
+              stockup.forkliftName = b.dictValue;
+              stockup.forkliftId = b.dictKey;
+            }
           });
-        })
-      }else {
-        let data = {};
-        let stockup = {};
-        let tripartite = {};
-        let allocationInfo = [];
-        //备货区数据构建
-        if (this.stockUpForm.loader) {
-          this.loaderData.forEach(a => {
-            if (this.stockUpForm.loader === a.dictKey) {
-              stockup.loaderName = a.dictValue;
-              stockup.loaderId = a.dictKey;
+          this.goodsAreaData.forEach(c => {
+            if (this.stockUpForm.goodsAreaId === c.dictKey) {
+              stockup.goodsAreaId = c.dictKey;
+              stockup.goodsAreaName = c.dictValue;
             }
           });
-        }
-        this.forkliftData.forEach(b => {
-          if (this.stockUpForm.forklift === b.dictKey) {
-            stockup.forkliftName = b.dictValue;
-            stockup.forkliftId = b.dictKey;
+          if (this.stockUpForm.stockupDate) {
+            stockup.stockupDate = this.stockUpForm.stockupDate;
           }
-        });
-        this.goodsAreaData.forEach(c => {
-          if (this.stockUpForm.goodsAreaId === c.dictKey) {
-            stockup.goodsAreaId = c.dictKey;
-            stockup.goodsAreaName = c.dictValue;
-          }
-        });
-        if (this.stockUpForm.stockupDate) {
-          stockup.stockupDate = this.stockUpForm.stockupDate;
-        }
-        if (this.stockUpForm.remarks) {
-          stockup.remarks = this.stockUpForm.remarks;
-        }
-        if (this.stockUpForm.outboundDate){
-          stockup.outboundDate = this.stockUpForm.outboundDate;
-        }
-        //将服务类型转为数组
-        let serve = Object.values(this.serveType);
-        serve = serve.sort((a, b) => {
-          return a - b;
-        });
-        this.stockUpForm.serveType = serve.join(',');
-        stockup.loadAndUnload = this.loadAndUnload.join(',');
-        //判断是否是三方配送
-        if (this.waixieForm.tripartiteSource) {
-          //三方配送数据构建
-          if (this.waixieForm.driverName) {
-            tripartite.driverName = this.waixieForm.driverName;
+          if (this.stockUpForm.remarks) {
+            stockup.remarks = this.stockUpForm.remarks;
           }
-          console.log("-------------->",this.waixieForm);
-          if (this.waixieForm.driverPhone) {
-            tripartite.driverPhone = this.waixieForm.driverPhone;
-          }
-          if (this.waixieForm.vehicleNum) {
-            tripartite.vehicleNum = this.waixieForm.vehicleNum;
-          }
-          if (this.waixieForm.deliveryFee) {
-            tripartite.deliveryFee = this.waixieForm.deliveryFee;
+          if (this.stockUpForm.outboundDate){
+            stockup.outboundDate = this.stockUpForm.outboundDate;
           }
+          //将服务类型转为数组
+          let serve = Object.values(this.serveType);
+          serve = serve.sort((a, b) => {
+            return a - b;
+          });
+          this.stockUpForm.serveType = serve.join(',');
+          stockup.loadAndUnload = this.loadAndUnload.join(',');
+          //判断是否是三方配送
           if (this.waixieForm.tripartiteSource) {
-            this.tripartiteSourceData.forEach(item => {
-              if (this.waixieForm.tripartiteSource === item.dictValue) {
-                tripartite.distributionCompanyId = item.dictKey;
-                tripartite.distributionCompany = item.dictValue;
-              }
-            });
-            data.tripartite = tripartite;
-          }
-        } else {
-          //自主配送数据构建
-          if (this.driverList.length !== this.vehticleList.length) {
-            this.$message({
-              message: '司机车辆数量有误!!!',
-              type: 'warning'
-            });
-            return;
+            //三方配送数据构建
+            if (this.waixieForm.driverName) {
+              tripartite.driverName = this.waixieForm.driverName;
+            }
+            console.log("-------------->",this.waixieForm);
+            if (this.waixieForm.driverPhone) {
+              tripartite.driverPhone = this.waixieForm.driverPhone;
+            }
+            if (this.waixieForm.vehicleNum) {
+              tripartite.vehicleNum = this.waixieForm.vehicleNum;
+            }
+            if (this.waixieForm.deliveryFee) {
+              tripartite.deliveryFee = this.waixieForm.deliveryFee;
+            }
+            if (this.waixieForm.tripartiteSource) {
+              this.tripartiteSourceData.forEach(item => {
+                if (this.waixieForm.tripartiteSource === item.dictValue) {
+                  tripartite.distributionCompanyId = item.dictKey;
+                  tripartite.distributionCompany = item.dictValue;
+                }
+              });
+              data.tripartite = tripartite;
+            }
           } else {
-            let info = [];
-            for (let i = 0; i < this.driverInfo.length; i++) {
-              let obj = {};
-              obj.driverName = this.driverInfo[i].name;
-              obj.driverPhone = this.driverInfo[i].phone;
-              obj.driverId = this.driverInfo[i].id;
-              obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
-              obj.vehicleId = this.vehticleInfo[i].id;
-              info.push(obj);
-              this.driverInfo[i].name;
+            //自主配送数据构建
+            if (this.driverList.length !== this.vehticleList.length) {
+              this.$message({
+                message: '司机车辆数量有误!!!',
+                type: 'warning'
+              });
+              return;
+            } else {
+              let info = [];
+              for (let i = 0; i < this.driverInfo.length; i++) {
+                let obj = {};
+                obj.driverName = this.driverInfo[i].name;
+                obj.driverPhone = this.driverInfo[i].phone;
+                obj.driverId = this.driverInfo[i].id;
+                obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
+                obj.vehicleId = this.vehticleInfo[i].id;
+                info.push(obj);
+                this.driverInfo[i].name;
+              }
+              allocationInfo = info;
             }
-            allocationInfo = info;
           }
-        }
-        data.stockup = stockup;
-        data.masterDriverName = this.driverForm.masterDriverName;
-        data.masterVehicleNub = this.driverForm.masterVehicleNub;
-        data.allocationInfo = allocationInfo;
-        data.stockArticle = this.orderData;
-        let reservation = {};
-        reservation.deliveryType = this.stockUpForm.deliveryType;
-        reservation.deliveryWay = this.stockUpForm.deliveryWay;
-        reservation.serveType = this.stockUpForm.serveType;
-        reservation.otherFee = this.stockUpForm.otherFee;
-        data.taskTime = this.stockUpForm.taskTime;
-        data.reservation = reservation;
+          data.stockup = stockup;
+          data.masterDriverName = this.driverForm.masterDriverName;
+          data.masterVehicleNub = this.driverForm.masterVehicleNub;
+          data.allocationInfo = allocationInfo;
+          data.stockArticle = this.orderData;
+          let reservation = {};
+          reservation.deliveryType = this.stockUpForm.deliveryType;
+          reservation.deliveryWay = this.stockUpForm.deliveryWay;
+          reservation.serveType = this.stockUpForm.serveType;
+          reservation.otherFee = this.stockUpForm.otherFee;
+          data.taskTime = this.stockUpForm.taskTime;
+          data.reservation = reservation;
           //编辑
           // data.reservationIds = this.ids;
           console.log('data>>>>>>>>>>>', data);
@@ -1246,134 +1276,134 @@
               path: '/distribution/deliverylist/distributionDeliveryListdis'
             });
           });
-      }
-    },
-    changeVehicle(params) {
-      console.log(params);
-      this.vehticleList = params;
-      let b = [];
-      if (params) {
-        this.vehicleData.forEach(item => {
-          this.vehticleList.forEach(p => {
-            if (p == item.id) {
-              b.push(item);
-              console.log(this.driverInfo);
+        }
+      },
+      changeVehicle(params) {
+        console.log(params);
+        this.vehticleList = params;
+        let b = [];
+        if (params) {
+          this.vehicleData.forEach(item => {
+            this.vehticleList.forEach(p => {
+              if (p == item.id) {
+                b.push(item);
+                console.log(this.driverInfo);
+              }
+            });
+            if (params[0] === item.id) {
+              this.driverForm.masterVehicleNub = item.vehicleNub;
             }
           });
-          if (params[0] === item.id) {
-            this.driverForm.masterVehicleNub = item.vehicleNub;
-          }
-        });
-        this.vehticleInfo = b;
-      }
-    },
-    changeDriver(params) {
-      this.driverList = params;
-      let a = [];
-      if (params) {
-        this.driverData.forEach(item => {
-          this.driverList.forEach(p => {
-            if (p == item.id) {
-              a.push(item);
-              console.log(this.driverInfo);
+          this.vehticleInfo = b;
+        }
+      },
+      changeDriver(params) {
+        this.driverList = params;
+        let a = [];
+        if (params) {
+          this.driverData.forEach(item => {
+            this.driverList.forEach(p => {
+              if (p == item.id) {
+                a.push(item);
+                console.log(this.driverInfo);
+              }
+            });
+            if (params[0] === item.id) {
+              this.driverForm.masterDriverName = item.name;
             }
           });
-          if (params[0] === item.id) {
-            this.driverForm.masterDriverName = item.name;
-          }
-        });
-        this.driverInfo = a;
-      }
-    },
-    //上移
-    moveUpVehictle(row) {
-      let i = 0;
-      this.vehticleInfo.forEach((item, index) => {
-        if (item.id === row.id) {
-          i = index;
+          this.driverInfo = a;
         }
-      });
-      //获取当当前选中的下标，如果下标为第一个则不能上移
-      if (i > 0) {
-        let a = this.vehticleInfo[i - 1];
-        this.vehticleInfo.splice(i - 1, 1);
-        this.vehticleInfo.splice(i, 0, a);
-      } else {
-        this.$message({
-          message: '已经是第一条，上移失败',
-          type: 'warning',
+      },
+      //上移
+      moveUpVehictle(row) {
+        let i = 0;
+        this.vehticleInfo.forEach((item, index) => {
+          if (item.id === row.id) {
+            i = index;
+          }
         });
-      }
-      console.log(this.vehticleInfo);
-    },
-    handleSelect(selection, row) {
-      // 阻止全选框原有逻辑
-      this.$refs.multipleTable.clearSelection();
-      if (row) {
-        if (selection.length === 1) {
-          this.multipleSelection = row;
-          this.$refs.multipleTable.toggleRowSelection(row, true);
-        } else if (selection.length > 1) {
-          let a = {};
-          selection.forEach((s, index) => {
-            if (s.id === row.id) {
-              selection.splice(index, 1);
-              a = s;
-            }
+        //获取当当前选中的下标，如果下标为第一个则不能上移
+        if (i > 0) {
+          let a = this.vehticleInfo[i - 1];
+          this.vehticleInfo.splice(i - 1, 1);
+          this.vehticleInfo.splice(i, 0, a);
+        } else {
+          this.$message({
+            message: '已经是第一条，上移失败',
+            type: 'warning',
           });
-          this.multipleSelection = selection;
-          this.$refs.multipleTable.toggleRowSelection(a, true);
         }
-      }
-    },
-    confirmDriver() {
-      if (this.multipleSelection.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      console.log('this.adada', this.multipleSelection);
-      this.isDriverShow = false;
-      //获取到表格的行坐标
-      let a = 0;
-      this.driverInfo.forEach((item, index) => {
-        if (item.id === this.multipleSelection.id) {
-          a = index;
+        console.log(this.vehticleInfo);
+      },
+      handleSelect(selection, row) {
+        // 阻止全选框原有逻辑
+        this.$refs.multipleTable.clearSelection();
+        if (row) {
+          if (selection.length === 1) {
+            this.multipleSelection = row;
+            this.$refs.multipleTable.toggleRowSelection(row, true);
+          } else if (selection.length > 1) {
+            let a = {};
+            selection.forEach((s, index) => {
+              if (s.id === row.id) {
+                selection.splice(index, 1);
+                a = s;
+              }
+            });
+            this.multipleSelection = selection;
+            this.$refs.multipleTable.toggleRowSelection(a, true);
+          }
         }
-      });
-      this.driverForm.masterDriverName = this.driverInfo[a].name;
-      this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub;
-    },
-    // //数据字典数据获取
-    getDictionary() {
-      getDictionaryBiz('addvalue_serve_type').then(res => {
-        this.addvalueServeTypeData = res.data.data;
-      });
-      getDictionaryBiz('load_and_unload').then(res => {
-        this.loadAndUnloadData = res.data.data;
-      });
-      getDictionaryBiz('delivery_way').then(res => {
-        this.deliveryWayData = res.data.data;
-      });
-      //三方外协来源
-      getDictionaryBiz('tripartite_source').then(res => {
-        this.tripartiteSourceData = res.data.data;
-      });
-    },
+      },
+      confirmDriver() {
+        if (this.multipleSelection.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        console.log('this.adada', this.multipleSelection);
+        this.isDriverShow = false;
+        //获取到表格的行坐标
+        let a = 0;
+        this.driverInfo.forEach((item, index) => {
+          if (item.id === this.multipleSelection.id) {
+            a = index;
+          }
+        });
+        this.driverForm.masterDriverName = this.driverInfo[a].name;
+        this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub;
+      },
+      // //数据字典数据获取
+      getDictionary() {
+        getDictionaryBiz('addvalue_serve_type').then(res => {
+          this.addvalueServeTypeData = res.data.data;
+        });
+        getDictionaryBiz('load_and_unload').then(res => {
+          this.loadAndUnloadData = res.data.data;
+        });
+        getDictionaryBiz('delivery_way').then(res => {
+          this.deliveryWayData = res.data.data;
+        });
+        //三方外协来源
+        getDictionaryBiz('tripartite_source').then(res => {
+          this.tripartiteSourceData = res.data.data;
+        });
+      },
       ccc() {
-      if (this.deliveryListId){
-        //清空司机、车辆信息
+        if (this.deliveryListId){
+          //清空司机、车辆信息
 
-        this.waixieForm.tripartiteSource = '';
-        this.waixieForm.driverName = '';
-        this.waixieForm.driverPhone = '';
-        this.waixieForm.vehicleNum = '';
-        this.waixieForm.deliveryFee = '';
+          this.waixieForm.tripartiteSource = '';
+          this.waixieForm.driverName = '';
+          this.waixieForm.driverPhone = '';
+          this.waixieForm.vehicleNum = '';
+          this.waixieForm.deliveryFee = '';
 
-      }else {
-        this.loadAndUnload = [];
-        this.serveType=[];
-        this.waixieForm = {};
-      }
+        }else {
+          this.loadAndUnload = [];
+          this.serveType=[];
+          this.waixieForm = {};
+        }
         this.aaa = true;
         this.bbb = false;
         this.stockUpForm.deliveryType="1";
@@ -1385,16 +1415,16 @@
         this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
       },
       ddd() {
-      if (this.deliveryListId){
-        this.vehicleIds=[];
-        this.deliveryDriver=[];
-        this.driverForm.masterDriverName = '';
-        this.driverForm.masterVehicleNub = '';
-      }else {
-        this.loadAndUnload = [];
-        this.serveType=[];
-        this.waixieForm={};
-      }
+        if (this.deliveryListId){
+          this.vehicleIds=[];
+          this.deliveryDriver=[];
+          this.driverForm.masterDriverName = '';
+          this.driverForm.masterVehicleNub = '';
+        }else {
+          this.loadAndUnload = [];
+          this.serveType=[];
+          this.waixieForm={};
+        }
         this.aaa = false;
         this.bbb = true;
         this.stockUpForm.deliveryType="1";
@@ -1405,38 +1435,73 @@
         this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
       },
-       handleAddOrder() {
-      //TODO 这里还缺少对于订单状态的筛选条件
+      handleAddOrder() {
+        //TODO 这里还缺少对于订单状态的筛选条件
         this.query.typeService=1;
         this.query.genre = "1";
+        const page = this.page;
         let params = {};
-         selectStockArticleAndParcel(Object.assign(params,this.query)).then(res=>{
+        console.log("------------->",this.query);
+        selectStockArticleInfoList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
           console.log(res.data.data);
           const data = res.data.data;
-           data.forEach(item => {
-             if (this.orderData){
-               this.orderData.forEach(a=>{
-                 if (item.id === a.id){
-                  item.packageList = a.packageList;
+          this.page.total = data.total;
+          this.stockArticleInfo = data.records;
+          this.stockArticleInfo.forEach((item,index)=>{
+            if (this.orderData){
+              this.orderData.forEach(a=> {
+                if (item.id === a.id) {
+                  this.$nextTick(() => {
+                    this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
+                  })
                 }
               })
             }
-            // item.reservationNum = item.handQuantity;
-          });
-          this.page.total = data.total;
-          this.stockArticleInfo = data;
+          })
           this.loading = false;
           this.query={};
           // this.selectionClear();
-
-          if (this.deliveryListId) {
-            //编辑
-            console.log("---->", this.stockArticleInfo);
-            this.stockArticleInfo.forEach((item, index) => {
-              console.log("aaa", item, index);
-              this.orderData.forEach(o => {
-                console.log("bbb", o);
-                if (item.id === o.id) {
+          // if (this.deliveryListId) {
+          //   //编辑
+          //   console.log("---->", this.stockArticleInfo);
+          //   this.stockArticleInfo.forEach((item, index) => {
+          //     console.log("aaa", item, index);
+          //     this.orderData.forEach(o => {
+          //       console.log("bbb", o);
+          //       if (item.id === o.id) {
+          //         this.$nextTick(() => {
+          //           this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
+          //         })
+          //       }
+          //     })
+          //   })
+          // }
+        })
+        //新增
+        this.orderShow = true;
+      },
+      searchReset(){
+        this.query={
+          typeService:1,
+          genre:'1'
+        };
+        this.searchChange();
+      },
+      searchChange(){
+        let params = {};
+        this.query.typeService=1;
+        this.query.genre = "1";
+        console.log("query------------->",this.query);
+        const page = this.page;
+        selectStockArticleInfoList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
+          console.log("------------------->",res);
+          const data = res.data.data
+          this.stockArticleInfo = data.records;
+          if (this.orderData){
+            this.stockArticleInfo.forEach((item,index)=>{
+              this.orderData.forEach(order=>{
+                if (item.id === order.id){
+                  console.log("----------->");
                   this.$nextTick(() => {
                     this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
                   })
@@ -1445,10 +1510,23 @@
             })
           }
         })
-
-          //新增
-
-        this.orderShow = true;
+        // selectStockArticleAndParcel(Object.assign(params,this.query)).then(res=>{
+        //   console.log("res------------>",res.data.data);
+        //   const data = res.data.data
+        //   this.stockArticleInfo = data;
+        //   if (this.deliveryListId){
+        //     this.stockArticleInfo.forEach((item,index)=>{
+        //       this.orderData.forEach(order=>{
+        //         if (item.id === order.id){
+        //           console.log("----------->");
+        //           this.$nextTick(() => {
+        //             this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
+        //           })
+        //         }
+        //       })
+        //     })
+        //   }
+        // })
       },
       handleAddInventory() {
         this.form.deliveryType ='1';
@@ -1472,89 +1550,89 @@
         this.selectionList = [];
         this.query={};
       },
-     async onLoad(page, params = {}) {
+      async onLoad(page, params = {}) {
         console.log("》》》》》》》》》》》》》》》",this.deliveryListId);
         if (this.deliveryListId){
-            getDeliveryList(this.deliveryListId).then( async res=>{
-              let data = res.data.data;
-              Object.assign(this.stockUpForm,data.reservationInfo)
-              Object.assign(this.stockUpForm,data.stockupInfo)
-              this.stockUpForm.deliveryType = '1';
-              this.stockUpForm.deliveryWay = data.reservationInfo.deliveryWay;
-              this.serveType = data.reservationInfo.serveType.split(",");
-              if (data.stockupInfo){
-                this.loadAndUnload = data.stockupInfo.teamResponsibility.split(",");
+          getDeliveryList(this.deliveryListId).then( async res=>{
+            let data = res.data.data;
+            Object.assign(this.stockUpForm,data.reservationInfo)
+            Object.assign(this.stockUpForm,data.stockupInfo)
+            this.stockUpForm.deliveryType = '10';
+            this.stockUpForm.deliveryWay = data.reservationInfo.deliveryWay;
+            this.serveType = data.reservationInfo.serveType.split(",");
+            if (data.stockupInfo){
+              this.loadAndUnload = data.stockupInfo.teamResponsibility.split(",");
+            }
+            // data.deliverySelfVO
+            this.stockUpForm.loader = data.stockupInfo.loaderId;
+            this.stockUpForm.forklift = data.stockupInfo.forkliftId;
+            this.stockUpForm.outboundDate = data.stockupInfo.outboundDate;
+            this.stockUpForm.remarks = data.stockupInfo.remarks;
+            this.stockUpForm.taskTime = data.taskTime;
+            data.stockArticleList.forEach(item=>{
+              if (item.packageList){
+                item.packageList = item.packageList;
+                item.packageListInfo = item.packageList;
               }
-              // data.deliverySelfVO
-              this.stockUpForm.loader = data.stockupInfo.loaderId;
-              this.stockUpForm.forklift = data.stockupInfo.forkliftId;
-              this.stockUpForm.outboundDate = data.stockupInfo.outboundDate;
-              this.stockUpForm.remarks = data.stockupInfo.remarks;
-              this.stockUpForm.taskTime = data.taskTime;
-              data.stockArticleList.forEach(item=>{
-                if (item.packageList){
-                  item.packageList = item.packageList;
-                  item.packageListInfo = item.packageList;
-                }
+            })
+            this.orderData = data.stockArticleList;
+            if (data.teamResponsibility){
+              this.loadAndUnload =data.teamResponsibility.split(",");
+            }
+            console.log("data.kind",data.kind);
+            if (data.kind === "1"){
+              //自主配送
+              let self = data.deliverySelfVO;
+              let vehicle =await this.getvehicleData();
+              console.log("___________________-->",vehicle);
+              let driver =await this.getMasterDriverData();
+              let a = [];
+              let b = [];
+              let vehicleInfo = [];
+              vehicle.forEach(item => {
+                self.forEach(s => {
+                  if (item.id === s.vehicleId) {
+                    a.push(s.vehicleId);
+                    vehicleInfo.push(item);
+                  }
+                  if (s.isMaster === 2) {
+                    this.driverForm.masterVehicleNub = s.vehicleNub;
+                  }
+                });
               })
-              this.orderData = data.stockArticleList;
-              if (data.teamResponsibility){
-                this.loadAndUnload =data.teamResponsibility.split(",");
-              }
-              console.log("data.kind",data.kind);
-              if (data.kind === "1"){
-                //自主配送
-                let self = data.deliverySelfVO;
-                let vehicle =await this.getvehicleData();
-                console.log("___________________-->",vehicle);
-                let driver =await this.getMasterDriverData();
-                let a = [];
-                let b = [];
-                let vehicleInfo = [];
-                vehicle.forEach(item => {
-                  self.forEach(s => {
-                    if (item.id === s.vehicleId) {
-                      a.push(s.vehicleId);
-                      vehicleInfo.push(item);
-                    }
-                    if (s.isMaster === 2) {
-                      this.driverForm.masterVehicleNub = s.vehicleNub;
-                    }
-                  });
-                })
-                this.vehticleList = a;
-                this.vehicleIds = a;
-                console.log(" this.vehicleIds", this.vehicleIds);
-                this.vehticleInfo = vehicleInfo;
-                let driverInfo = [];
-                driver.forEach(item => {
-                  self.forEach(s => {
-                    if (item.id === s.driverId) {
-                      b.push(s.driverId);
-                      driverInfo.push(item);
-                    }
-                    if (s.isMaster === 2) {
-                      this.driverForm.masterDriverName = s.driverName;
-                    }
-                  });
+              this.vehticleList = a;
+              this.vehicleIds = a;
+              console.log(" this.vehicleIds", this.vehicleIds);
+              this.vehticleInfo = vehicleInfo;
+              let driverInfo = [];
+              driver.forEach(item => {
+                self.forEach(s => {
+                  if (item.id === s.driverId) {
+                    b.push(s.driverId);
+                    driverInfo.push(item);
+                  }
+                  if (s.isMaster === 2) {
+                    this.driverForm.masterDriverName = s.driverName;
+                  }
                 });
-                this.deliveryDriver = b;
-                this.driverList = b;
-                this.driverInfo = driverInfo;
-              }else {
-                let deliveryTripartiteVO = data.deliveryTripartiteVO;
-                this.aaa = false;
-                this.bbb = true;
-                // this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId;
-                this.waixieForm.tripartiteSource = "1";
-                this.waixieForm.driverName = deliveryTripartiteVO.driverName ;
-                this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum ;
-                this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone ;
-                this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee ;
-                //外协配送
-              }
-              console.log("-------------->",res.data.data);
-            })
+              });
+              this.deliveryDriver = b;
+              this.driverList = b;
+              this.driverInfo = driverInfo;
+            }else {
+              let deliveryTripartiteVO = data.deliveryTripartiteVO;
+              this.aaa = false;
+              this.bbb = true;
+              // this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId;
+              this.waixieForm.tripartiteSource = "1";
+              this.waixieForm.driverName = deliveryTripartiteVO.driverName ;
+              this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum ;
+              this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone ;
+              this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee ;
+              //外协配送
+            }
+            console.log("-------------->",res.data.data);
+          })
           this.isDisable=true;
         }else {
           this.stockUpForm.deliveryType="1";
@@ -1566,40 +1644,40 @@
           this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
         }
         this.loading = false;
+      },
     },
-  },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.head_top {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  background-color: #ffffff;
-  // border-bottom: 1px solid rgb(228, 228, 228);
-  padding-left: 10px;
-  
-  >.buts{
-    padding: 10px 20px;
-    cursor: pointer;
-    margin-right: 10px;
-    font-size: 18px;
-    border-bottom: 4px solid #ffffff;
-    // background-color: #ffffff;
-  }
-  .check{
-    color: #D3832A;
-    border-bottom: 4px solid #D3832A;
+  .head_top {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    background-color: #ffffff;
+    // border-bottom: 1px solid rgb(228, 228, 228);
+    padding-left: 10px;
+
+    >.buts{
+      padding: 10px 20px;
+      cursor: pointer;
+      margin-right: 10px;
+      font-size: 18px;
+      border-bottom: 4px solid #ffffff;
+      // background-color: #ffffff;
+    }
+    .check{
+      color: #D3832A;
+      border-bottom: 4px solid #D3832A;
+    }
   }
-}
-.minaxbox{
-  display: flex;
-  flex-direction: column;
-  .tophed{
+  .minaxbox{
     display: flex;
-    flex-wrap: wrap;
+    flex-direction: column;
+    .tophed{
+      display: flex;
+      flex-wrap: wrap;
 
+    }
   }
-}
 </style>
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index 99ece945..aaf6d641 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -195,14 +195,14 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="配车时间:" prop="taskTime" label-width="100px">
+                    <el-form-item label="配送时间:" prop="taskTime" label-width="100px">
                         <!--            <el-date-picker v-model="form.taskTime"-->
                         <!--                            type="datetime"-->
                         <!--                            placeholder="请选择配车时间"-->
                         <!--                            value-format="YYYY-MM-DD HH:mm:ss"-->
                         <!--            >-->
                         <!--            </el-date-picker>-->
-                        <el-date-picker v-model="form.taskTime" type="datetime" placeholder="请选择配车时间">
+                        <el-date-picker v-model="stockUpForm.taskTime" type="datetime" placeholder="请选择配车时间">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -344,7 +344,7 @@
   import option from '@/option/distribution/distributionReservation';
   import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup';
   import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation';
-  import { getMarketDeliveryList } from '@/api/distribution/distributionDeliveryList';
+  import { getMarketDeliveryList,updateMarketDelivery } from '@/api/distribution/distributionDeliveryList';
   import { getListUser } from '@/api/distribution/distributionStockup';
   import { getPostList } from '@/api/system/post';
   import { getListOwn } from '@/api/system/user';
@@ -497,6 +497,7 @@
       this.getTeam();
       this.getvehicleData();
       this.getMasterDriverData();
+      this.onLoad(this.page);
     },
     computed: {
       ...mapGetters(['permission']),
@@ -508,9 +509,8 @@
         return ids.join(',');
       }
     },
-
     mounted() {
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     methods: {
       //查询叉车人员
@@ -633,6 +633,8 @@
         if (this.$route.query.deliveryId) {
           this.deliveryListId = this.$route.query.deliveryId;
         }
+        this.loading = false;
+
 
       },
       removeStockArticle(row){
@@ -643,7 +645,13 @@
           });
           return;
         }
-
+        let data = this.data;
+        data.forEach((item,index)=>{
+          if (item.id === row.id){
+            data.splice(index, 1);
+          }
+        })
+        this.data = data;
         console.log("row------------->",row);
       },
       viewDriverInfo() {
@@ -685,6 +693,7 @@
             for (let i = 0; i < this.driverInfo.length; i++) {
               let obj = {};
               obj.driver = this.driverInfo[i].name;
+              obj.driverName = this.driverInfo[i].name;
               obj.driverId = this.driverInfo[i].id;
               obj.driverPhone = this.driverInfo[i].phone;
               obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
@@ -767,8 +776,8 @@
             }
             data.stockup = stockup;
           }
-          if (this.form.taskTime) {
-            data.taskTime = this.form.taskTime;
+          if (this.stockUpForm.taskTime) {
+            data.taskTime = this.stockUpForm.taskTime.toString();
           }
         }
         console.log('this.data------------>', this.data);
@@ -782,10 +791,19 @@
             });
           });
         } else {
-          data.reservationInfos =this.data ;
-          console.log('>>>>>>>>>>>>', data);
-
-          console.log('-------------》', '修改提交');
+          data.reservationInfos =this.data;
+          data.id = this.deliveryListId;
+          data.stockupInfo = stockup;
+          updateMarketDelivery(data).then(res=>{
+            if (res.data.data.code === 200){
+              this.$message({
+                message: res.data.data.msg,
+                type: 'warning'
+              });
+              this.$router.go(-1)
+              return;
+            }
+          })
         }
       },
       changeVehicle(params) {
@@ -952,8 +970,8 @@
         this.stockUpForm.deliveryType = '2';
         this.stockUpForm.deliveryWay = '2';
         this.stockUpForm.stockupDate = new Date();
-        this.form.taskTime = new Date();
         this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.stockUpForm.otherFee = 0;
         this.loadAndUnload = ['1', '2'];
         if (this.reservationIds) {
@@ -984,7 +1002,7 @@
             this.stockUpForm.loader = deliveryData.stockupInfo.loaderId;
             this.stockUpForm.taskTime = deliveryData.taskTime;
             console.log('reservationInfo--------------->', res.data.data.reservationInfo);
-            this.data = res.data.data.reservationInfos;
+            this.data = deliveryData.reservationInfos;
             if (deliveryData.kind === '1') {
               //自主配送
               let self = deliveryData.deliverySelfVO;
@@ -1025,7 +1043,15 @@
               this.driverList = b;
               this.driverInfo = driverInfo;
             } else {
-
+              let deliveryTripartiteVO = deliveryData.deliveryTripartiteVO;
+              this.aaa = false;
+              this.bbb = true;
+              // this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId;
+              this.waixieForm.tripartiteSource = "1";
+              this.waixieForm.driverName = deliveryTripartiteVO.driverName ;
+              this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum ;
+              this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone ;
+              this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee ;
             }
           });
         }