diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js
index 1790e385..9e99837f 100644
--- a/src/api/distribution/distributionDeliveryList.js
+++ b/src/api/distribution/distributionDeliveryList.js
@@ -8,9 +8,9 @@ export const getList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getPage = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/deliveryList/page',
@@ -19,9 +19,9 @@ export const getPage = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getstatistics = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/deliveryList/statistics',
@@ -30,26 +30,26 @@ export const getstatistics = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-distribution/deliveryList/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
-export const getOneclick = (data) => {
+      id,
+    },
+  });
+};
+export const getOneclick = data => {
   return request({
     url: '/api/logpm-distribution/deliveryList/oneloading',
     method: 'post',
-    data: data
-  })
-}
+    data: data,
+  });
+};
 
 export const getWrapdetail = (current, size, params) => {
   return request({
@@ -59,9 +59,9 @@ export const getWrapdetail = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getpackdetail = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/deliveryList/packdetail',
@@ -70,9 +70,9 @@ export const getpackdetail = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getinventorydetail = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/deliveryList/inventory',
@@ -81,9 +81,9 @@ export const getinventorydetail = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getorddetail = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/deliveryList/order',
@@ -92,116 +92,127 @@ export const getorddetail = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-distribution/deliveryList/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-distribution/deliveryList/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-distribution/deliveryList/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
 /**
  * 查询配送任务信息
  * @param id
  * @returns {AxiosPromise}
  */
-export const getDeliveryList = (id) => {
+export const getDeliveryList = id => {
   return request({
     url: '/api/logpm-distribution/deliveryList/getDeliveryList',
     method: 'get',
     params: {
       id,
-    }
-  })
-}/**
+    },
+  });
+};
+/**
  * 查询市配任务
  * @param id
  * @returns {AxiosPromise}
  */
-export const getMarketDeliveryList = (id) => {
+export const getMarketDeliveryList = id => {
   return request({
     url: '/api/logpm-distribution/deliveryList/getMarketDeliveryList',
     method: 'get',
     params: {
       id,
-    }
-  })
-}
+    },
+  });
+};
 
 /**
  * 修改配送计划
  * @param data
  * @returns {AxiosPromise}
  */
-export const updateDeliveryList = (data) => {
+export const updateDeliveryList = data => {
   return request({
     url: '/api/logpm-distribution/deliveryList/updateDeliveryList',
     method: 'put',
-    data: data
-  })
-}
+    data: data,
+  });
+};
 /**
  * 修改配送计划
  * @param data
  * @returns {AxiosPromise}
  */
-export const updateMarketDelivery = (data) => {
+export const updateMarketDelivery = data => {
   return request({
     url: '/api/logpm-distribution/deliveryList/updateMarketDelivery',
     method: 'put',
-    data: data
-  })
-}
+    data: data,
+  });
+};
 
 /**
  * 查询配送任务订单地图信息
  * @param data
  * @returns {AxiosPromise}
  */
-export const selectStockArticleAtlasInfo = (id) => {
+export const selectStockArticleAtlasInfo = id => {
   return request({
     url: '/api/logpm-distribution/deliveryList/selectStockArticleAtlasInfo',
     method: 'get',
     params: {
       id,
-    }
-  })
-}
+    },
+  });
+};
 
 /**
  * 取消配送任务
  * @param data
  * @returns {AxiosPromise}
  */
-export const cancelDeliveryListTask = (data) => {
+export const cancelDeliveryListTask = data => {
   return request({
     url: '/api/logpm-distribution/deliveryList/cancelMarketDeliveryListTask',
     method: 'post',
-    data: data
-  })
-}
-
-
+    data: data,
+  });
+};
 
+/**
+ * 批量打印
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export const printBatch = data => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/printBatch',
+    method: 'post',
+    params: data,
+  });
+};
diff --git a/src/utils/print.js b/src/utils/print.js
new file mode 100644
index 00000000..4cd46eea
--- /dev/null
+++ b/src/utils/print.js
@@ -0,0 +1,33 @@
+import { getLodop } from '@/utils/LodopFuncs';
+/**
+ * 根据传入的元素列表进行打印
+ * @param nodeList 元素节点列表
+ */
+const point = nodeList => {
+  // 直接调用时使用默认节点列表
+  if (!nodeList) nodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
+  
+  // 初始化打印实例
+  let LODOP = getLodop();
+  
+  // 当列表内没有元素时, 退出函数
+  if (nodeList.length === 0) return;
+
+  // 循环列表内元素并打印
+  nodeList.forEach(orderNode => {
+    let templateData = orderNode.innerHTML;
+    LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
+    LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+    LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
+    // // 设置打印整宽且不变形
+    LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
+    // // 设置打印后自动关闭
+    LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
+    // // data就是一段html文本
+    LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
+    // LODOP.PREVIEW(); //预览(预览打印无脚标)
+    LODOP.PRINT(); //直接打印
+  });
+};
+
+export default point;
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index 7f9b5007..2478723a 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -91,7 +91,7 @@
                 <div class="avue-crud__header">
                     <!-- 头部左侧按钮模块 -->
                     <div class="avue-crud__left" style="margin-top: 20px">
-                                   <el-button type="primary" icon="el-icon-plus" @click="printBatch">批量打印</el-button>
+                                   <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>
                     <!-- 头部右侧按钮模块 -->
@@ -205,6 +205,26 @@
             :drawerShow="drawerShow"
             :columnList="columnList"
     ></edittablehead>
+
+      <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
+    <div>
+      <div v-html="html"></div>
+
+      <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+      <el-button type="primary" @click="printTemplate">打 印</el-button>
+      <el-button type="primary" @click="isShow = false">确 定</el-button>
+      <el-button @click="isShow = false">取 消</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
@@ -215,7 +235,8 @@
     update,
     remove,
     getPage,
-    getstatistics
+    getstatistics,
+    printBatch
   } from '@/api/distribution/distributionDeliveryList';
   import option from '@/option/distribution/distributionDeliveryList';
   import { mapGetters } from 'vuex';
@@ -223,6 +244,7 @@
   import { addIncrement } from '@/api/distribution/distributionStockArticle';
   import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
   import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
+  import print from '@/utils/print';
 
   export default {
     data() {
@@ -239,6 +261,10 @@
         loading: true,
         // 是否为查看模式
         view: false,
+              // 打印模版
+      html: '',
+      // 是否显示打印模版
+      isShow: false,
         // 查询信息
         query: {},
         //数据统计
@@ -675,16 +701,14 @@
     /**
      * 批量打印
      */
-     printBatch(){
+     printBatchOrder(){
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
       }
-
-      this.$message({
-            type: 'success',
-            message: '功能开发中!'
-          });
+      const ids = Array.from(this.selectionList).join(',')
+      printBatch({ids, type: 1})
+        this.isShow = true;
 
     },
       aaa() {
@@ -725,6 +749,9 @@
         this.onLoad(this.page);
       },
       selectionsc(value) {
+        console.log('value :>> ', value);
+        // 筛选出所有被选中项的id
+        this.selectionList = value.map(item => item.id)
       },
       editmap(scope) {
         const { row } = scope;
@@ -1011,6 +1038,13 @@
         // getDetail(row.id).then(res => {
         //   this.form = res.data.data;
         // });
+      },
+
+      /**
+       * 打印
+       */
+      printTemplate(){
+        print()
       }
     }
   };
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index e2bba40a..e26b8077 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -1,85 +1,82 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-        <el-row   v-if="!search" style="padding: 6px 18px">
-            <!-- 查询模块 -->
-            <el-form :inline="true" :model="query">
-                <el-form-item label="配送车次:">
-                    <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
-                </el-form-item>
-                <el-form-item label="配送日期:">
-                    <el-date-picker
-                            v-model="query.taskTime"
-                            type="date"
-                            placeholder="选择日期">
-                    </el-date-picker>
-                </el-form-item>
-<!--                <el-form-item label="配送类型:">-->
-<!--                    <el-select v-model="query.businessType" placeholder="请选择业务类型">-->
-<!--                        <el-option-->
-<!--                                :key="'1'"-->
-<!--                                :value="'商配'">商配-->
-<!--                        </el-option>-->
-<!--                        <el-option-->
-<!--                                :key="'2'"-->
-<!--                                :value="'市配'">市配-->
-<!--                        </el-option>-->
-<!--                    </el-select>-->
-<!--                </el-form-item>-->
-                <el-form-item label="配送种类:">
-                    <el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
-                        <el-option
-                                :key="'1'"
-                                :value="'自主配送'">自主配送
-                        </el-option>
-                        <el-option
-                                :key="'2'"
-                                :value="'外协配送'">外协配送
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="配送司机:">
-                    <el-select
-                            v-model="query.driverName"
-                            filterable
-                            placeholder="请输入司机名称"
-                            :loading="loading">
-                        <el-option
-                                v-for="item in driverData"
-                                :key="item.dictKey"
-                                :label="item.dictValue"
-                                :value="item.dictValue">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="配送车辆:">
-                    <el-select
-                            v-model="query.vehicleName"
-                            filterable
-                            placeholder="请输入司机名称"
-                            :loading="loading">
-                        <el-option
-                                v-for="item in vehicleData"
-                                :key="item.dictKey"
-                                :label="item.dictValue"
-                                :value="item.dictValue">
-                        </el-option>
-                    </el-select>
-                </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>
-        </el-row>
+      <el-row v-if="!search" style="padding: 6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="配送车次:">
+            <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
+          </el-form-item>
+          <el-form-item label="配送日期:">
+            <el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <!--                <el-form-item label="配送类型:">-->
+          <!--                    <el-select v-model="query.businessType" placeholder="请选择业务类型">-->
+          <!--                        <el-option-->
+          <!--                                :key="'1'"-->
+          <!--                                :value="'商配'">商配-->
+          <!--                        </el-option>-->
+          <!--                        <el-option-->
+          <!--                                :key="'2'"-->
+          <!--                                :value="'市配'">市配-->
+          <!--                        </el-option>-->
+          <!--                    </el-select>-->
+          <!--                </el-form-item>-->
+          <el-form-item label="配送种类:">
+            <el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
+              <el-option :key="'1'" :value="'自主配送'">自主配送 </el-option>
+              <el-option :key="'2'" :value="'外协配送'">外协配送 </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="配送司机:">
+            <el-select
+              v-model="query.driverName"
+              filterable
+              placeholder="请输入司机名称"
+              :loading="loading"
+            >
+              <el-option
+                v-for="item in driverData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="配送车辆:">
+            <el-select
+              v-model="query.vehicleName"
+              filterable
+              placeholder="请输入司机名称"
+              :loading="loading"
+            >
+              <el-option
+                v-for="item in vehicleData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </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>
+      </el-row>
       <el-row :gutter="24" class="rows">
-<!--        <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
-<!--          <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
-<!--        </el-col>-->
+        <!--        <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
+        <!--          <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
+        <!--        </el-col>-->
         <el-col :xl="10" :lg="7" :md="8" :sm="24">
-<!--          /总库存品数：{{statistics.cinventoryTotal}}-->
-          <span>商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}} </span>
+          <!--          /总库存品数：{{statistics.cinventoryTotal}}-->
+          <span
+            >商配总车次：{{ statistics.commercialNub }}/总包件数：{{ statistics.commercialTotal }}
+          </span>
         </el-col>
       </el-row>
       <el-row style="margin-top: 30px">
@@ -88,11 +85,10 @@
           <div class="avue-crud__left" style="margin-top: 20px">
             <!--            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-<!--                        <el-button type="primary" icon="el-icon-delete" @click="handleDelete" plain>新 增</el-button>-->
+            <!--                        <el-button type="primary" icon="el-icon-delete" @click="handleDelete" plain>新 增</el-button>-->
             <el-button type="primary" @click="toDeliveryPlan">新增商配</el-button>
 
-
-            <el-button type="primary" @click="printBatch">批量打印</el-button>
+            <el-button type="primary" @click="printBatchOrder">批量打印</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -117,8 +113,16 @@
           <template #default="slotProps">
             <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
             <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
-            <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' || slotProps.scope.row.deliveryStatus !== '3'" @click="handleEdit(slotProps.scope)">编 辑</el-text>
-<!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
+            <el-text
+              size="small"
+              v-if="
+                slotProps.scope.row.deliveryStatusName !== '已完成' ||
+                slotProps.scope.row.deliveryStatus !== '3'
+              "
+              @click="handleEdit(slotProps.scope)"
+              >编 辑</el-text
+            >
+            <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
           </template>
         </tablecmt>
         <!--        <el-table ref="table" v-loading="loading"-->
@@ -151,17 +155,19 @@
         <!--        </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>
@@ -172,60 +178,84 @@
       title="增值服务"
       width="30%"
       :model="addvalue"
-      :before-close="handleClose">
+      :before-close="handleClose"
+    >
       <el-form-item label="增值服务" prop="freightMark">
         <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
-          <el-checkbox style="width: 100%;margin-bottom: 3%;"
-                       v-for="(item,index) in addvalueServeTypeData"
-                       :key="item.dictKey"
-                       :label="item.dictKey"
-          >{{item.dictValue}}
-            <span v-if="index===0||index===6||index===2||index===4">&nbsp;件数:
-                         <el-input type="number" v-model="item.f"
-                                   :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                   @change="textbox($event,index,1)"
-                                   style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="index===1">公里:
-                          <el-input type="primary" v-model="item.a"
-                                    :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                    @change="textbox($event,index,2)"
-                                    style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="index===3">距离:
-                      <el-input type="number" v-model="item.b"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,3)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="index===5">人数:
-                      <el-input type="number" v-model="item.c"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,4)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="index===0">楼层:
-                      <el-input type="number" v-model="item.d"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,5)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="item">预计费用:
-                        <el-input type="number" v-model="item.e"
-                                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                  @change="textbox($event,index,6)"
-                                  style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
+          <el-checkbox
+            style="width: 100%; margin-bottom: 3%"
+            v-for="(item, index) in addvalueServeTypeData"
+            :key="item.dictKey"
+            :label="item.dictKey"
+            >{{ item.dictValue }}
+            <span v-if="index === 0 || index === 6 || index === 2 || index === 4"
+              >&nbsp;件数:
+              <el-input
+                type="number"
+                v-model="item.f"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 1)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 1"
+              >公里:
+              <el-input
+                type="primary"
+                v-model="item.a"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 2)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 3"
+              >距离:
+              <el-input
+                type="number"
+                v-model="item.b"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 3)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 5"
+              >人数:
+              <el-input
+                type="number"
+                v-model="item.c"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 4)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 0"
+              >楼层:
+              <el-input
+                type="number"
+                v-model="item.d"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 5)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="item"
+              >预计费用:
+              <el-input
+                type="number"
+                v-model="item.e"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 6)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
           </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="aaa">
-          确定(增值服务)
-        </el-button>
-      </span>
+        <span class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="aaa"> 确定(增值服务) </el-button>
+        </span>
       </template>
     </el-dialog>
   </basic-container>
@@ -235,21 +265,50 @@
     :drawerShow="drawerShow"
     :columnList="columnList"
   ></edittablehead>
+
+  <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
+    <div>
+      <div v-html="html"></div>
+
+      <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+      <el-button type="primary" @click="printTemplate">打 印</el-button>
+      <el-button type="primary" @click="isShow = false">确 定</el-button>
+      <el-button @click="isShow = false">取 消</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getPage,getstatistics } from "@/api/distribution/distributionDeliveryList";
-import option from "@/option/distribution/distributionDeliveryList";
-import { mapGetters } from "vuex";
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getPage,
+  getstatistics,
+  printBatch,
+} from '@/api/distribution/distributionDeliveryList';
+import option from '@/option/distribution/distributionDeliveryList';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { addIncrement } from '@/api/distribution/distributionStockArticle';
 import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
 import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
+import print from '@/utils/print';
 
 export default {
-  data () {
+  data() {
     return {
-
       height: 0,
       // 弹框标题
       title: '',
@@ -261,37 +320,41 @@ export default {
       loading: true,
       // 是否为查看模式
       view: false,
+      // 打印模版
+      html: '',
+      // 是否显示打印模版
+      isShow: false,
       // 查询信息
       query: {},
       //数据统计
-      statistics:{},
+      statistics: {},
       drawerShow: false,
       // 分页信息
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       //配送类型
-      deliverytypeData:[],
+      deliverytypeData: [],
       //配送种类
-      deliverykindData:[],
+      deliverykindData: [],
       //配送状态
-      deliveryliststateData:[],
+      deliveryliststateData: [],
       // 表单数据
       form: {},
       // 选择行
       selectionList: [],
       columnList: [
-        // {
-        //   prop: '',
-        //   label: '序号',
-        //   type: 0,
-        //   values: '',
-        //   width: 55,
-        //   checkarr: [],
-        //   fixed: true,
-        // },
+        {
+          prop: 'serialNumber',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
         {
           prop: 'trainNumber',
           label: '车次',
@@ -311,7 +374,7 @@ export default {
           width: '150',
           checkarr: [],
           fixed: true,
-          sortable: true
+          sortable: true,
           // head: true,
         },
         {
@@ -341,9 +404,7 @@ export default {
           type: 3,
           values: '',
           width: '180',
-          checkarr: [
-           
-          ],
+          checkarr: [],
           fixed: false,
           sortable: true,
         },
@@ -404,9 +465,7 @@ export default {
           type: 3,
           values: '',
           width: '150',
-          checkarr: [
-           
-          ],
+          checkarr: [],
           fixed: false,
           sortable: true,
         },
@@ -507,9 +566,9 @@ export default {
           values: '',
           width: '150',
           checkarr: [],
-          fixed:'right',
+          fixed: 'right',
           sortable: false,
-        }
+        },
         // 更多列的配置...
       ],
       // 表单配置
@@ -534,10 +593,10 @@ export default {
       // 表单列表
       data: [],
       driverData: [],
-      vehicleData: []
-    }
+      vehicleData: [],
+    };
   },
-  watch:{
+  watch: {
     // '$route.query.reservationId': {
     handler(newVal, oldVal) {
       console.log(newVal, oldVal);
@@ -545,11 +604,10 @@ export default {
       this.onLoad(this.page);
     },
     deep: false,
-    immediate: true
+    immediate: true,
     // }
-
   },
-  mounted () {
+  mounted() {
     this.getvehicleData();
     this.getDriverData();
     this.queryDictionary();
@@ -558,9 +616,9 @@ export default {
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
-    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
-    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
     if (checkListnewarr) {
       this.columnList.map(item => {
         item.head = false;
@@ -572,14 +630,14 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.head){
-          arr.push(item.label)
+        if (item.head) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
     }
     if (flexListnewarr) {
       this.columnList.map(item => {
@@ -588,22 +646,22 @@ export default {
       flexListnewarr.map(ite => {
         this.columnList.map(item => {
           if (ite == item.label) {
-            if(item.type==6){
+            if (item.type == 6) {
               item.fixed = 'right';
-            }else{
+            } else {
               item.fixed = true;
             }
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.fixed){
-          arr.push(item.label)
+        if (item.fixed) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
     }
     if (sortlistnewarr) {
       this.columnList.map(item => {
@@ -616,25 +674,25 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.sortable){
-          arr.push(item.label)
+        if (item.sortable) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
     }
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
     getvehicleData() {
@@ -645,7 +703,7 @@ export default {
           data.records.forEach(item => {
             let a = {
               dictKey: item.id,
-              dictValue: item.vehicleNub
+              dictValue: item.vehicleNub,
             };
             po.push(a);
           });
@@ -663,7 +721,7 @@ export default {
           data.records.forEach(item => {
             let a = {
               dictKey: item.id,
-              dictValue: item.name
+              dictValue: item.name,
             };
             po.push(a);
           });
@@ -673,26 +731,25 @@ export default {
         });
       });
     },
-    showdrawer(value){
-      this.drawerShow=value
+    showdrawer(value) {
+      this.drawerShow = value;
     },
     /**
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList
      */
-    setnewcolum(newarr, headarr,type) {
+    setnewcolum(newarr, headarr, type) {
       // console.log(newarr,'+++++++++++')
-      if(type==1){
+      if (type == 1) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
-      }else if(type==2){
+        this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+      } else if (type == 2) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
-      }else if(type==3){
+        this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
       }
-
     },
     handleCheckedCitiesChange(value) {
       if (value) {
@@ -710,17 +767,16 @@ export default {
           this.costListName = value;
         }
       });
-
     },
-    editmap(scope){
+    editmap(scope) {
       const { row } = scope;
-      console.log("row>>>>>>xxxx",row);
+      console.log('row>>>>>>xxxx', row);
       this.$router.push({
         path: '/distribution/reservation/atlas1',
         query: {
           item: JSON.stringify(row),
-          type:'2'
-        }
+          type: '2',
+        },
       });
     },
     textbox(e, index, a) {
@@ -764,19 +820,20 @@ export default {
       let params = {};
       params.id = this.deliverId;
       params.addvalue = addvalueInfos;
-      params.relatedId=2
-      console.log("params>>>>>>>>>>>>>>>>>>",params);
+      params.relatedId = 2;
+      console.log('params>>>>>>>>>>>>>>>>>>', params);
       addIncrement(params).then(res => {
         this.dialogVisible = false;
         this.$message({
           type: 'success',
-          message: '操作成功!'
+          message: '操作成功!',
         });
       });
       this.onLoad(this.page);
     },
     selectionsc(value) {
-      console.log("进来了>>>>>>>>>>>>>",value);
+      // 筛选出所有被选中项的id
+      this.selectionList = value.map(item => item.id);
     },
     delectsolt(scope) {
       const { row } = scope;
@@ -787,8 +844,7 @@ export default {
         .then(_ => {
           done();
         })
-        .catch(_ => {
-        });
+        .catch(_ => {});
     },
     editsolt(scope) {
       const { row } = scope;
@@ -797,14 +853,14 @@ export default {
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
           data: encodeURIComponent(JSON.stringify(row)),
-          name: row.trainNumber +'-查看配送'
-        }
+          name: row.trainNumber + '-查看配送',
+        },
       });
     },
     costadd(scope) {
       const { row } = scope;
-      console.log("row>>>>>>>>>>",row);
-      this.deliverId =row.id
+      console.log('row>>>>>>>>>>', row);
+      this.deliverId = row.id;
       //查询订单的增值服务，
       this.addvalueServeType = [];
       this.addvalue = {};
@@ -818,15 +874,14 @@ export default {
       console.log(index, row);
     },
     selectsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
-      if(row.prop ==='deliveryStatusName'){
+      if (row.prop === 'deliveryStatusName') {
         this.query['deliveryStatus'] = index;
-      }else if(row.prop ==='kindName'){
+      } else if (row.prop === 'kindName') {
         this.query['kind'] = index;
-
       }
       this.onLoad(this.page);
     },
@@ -834,9 +889,9 @@ export default {
       console.log(index, row);
     },
     inputsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
@@ -850,32 +905,35 @@ export default {
       getDictionaryBiz('delivery_way').then(res => {
         this.deliveryWayData = res.data.data;
       });
-   
+
       getDictionaryBiz('distribution_deliverylist_state').then(res => {
         this.deliveryliststateData = res.data.data;
-        this.columnList[6].checkarr =res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
+        this.columnList[6].checkarr = res.data.data.map(item => {
+          item.value = item.dictKey;
+          item.label = item.dictValue;
+          return item;
         });
         this.onLoad(this.page);
       });
 
       //配送状态
       getDictionaryBiz('distribution_delivery_status').then(res => {
-        this.$functions.checkcColumnList("deliveryStatusName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.$functions.checkcColumnList('deliveryStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
       });
       //配送种类
       getDictionaryBiz('distribution_deliverylist_kind').then(res => {
-        this.$functions.checkcColumnList("kindName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.$functions.checkcColumnList('kindName', this.columnList).checkarr = res.data.data.map(
+          item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          }
+        );
       });
     },
     //类型切换
@@ -883,13 +941,13 @@ export default {
     //   this.query.type=type;
     //   this.onLoad(this.page)
     // },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       if (this.query.deliveryKind) {
         let deliveryKind = this.query.deliveryKind;
         switch (deliveryKind) {
@@ -903,19 +961,19 @@ export default {
       }
       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 {
@@ -923,54 +981,54 @@ 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 (scope) {
-      const { row} = scope;
+    handleEdit(scope) {
+      const { row } = scope;
       this.$router.push({
         path: '/distribution/turndelivery/deliveryDiscuss',
         query: {
           id: row.id,
-          name: row.trainNumber +'-编辑配送'
-        }
+          name: row.trainNumber + '-编辑配送',
+        },
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleViewBlank (row) {
-      console.log("row>>>>>>>>>>>>>>>>",row);
+    handleViewBlank(row) {
+      console.log('row>>>>>>>>>>>>>>>>', row);
       this.$router.push({
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
           data: encodeURIComponent(JSON.stringify(row)),
-          name: row.trainNumber +'-查看配送'
-        }
+          name: row.trainNumber + '-查看配送',
+        },
       });
     },
-    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);
@@ -979,16 +1037,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);
@@ -996,58 +1054,65 @@ 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;
     },
-    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);
     },
     /**
      * 新增按钮，跳转至配送计划
      */
-    toDeliveryPlan(){
+    toDeliveryPlan() {
       this.$router.push({
         path: '/distribution/turndelivery/deliveryDiscuss',
-
       });
     },
     /**
      * 批量打印
      */
-     printBatch(){
+    async printBatchOrder() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$message({
-            type: 'success',
-            message: '功能开发中!'
-          });
+      this.isShow = true;
+      const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 1 });
+      console.log('res :>> ', res);
+      const {
+        data: { code, data },
+      } = res;
+      if (code === 200) {
+        // 初始化打印页面
+        this.html = '';
+        data.forEach(item => {
+          this.html += item.templateHtml;
+        });
+      }
     },
 
-
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
-      this.query.type ='1'
+      this.query.type = '1';
       getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         // eslint-disable-next-line no-empty
@@ -1077,13 +1142,27 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
-      getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        this.statistics = res.data.data
-      });
+      getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          this.statistics = res.data.data;
+        }
+      );
       // getDetail(row.id).then(res => {
       //   this.form = res.data.data;
       // });
-    }
-  }
+    },
+    /**
+     * 打印
+     */
+    printTemplate() {
+      print();
+    },
+  },
 };
 </script>
+
+<style>
+.el-dialog {
+  width: fit-content;
+}
+</style>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 495ba47c..60b3afc0 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -1,68 +1,63 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding: 6px 18px">
+      <el-row v-if="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="配送车次:">
             <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
           </el-form-item>
           <el-form-item label="配送日期:">
-            <el-date-picker
-                    v-model="query.taskTime"
-                    type="date"
-                    placeholder="选择日期">
+            <el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-<!--          <el-form-item label="配送类型:">-->
-<!--            <el-select v-model="query.businessType" placeholder="请选择业务类型">-->
-<!--              <el-option-->
-<!--                      :key="'1'"-->
-<!--                      :value="'商配'">商配-->
-<!--              </el-option>-->
-<!--              <el-option-->
-<!--                      :key="'2'"-->
-<!--                      :value="'市配'">市配-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="配送类型:">-->
+          <!--            <el-select v-model="query.businessType" placeholder="请选择业务类型">-->
+          <!--              <el-option-->
+          <!--                      :key="'1'"-->
+          <!--                      :value="'商配'">商配-->
+          <!--              </el-option>-->
+          <!--              <el-option-->
+          <!--                      :key="'2'"-->
+          <!--                      :value="'市配'">市配-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
           <el-form-item label="配送种类:">
             <el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
-              <el-option
-                      :key="'1'"
-                      :value="'自主配送'">自主配送
-              </el-option>
-              <el-option
-                      :key="'2'"
-                      :value="'外协配送'">外协配送
-              </el-option>
+              <el-option :key="'1'" :value="'自主配送'">自主配送 </el-option>
+              <el-option :key="'2'" :value="'外协配送'">外协配送 </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="配送司机:">
             <el-select
-                    v-model="query.driverName"
-                    filterable
-                    placeholder="请输入司机名称"
-                    :loading="loading">
+              v-model="query.driverName"
+              filterable
+              placeholder="请输入司机名称"
+              :loading="loading"
+            >
               <el-option
-                      v-for="item in driverData"
-                      :key="item.dictKey"
-                      :label="item.dictValue"
-                      :value="item.dictValue">
+                v-for="item in driverData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="配送车辆:">
             <el-select
-                    v-model="query.vehicleName"
-                    filterable
-                    placeholder="请输入司机名称"
-                    :loading="loading">
+              v-model="query.vehicleName"
+              filterable
+              placeholder="请输入司机名称"
+              :loading="loading"
+            >
               <el-option
-                      v-for="item in vehicleData"
-                      :key="item.dictKey"
-                      :label="item.dictValue"
-                      :value="item.dictValue">
+                v-for="item in vehicleData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -74,18 +69,24 @@
         </el-form>
       </el-row>
       <el-row :gutter="24" class="rows">
-<!--        <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
-<!--          <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
-<!--        </el-col>-->
+        <!--        <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
+        <!--          <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
+        <!--        </el-col>-->
         <el-col :xl="10" :lg="7" :md="8" :sm="24">
-          <span>市配总车次：{{statistics.marketNub}}/总包件数：{{statistics.marketTotal}}/总库存品数：{{statistics.minventoryTotal}}</span>
+          <span
+            >市配总车次：{{ statistics.marketNub }}/总包件数：{{
+              statistics.marketTotal
+            }}/总库存品数：{{ statistics.minventoryTotal }}</span
+          >
         </el-col>
       </el-row>
       <el-row style="margin-top: 30px">
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left" style="margin-top: 20px">
-            <!--            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
+            <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>
           <!-- 头部右侧按钮模块 -->
@@ -111,9 +112,17 @@
           <template #default="slotProps">
             <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
             <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
-            <el-text size="small"  v-if="slotProps.scope.row.deliveryStatusName !== '已完成' || slotProps.scope.row.deliveryStatus !== '3'" @click="handleEdit(slotProps.scope)">编 辑</el-text>
+            <el-text
+              size="small"
+              v-if="
+                slotProps.scope.row.deliveryStatusName !== '已完成' ||
+                slotProps.scope.row.deliveryStatus !== '3'
+              "
+              @click="handleEdit(slotProps.scope)"
+              >编 辑</el-text
+            >
 
-<!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
+            <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
           </template>
         </tablecmt>
         <!--        <el-table ref="table" v-loading="loading"-->
@@ -146,17 +155,19 @@
         <!--        </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>
@@ -167,60 +178,84 @@
       title="增值服务"
       width="30%"
       :model="addvalue"
-      :before-close="handleClose">
+      :before-close="handleClose"
+    >
       <el-form-item label="增值服务" prop="freightMark">
         <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
-          <el-checkbox style="width: 100%;margin-bottom: 3%;"
-                       v-for="(item,index) in addvalueServeTypeData"
-                       :key="item.dictKey"
-                       :label="item.dictKey"
-          >{{item.dictValue}}
-            <span v-if="index===0||index===6||index===2||index===4">&nbsp;件数:
-                         <el-input type="number" v-model="item.f"
-                                   :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                   @change="textbox($event,index,1)"
-                                   style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="index===1">公里:
-                          <el-input type="primary" v-model="item.a"
-                                    :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                    @change="textbox($event,index,2)"
-                                    style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="index===3">距离:
-                      <el-input type="number" v-model="item.b"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,3)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="index===5">人数:
-                      <el-input type="number" v-model="item.c"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,4)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="index===0">楼层:
-                      <el-input type="number" v-model="item.d"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,5)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-            <span v-if="item">预计费用:
-                        <el-input type="number" v-model="item.e"
-                                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                  @change="textbox($event,index,6)"
-                                  style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
+          <el-checkbox
+            style="width: 100%; margin-bottom: 3%"
+            v-for="(item, index) in addvalueServeTypeData"
+            :key="item.dictKey"
+            :label="item.dictKey"
+            >{{ item.dictValue }}
+            <span v-if="index === 0 || index === 6 || index === 2 || index === 4"
+              >&nbsp;件数:
+              <el-input
+                type="number"
+                v-model="item.f"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 1)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 1"
+              >公里:
+              <el-input
+                type="primary"
+                v-model="item.a"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 2)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 3"
+              >距离:
+              <el-input
+                type="number"
+                v-model="item.b"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 3)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 5"
+              >人数:
+              <el-input
+                type="number"
+                v-model="item.c"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 4)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 0"
+              >楼层:
+              <el-input
+                type="number"
+                v-model="item.d"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 5)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="item"
+              >预计费用:
+              <el-input
+                type="number"
+                v-model="item.e"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 6)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
           </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="aaa">
-          确定(增值服务)
-        </el-button>
-      </span>
+        <span class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="aaa"> 确定(增值服务) </el-button>
+        </span>
       </template>
     </el-dialog>
   </basic-container>
@@ -230,21 +265,49 @@
     :drawerShow="drawerShow"
     :columnList="columnList"
   ></edittablehead>
+
+  <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
+    <div>
+      <div v-html="html"></div>
+
+      <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+      <el-button type="primary" @click="printTemplate">打 印</el-button>
+      <el-button type="primary" @click="isShow = false">确 定</el-button>
+      <el-button @click="isShow = false">取 消</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getPage,getstatistics } from "@/api/distribution/distributionDeliveryList";
-import option from "@/option/distribution/distributionDeliveryList";
-import { mapGetters } from "vuex";
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getPage,
+  getstatistics,
+  printBatch,
+} from '@/api/distribution/distributionDeliveryList';
+import option from '@/option/distribution/distributionDeliveryList';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { addIncrement } from '@/api/distribution/distributionStockArticle';
 import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
 import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
 
 export default {
-  data () {
+  data() {
     return {
-
       height: 0,
       // 弹框标题
       title: '',
@@ -256,37 +319,41 @@ export default {
       loading: true,
       // 是否为查看模式
       view: false,
+      // 打印模版
+      html: '',
+      // 是否显示打印模版
+      isShow: false,
       // 查询信息
       query: {},
       //数据统计
-      statistics:{},
+      statistics: {},
       drawerShow: false,
       // 分页信息
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       //配送类型
-      deliverytypeData:[],
+      deliverytypeData: [],
       //配送种类
-      deliverykindData:[],
+      deliverykindData: [],
       //配送状态
-      deliveryliststateData:[],
+      deliveryliststateData: [],
       // 表单数据
       form: {},
       // 选择行
       selectionList: [],
       columnList: [
-        // {
-        //   prop: '',
-        //   label: '序号',
-        //   type: 0,
-        //   values: '',
-        //   width: 55,
-        //   checkarr: [],
-        //   fixed: true,
-        // },
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
         {
           prop: 'trainNumber',
           label: '车次',
@@ -306,7 +373,7 @@ export default {
           width: '150',
           checkarr: [],
           fixed: true,
-          sortable: true
+          sortable: true,
           // head: true,
         },
         {
@@ -377,9 +444,7 @@ export default {
           type: 3,
           values: '',
           width: '150',
-          checkarr: [
-
-          ],
+          checkarr: [],
           fixed: false,
           sortable: true,
         },
@@ -490,9 +555,9 @@ export default {
           values: '',
           width: '150',
           checkarr: [],
-          fixed:'right',
+          fixed: 'right',
           sortable: false,
-        }
+        },
         // 更多列的配置...
       ],
       // 表单配置
@@ -517,10 +582,10 @@ export default {
       // 表单列表
       data: [],
       driverData: [],
-      vehicleData: []
-    }
+      vehicleData: [],
+    };
   },
-  mounted () {
+  mounted() {
     this.getvehicleData();
     this.getDriverData();
     this.queryDictionary();
@@ -529,9 +594,9 @@ export default {
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
-    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
-    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
     if (checkListnewarr) {
       this.columnList.map(item => {
         item.head = false;
@@ -543,14 +608,14 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.head){
-          arr.push(item.label)
+        if (item.head) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
     }
     if (flexListnewarr) {
       this.columnList.map(item => {
@@ -559,22 +624,22 @@ export default {
       flexListnewarr.map(ite => {
         this.columnList.map(item => {
           if (ite == item.label) {
-            if(item.type==6){
+            if (item.type == 6) {
               item.fixed = 'right';
-            }else{
+            } else {
               item.fixed = true;
             }
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.fixed){
-          arr.push(item.label)
+        if (item.fixed) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
     }
     if (sortlistnewarr) {
       this.columnList.map(item => {
@@ -587,25 +652,25 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.sortable){
-          arr.push(item.label)
+        if (item.sortable) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
     }
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
     getvehicleData() {
@@ -616,7 +681,7 @@ export default {
           data.records.forEach(item => {
             let a = {
               dictKey: item.id,
-              dictValue: item.vehicleNub
+              dictValue: item.vehicleNub,
             };
             po.push(a);
           });
@@ -634,7 +699,7 @@ export default {
           data.records.forEach(item => {
             let a = {
               dictKey: item.id,
-              dictValue: item.name
+              dictValue: item.name,
             };
             po.push(a);
           });
@@ -644,26 +709,25 @@ export default {
         });
       });
     },
-    showdrawer(value){
-      this.drawerShow=value
+    showdrawer(value) {
+      this.drawerShow = value;
     },
     /**
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList
      */
-    setnewcolum(newarr, headarr,type) {
+    setnewcolum(newarr, headarr, type) {
       // console.log(newarr,'+++++++++++')
-      if(type==1){
+      if (type == 1) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
-      }else if(type==2){
+        this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+      } else if (type == 2) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
-      }else if(type==3){
+        this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
       }
-
     },
     handleCheckedCitiesChange(value) {
       if (value) {
@@ -681,17 +745,16 @@ export default {
           this.costListName = value;
         }
       });
-
     },
-    editmap(scope){
+    editmap(scope) {
       const { row } = scope;
-      console.log("row>>>>>>xxxx",row);
+      console.log('row>>>>>>xxxx', row);
       this.$router.push({
         path: '/distribution/reservation/atlas1',
         query: {
           item: JSON.stringify(row),
-          type:'2'
-        }
+          type: '2',
+        },
       });
     },
     textbox(e, index, a) {
@@ -735,19 +798,20 @@ export default {
       let params = {};
       params.id = this.deliverId;
       params.addvalue = addvalueInfos;
-      params.relatedId=2
-      console.log("params>>>>>>>>>>>>>>>>>>",params);
+      params.relatedId = 2;
+      console.log('params>>>>>>>>>>>>>>>>>>', params);
       addIncrement(params).then(res => {
         this.dialogVisible = false;
         this.$message({
           type: 'success',
-          message: '操作成功!'
+          message: '操作成功!',
         });
       });
       this.onLoad(this.page);
     },
     selectionsc(value) {
-      console.log("进来了>>>>>>>>>>>>>",value);
+      // 筛选出所有被选中项的id
+      this.selectionList = value.map(item => item.id);
     },
     delectsolt(scope) {
       const { row } = scope;
@@ -758,8 +822,7 @@ export default {
         .then(_ => {
           done();
         })
-        .catch(_ => {
-        });
+        .catch(_ => {});
     },
     editsolt(scope) {
       const { row } = scope;
@@ -768,14 +831,14 @@ export default {
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
           data: encodeURIComponent(JSON.stringify(row)),
-          name: row.trainNumber +'-查看配送'
-        }
+          name: row.trainNumber + '-查看配送',
+        },
       });
     },
     costadd(scope) {
       const { row } = scope;
-      console.log("row>>>>>>>>>>",row);
-      this.deliverId =row.id
+      console.log('row>>>>>>>>>>', row);
+      this.deliverId = row.id;
       //查询订单的增值服务，
       this.addvalueServeType = [];
       this.addvalue = {};
@@ -789,27 +852,25 @@ export default {
       console.log(index, row);
     },
     selectsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
-      if(row.prop ==='deliveryStatusName'){
+      if (row.prop === 'deliveryStatusName') {
         this.query['deliveryStatus'] = index;
-      }else if(row.prop ==='kindName'){
+      } else if (row.prop === 'kindName') {
         this.query['kind'] = index;
-
       }
 
-
       this.onLoad(this.page);
     },
     timesc(index, row) {
       console.log(index, row);
     },
     inputsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
@@ -824,41 +885,36 @@ export default {
         this.deliveryWayData = res.data.data;
       });
 
-
       //配送状态
       getDictionaryBiz('distribution_delivery_status').then(res => {
-        this.$functions.checkcColumnList("deliveryStatusName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.$functions.checkcColumnList('deliveryStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
       });
       //配送种类
       getDictionaryBiz('distribution_deliverylist_kind').then(res => {
-        this.$functions.checkcColumnList("kindName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.$functions.checkcColumnList('kindName', this.columnList).checkarr = res.data.data.map(
+          item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          }
+        );
       });
 
-
-
-
       this.onLoad(this.page);
     },
 
-
-
-
-
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       if (this.query.deliveryKind) {
         let deliveryKind = this.query.deliveryKind;
         switch (deliveryKind) {
@@ -872,19 +928,19 @@ export default {
       }
       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 {
@@ -892,29 +948,29 @@ 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 (scope) {
-      const { row} = scope;
+    handleEdit(scope) {
+      const { row } = scope;
       this.$router.push({
         path: '/distribution/turndelivery/deliveryMarket',
         query: {
           deliveryId: row.id,
-          name: row.trainNumber +'-编辑配送'
-        }
+          name: row.trainNumber + '-编辑配送',
+        },
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
@@ -930,15 +986,15 @@ export default {
     //     }
     //   });
     // },
-    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);
@@ -947,16 +1003,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);
@@ -964,70 +1020,103 @@ 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;
     },
-    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.type = '2'
+      this.query.type = '2';
       getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         // eslint-disable-next-line no-empty
         // for (let i = 0; i < data.records.length; i++) {
-          // eslint-disable-next-line no-empty
-          // for (let j = 0; j < this.deliverytypeData.length; j++) {
-          //   // eslint-disable-next-line no-empty
-          //   if (data.records[i].type == this.deliverytypeData[j].dictKey) {
-          //     data.records[i].type = this.deliverytypeData[j].dictValue;
-          //   }
-          // }
-          // for (let j = 0; j < this.deliverykindData.length; j++) {
-          //   // eslint-disable-next-line no-empty
-          //   if (data.records[i].kind == this.deliverykindData[j].dictKey) {
-          //     data.records[i].kind = this.deliverykindData[j].dictValue;
-          //   }
-          // }
-          // for (let j = 0; j < this.deliveryliststateData.length; j++) {
-          //   // eslint-disable-next-line no-empty
-          //   if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
-          //     data.records[i].state = this.deliveryliststateData[j].dictValue;
-          //   }
-          // }
+        // eslint-disable-next-line no-empty
+        // for (let j = 0; j < this.deliverytypeData.length; j++) {
+        //   // eslint-disable-next-line no-empty
+        //   if (data.records[i].type == this.deliverytypeData[j].dictKey) {
+        //     data.records[i].type = this.deliverytypeData[j].dictValue;
+        //   }
+        // }
+        // for (let j = 0; j < this.deliverykindData.length; j++) {
+        //   // eslint-disable-next-line no-empty
+        //   if (data.records[i].kind == this.deliverykindData[j].dictKey) {
+        //     data.records[i].kind = this.deliverykindData[j].dictValue;
+        //   }
+        // }
+        // for (let j = 0; j < this.deliveryliststateData.length; j++) {
+        //   // eslint-disable-next-line no-empty
+        //   if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
+        //     data.records[i].state = this.deliveryliststateData[j].dictValue;
+        //   }
+        // }
         // }
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
         this.selectionClear();
       });
-      getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        this.statistics = res.data.data
-      });
+      getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          this.statistics = res.data.data;
+        }
+      );
       // getDetail(row.id).then(res => {
       //   this.form = res.data.data;
       // });
-    }
-  }
+    },
+
+    /**
+     * 批量打印
+     */
+    async printBatchOrder() {
+      console.log(11);
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.isShow = true;
+      const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 2 });
+      console.log('res :>> ', res);
+      const {
+        data: { code, data },
+      } = res;
+      if (code === 200) {
+        // 初始化打印页面
+        this.html = '';
+        data.forEach(item => {
+          this.html += item.templateHtml;
+        });
+      }
+    },
+
+    /**
+     * 打印
+     */
+    printTemplate() {
+      print();
+    },
+  },
 };
 </script>
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 5d4461fd..9a07c937 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -352,6 +352,7 @@ import { getListMaterial } from '@/api/basic/basicMaterial';
 import { getLodop } from '@/utils/LodopFuncs';
 import { getStockTemplate } from '@/api/distribution/distributionStockArticle';
 import dayjs from 'dayjs';
+import print from '@/utils/print';
 
 export default {
   data() {
@@ -840,39 +841,8 @@ export default {
       this.onLoadOwn(this.page);
     },
     printTemplate() {
-      console.log('111 :>> ', 111);
       const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
-      orderNodeList.forEach(orderNode => {
-        console.log('orderNode :>> ', orderNode);
-        // console.log('orderNode.innerHTML :>> ', orderNode.innerHTML);
-      });
-
-      let LODOP = getLodop();
-      console.log('LODOP>>>>>', LODOP);
-      // console.log("this.ids>>>>>",this.selectionList);
-      // if (this.selectionList.length === 0){
-      //   this.$message.warning("请选择至少一条数据");
-      //   return;
-      // }
-
-      // 注释
-      getStockTemplate({ id: this.materialQRCode.id }).then(res => {
-        console.log('返回的数据', res.data.data);
-        let templateData = res.data.data;
-        // let templateData = "res.data.data";
-        // console.log(templateData);
-        LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
-        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
-        LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
-        // // 设置打印整宽且不变形
-        LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
-        // // 设置打印后自动关闭
-        LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
-        // // data就是一段html文本
-        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
-        // LODOP.PREVIEW(); //预览(预览打印无脚标)
-        LODOP.PRINT(); //直接打印
-      });
+      print(orderNodeList);
     },
     //提交物品数据
     handleSubmitMethod() {
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index 18982f56..5b24d6cb 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -383,6 +383,7 @@ import { getStockDetail } from '@/api/distribution/distributionStock';
 import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { getLodop } from '@/utils/LodopFuncs';
 import dayjs from 'dayjs';
+import print from '@/utils/print';
 
 export default {
   data() {
@@ -1203,7 +1204,7 @@ export default {
           hide: false,
         },
       ],
-      selectionList1:[]
+      selectionList1: [],
     };
   },
   mounted() {
@@ -1464,30 +1465,9 @@ export default {
     },
     //打印
     printTemplate() {
-      let LODOP = getLodop();
-      console.log('LODOP>>>>>', LODOP);
-      // console.log("this.ids>>>>>",this.selectionList);
-      // if (this.selectionList.length === 0){
-      //   this.$message.warning("请选择至少一条数据");
-      //   return;
-      // }
-      getStockTemplate({ id: this.materialQRCode.id }).then(res => {
-        console.log('返回的数据', res.data.data);
-        let templateData = res.data.data;
-        // let templateData = "res.data.data";
-        // console.log(templateData);
-        LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
-        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
-        LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
-        // // 设置打印整宽且不变形
-        LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
-        // // 设置打印后自动关闭
-        LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
-        // // data就是一段html文本
-        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
-        // LODOP.PREVIEW(); //预览(预览打印无脚标)
-        LODOP.PRINT(); //直接打印
-      });
+      // const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
+      // 调用打印方法打印表单
+      print();
     },
     //查看包条码
     handleQRCode(row) {
@@ -1805,7 +1785,7 @@ export default {
     },
     selectionClear() {
       this.selectionList = [];
-      this.checkselect=[]
+      this.checkselect = [];
       // this.$refs.table.clearSelection();
     },
     currentChange(currentPage) {
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index c5785915..3c819182 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -453,12 +453,12 @@ export default {
       deep: true,
       immediate: true
     },
-    'form.clientId': {
-      handler(newVal) {
-        console.log("newVal>>>>>>>>>>>>>>>",newVal)
-        console.log("this.options>>>>>>>>>>>>>>>",this.options)
-      },
-}
+//     'form.clientId': {
+//       handler(newVal) {
+//         console.log("newVal>>>>>>>>>>>>>>>",newVal)
+//         console.log("this.options>>>>>>>>>>>>>>>",this.options)
+//       },
+// }
   },
 
   computed: {
@@ -490,13 +490,17 @@ export default {
         this.store = [];
 
         let b = await getWarehouseDetail(a);
-        console.log('bbbb', b.data.data);
+        console.log('bbbb>>>>', b.data.data);
         const da = b.data.data;
 
         this.options.push({
           label: da.customerName,
           value: da.clientId,
         });
+        this.optionCodes.push({
+          label: da.customerCode,
+          value: da.clientId,
+        });
 
         if (!!da.storeId && da.storeId != '-1') {
           console.log('门店》》》》');
@@ -689,7 +693,6 @@ export default {
         this.form.clientId = obj.value;
       }
       this.form.serviceType =null;
-      console.log("");
       let aa = '';
       this.options.some(i => {
         // console.log(">><><><<>",i);
@@ -699,6 +702,14 @@ export default {
           aa = i.value;
         }
       });
+      this.optionCodes.some(i => {
+        console.log(">><><><<>",i);
+        if (i.value == row) {
+          this.form.clientCode = i.label;
+          //查询客户服务类型
+          aa = i.value;
+        }
+      });
       let bu = await getListName(this.page.currentPage, this.page.pageSize, {
         clientId: aa,
         typeService: '3',
@@ -878,7 +889,7 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           if (!this.form.id) {
-            // console.log("this.form111",this.form);
+            console.log("this.form111",this.form);
             if (this.data.length > 0) {
               this.form.list = this.data;
               add(this.form).then(() => {
@@ -903,7 +914,7 @@ export default {
             // if(parseInt(this.$route.query.type) == 3){
             //
             // }
-            // console.log("this.form222",this.form);
+            console.log("this.form222",this.form);
             if (!!this.form.totalInput && parseInt(this.form.totalInput) == '-1') {
               this.form.totalInput = null;
             }
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
index 88065123..2b9e8d44 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
@@ -575,7 +575,6 @@ export default {
       this.onLoad(this.page);
     },
     handleEditOwn (row) {
-
       this.$router.push({
         path: '/warehouse/warehousingentry/warehouseWarehouseingAddReceipt',
         query:{