From 8915f0256b062e88234c10d7573103bc747a16f3 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 23 Nov 2023 11:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B8=E9=94=80=E4=B8=8E?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8F=96=E8=B4=A7=E5=8A=9F=E8=83=BD,?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8E=9F=E6=9C=89=E5=8F=91=E8=B4=A7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order.js                    |  112 +--
 src/views/order/index.vue           | 1170 ++++++++++++++++++++-------
 src/views/order/orderCancellate.vue |  162 ++--
 3 files changed, 1061 insertions(+), 383 deletions(-)

diff --git a/src/api/order.js b/src/api/order.js
index f8cc351..d2b505c 100644
--- a/src/api/order.js
+++ b/src/api/order.js
@@ -12,307 +12,315 @@ import request from './request'
 /**
  * @description 订单 -- 列表
  */
-export function orderListApi(data) {
+export function orderListApi (data) {
   return request.get('store/order/lst', data)
 }
 
 /**
  * @description 订单 -- 表头
  */
-export function chartApi() {
+export function chartApi () {
   return request.get('store/order/chart')
 }
 /**
  * @description 订单 -- 卡片
  */
-export function cardListApi(data) {
+export function cardListApi (data) {
   return request.get('store/order/title', data)
 }
 /**
  * @description 订单 -- 编辑
  */
-export function orderUpdateApi(id, data) {
+export function orderUpdateApi (id, data) {
   return request.post(`store/order/update/${id}`, data)
 }
 /**
  * @description 订单 -- 发货
  */
-export function orderDeliveryApi(id, data) {
+export function orderDeliveryApi (id, data) {
   return request.post(`store/order/delivery/${id}`, data)
 }
 /**
  * @description 订单 -- 详情
  */
-export function orderDetailApi(id) {
+export function orderDetailApi (id) {
   return request.get(`store/order/detail/${id}`)
 }
 /**
  * @description 订单 -- 子订单
  */
-export function getChildrenOrderApi(id) {
+export function getChildrenOrderApi (id) {
   return request.get(`store/order/children/${id}`)
 }
 /**
  * @description 订单 -- 记录
  */
-export function orderLogApi(id, data) {
+export function orderLogApi (id, data) {
   return request.get(`store/order/log/${id}`, data)
 }
 /**
  * @description 订单 -- 备注from
  */
-export function orderRemarkApi(id) {
+export function orderRemarkApi (id) {
   return request.get(`store/order/remark/${id}/form`)
 }
 /**
  * @description 订单 -- 删除
  */
-export function orderDeleteApi(id) {
+export function orderDeleteApi (id) {
   return request.post(`store/order/delete/${id}`)
 }
 /**
  * @description 订单 -- 打印
  */
-export function orderPrintApi(id) {
+export function orderPrintApi (id) {
   return request.get(`store/order/printer/${id}`)
 }
 /**
  * @description 退款订单 -- 列表
  */
-export function refundorderListApi(data) {
+export function refundorderListApi (data) {
   return request.get('store/refundorder/lst', data)
 }
 /**
  * @description 退款订单 -- 详情
  */
-export function refundorderDetailApi(id) {
+export function refundorderDetailApi (id) {
   return request.get(`store/refundorder/detail/${id}`)
 }
 /**
  * @description 退款订单 -- 审核from
  */
-export function refundorderStatusApi(id) {
+export function refundorderStatusApi (id) {
   return request.get(`store/refundorder/status/${id}/form`)
 }
 /**
  * @description 退款订单 -- 备注from
  */
-export function refundorderMarkApi(id) {
+export function refundorderMarkApi (id) {
   return request.get(`store/refundorder/mark/${id}/form`)
 }
 /**
  * @description 退款订单 -- 记录from
  */
-export function refundorderLogApi(id) {
+export function refundorderLogApi (id) {
   return request.get(`store/refundorder/log/${id}`)
 }
 /**
  * @description 退款订单 -- 删除
  */
-export function refundorderDeleteApi(id) {
+export function refundorderDeleteApi (id) {
   return request.get(`store/refundorder/delete/${id}`)
 }
 /**
  * @description 退款订单 -- 确认收货
  */
-export function confirmReceiptApi(id) {
+export function confirmReceiptApi (id) {
   return request.post(`store/refundorder/refund/${id}`)
 }
 /**
  * @description 获取物流信息
  */
-export function getExpress(id) {
+export function getExpress (id) {
   return request.get(`store/order/express/${id}`)
 }
 /**
  * @description 退款单获取物流信息
  */
-export function refundorderExpressApi(id) {
+export function refundorderExpressApi (id) {
   return request.get(`store/refundorder/express/${id}`)
 }
 /**
  * @description 导出订单
  */
-export function exportOrderApi(data) {
+export function exportOrderApi (data) {
   return request.get(`store/order/excel`, data)
 }
 /**
  * @description 生成发货单
  */
-export function exportInvoiceApi(data) {
+export function exportInvoiceApi (data) {
   return request.get(`store/order/delivery_export`, data)
 }
 /**
  * @description 导出文件列表
  */
-export function exportFileLstApi(data) {
+export function exportFileLstApi (data) {
   return request.get(`excel/lst`, data)
 }
 /**
  * @description 下载
  */
-export function downloadFileApi(id) {
+export function downloadFileApi (id) {
   return request.get(`excel/download/${id}`)
 }
 /**
  * @description 订单核销详情
  */
-export function orderCancellationApi(code) {
+export function orderCancellationApi (code) {
   return request.get(`store/order/verify/${code}`)
 }
 /**
  * @description 订单核销
  */
- export function goCancellationApi(id, data) {
+export function goCancellationApi (id, data) {
   return request.post(`store/order/verify/${id}`, data)
 }
 /**
  * @description 订单 -- 头部
  */
-export function orderHeadListApi() {
+export function orderHeadListApi () {
   return request.get(`store/order/filtter`)
 }
 /**
  * @description 核销订单 -- 表头
  */
-export function takeChartApi() {
+export function takeChartApi () {
   return request.get('store/order/takechart')
 }
 /**
  * @description 核销订单 -- 列表
  */
-export function takeOrderListApi(data) {
+export function takeOrderListApi (data) {
   return request.get('store/order/takelst', data)
 }
 /**
  * @description 核销订单 -- 卡片
  */
-export function takeCardListApi(data) {
+export function takeCardListApi (data) {
   return request.get('store/order/take_title', data)
 }
 /**
  * @description 发票管理 -- 列表
  */
-export function invoiceOrderListApi(data) {
+export function invoiceOrderListApi (data) {
   return request.get('store/receipt/lst', data)
 }
 /**
  * @description 发票 -- 备注from
  */
-export function invoiceorderMarkApi(id) {
+export function invoiceorderMarkApi (id) {
   return request.get(`store/receipt/mark/${id}/form`)
 }
 /**
  * @description 发票 -- 开票信息
  */
-export function invoiceInfoApi(data) {
+export function invoiceInfoApi (data) {
   return request.get(`store/receipt/set_recipt`, data)
 }
 /**
  * @description 发票 -- 开票
  */
-export function invoiceApi(data) {
+export function invoiceApi (data) {
   return request.post(`store/receipt/save_recipt`, data)
 }
 /**
  * @description 发票 -- 详情
  */
-export function invoiceDetailApi(id) {
+export function invoiceDetailApi (id) {
   return request.get(`store/receipt/detail/${id}`)
 }
 /**
  * @description 发票 -- 编辑
  */
-export function invoiceUpdateApi(id, data) {
+export function invoiceUpdateApi (id, data) {
   return request.post(`store/receipt/update/${id}`, data)
 }
 /**
  * @description 批量发货记录 -- 列表
  */
-export function deliveryRecordListApi(data) {
+export function deliveryRecordListApi (data) {
   return request.get('store/import/lst', data)
 }
 /**
  * @description 批量发货记录 -- 详情
  */
-export function deliveryRecordDetailApi(id, data) {
+export function deliveryRecordDetailApi (id, data) {
   return request.get(`store/import/detail/${id}`, data)
 }
 /**
  * @description 批量发货记录 -- 导出
  */
-export function deliveryRecordImportApi(id) {
+export function deliveryRecordImportApi (id) {
   return request.get(`store/import/excel/${id}`)
 }
 /**
  * @description 退款单 -- 导出
  */
-export function refundListImportApi(data) {
+export function refundListImportApi (data) {
   return request.get(`store/refundorder/excel`, data)
 }
 /**
  * @description 发送货 -- 物流公司列表
  */
-export function expressLst() {
+export function expressLst () {
   return request.get(`expr/options`)
 }
 /**
  * @description 发送货 -- 电子面单列表
  */
-export function exprTempsLst(data) {
+export function exprTempsLst (data) {
   return request.get(`expr/temps`, data)
 }
 /**
  * @description 发送货 -- 批量发送货
  */
-export function batchDeliveryApi(data) {
+export function batchDeliveryApi (data) {
   return request.post(`store/order/delivery_batch`, data)
 }
 /**
  * @description 发送货 -- 电子面单默认数据
  */
-export function getEleTempData() {
+export function getEleTempData () {
   return request.get(`serve/config`)
 }
 /**
  * @description 发送货 -- 门店列表
  */
- export function getStoreLst() {
+export function getStoreLst () {
   return request.get(`delivery/station/select`)
 }
+
+/**
+ * @description 发送货 -- 取件码
+ */
+export function getLogisticsCode (id) {
+  return request.get(`store/order/logistics_code/${id}`)
+}
+
 /**
  * @description 发送货 -- 门店列表
  */
- export function getDeliveryStoreLst() {
+export function getDeliveryStoreLst () {
   return request.get(`delivery/station/options`)
 }
 /**
  * @description 同城配送  -- 订单列表
  */
- export function deliveryOrderLst(data) {
+export function deliveryOrderLst (data) {
   return request.get(`delivery/order/lst`, data)
 }
 /**
  * @description 同城订单 -- 取消
  */
- export function deliveryOrderCancle(id) {
+export function deliveryOrderCancle (id) {
   return request.get(`delivery/order/cancel/${id}/form`)
 }
 /**
  * @description 同城配送  -- 充值记录列表
  */
- export function rechargeLst(data) {
+export function rechargeLst (data) {
   return request.get(`delivery/station/payLst`, data)
 }
 /**
  * @description 同城配送  -- 充值
  */
- export function rechargeInfoApi(data) {
+export function rechargeInfoApi (data) {
   return request.get(`delivery/station/code`, data)
 }
 /**
  * @description 订单  -- 导出
  */
- export function storeOrderApi(data) {
+export function storeOrderApi (data) {
   return request.get(`delivery/station/code`, data)
-}
\ No newline at end of file
+}
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index b872bd1..2190643 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -4,34 +4,138 @@
       <div slot="header" class="clearfix">
         <div class="container">
           <el-form size="small" label-width="100px" inline>
-            <el-form-item label="订单状态：" style="display: block;">
-              <el-radio-group v-model="tableFrom.status" type="button" @change="getList(1),getCardList()">
-                <el-radio-button label>全部 {{ '(' +orderChartType.all?orderChartType.all:0 + ')' }}</el-radio-button>
-                <el-radio-button label="1">待付款 {{ '(' +orderChartType.unpaid?orderChartType.unpaid:0+ ')' }}</el-radio-button>
-                <el-radio-button label="2">待发货 {{ '(' +orderChartType.unshipped?orderChartType.unshipped:0+ ')' }}</el-radio-button>
-                <el-radio-button label="3">待收货 {{ '(' +orderChartType.untake?orderChartType.untake:0+ ')' }}</el-radio-button>
-                <el-radio-button label="4">待评价 {{ '(' +orderChartType.unevaluate?orderChartType.unevaluate:0+ ')' }}</el-radio-button>
-                <el-radio-button label="5">交易完成 {{ '(' +orderChartType.complete?orderChartType.complete:0+ ')' }}</el-radio-button>
-                <el-radio-button label="6">已退款 {{ '(' +orderChartType.refund?orderChartType.refund:0+ ')' }}</el-radio-button>
-                <el-radio-button label="7">已删除 {{ '(' +orderChartType.del?orderChartType.del:0+ ')' }}</el-radio-button>
+            <el-form-item label="订单状态：" style="display: block">
+              <el-radio-group
+                v-model="tableFrom.status"
+                type="button"
+                @change="getList(1), getCardList()"
+              >
+                <el-radio-button label
+                  >全部
+                  {{
+                    "(" + orderChartType.all ? orderChartType.all : 0 + ")"
+                  }}</el-radio-button
+                >
+                <el-radio-button label="1"
+                  >待付款
+                  {{
+                    "(" + orderChartType.unpaid
+                      ? orderChartType.unpaid
+                      : 0 + ")"
+                  }}</el-radio-button
+                >
+                <el-radio-button label="2"
+                  >待发货
+                  {{
+                    "(" + orderChartType.unshipped
+                      ? orderChartType.unshipped
+                      : 0 + ")"
+                  }}</el-radio-button
+                >
+                <el-radio-button label="3"
+                  >待收货
+                  {{
+                    "(" + orderChartType.untake
+                      ? orderChartType.untake
+                      : 0 + ")"
+                  }}</el-radio-button
+                >
+                <el-radio-button label="4"
+                  >待评价
+                  {{
+                    "(" + orderChartType.unevaluate
+                      ? orderChartType.unevaluate
+                      : 0 + ")"
+                  }}</el-radio-button
+                >
+                <el-radio-button label="5"
+                  >交易完成
+                  {{
+                    "(" + orderChartType.complete
+                      ? orderChartType.complete
+                      : 0 + ")"
+                  }}</el-radio-button
+                >
+                <el-radio-button label="6"
+                  >已退款
+                  {{
+                    "(" + orderChartType.refund
+                      ? orderChartType.refund
+                      : 0 + ")"
+                  }}</el-radio-button
+                >
+                <el-radio-button label="7"
+                  >已删除
+                  {{
+                    "(" + orderChartType.del ? orderChartType.del : 0 + ")"
+                  }}</el-radio-button
+                >
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="时间选择：" class="width100" style="display: block;">
-              <el-radio-group v-model="tableFrom.date" type="button" class="mr20" size="small" @change="selectChange(tableFrom.date)">
-                <el-radio-button v-for="(item,i) in fromList.fromTxt" :key="i" :label="item.val">{{ item.text }}</el-radio-button>
+            <el-form-item
+              label="时间选择："
+              class="width100"
+              style="display: block"
+            >
+              <el-radio-group
+                v-model="tableFrom.date"
+                type="button"
+                class="mr20"
+                size="small"
+                @change="selectChange(tableFrom.date)"
+              >
+                <el-radio-button
+                  v-for="(item, i) in fromList.fromTxt"
+                  :key="i"
+                  :label="item.val"
+                  >{{ item.text }}</el-radio-button
+                >
               </el-radio-group>
-              <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
+              <el-date-picker
+                v-model="timeVal"
+                value-format="yyyy/MM/dd"
+                format="yyyy/MM/dd"
+                size="small"
+                type="daterange"
+                placement="bottom-end"
+                placeholder="自定义时间"
+                style="width: 250px"
+                @change="onchangeTime"
+              />
             </el-form-item>
             <div>
-
               <el-form-item label="商品名称" class="width100">
-                <el-input v-model="tableFrom.store_name" placeholder="请输入商品名称" class="selWidth" size="small" @keyup.enter.native="getList(1),getCardList()">
-                  <el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1),getCardList()" />
+                <el-input
+                  v-model="tableFrom.store_name"
+                  placeholder="请输入商品名称"
+                  class="selWidth"
+                  size="small"
+                  @keyup.enter.native="getList(1), getCardList()"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    size="small"
+                    class="el-button-solt"
+                    @click="getList(1), getCardList()"
+                  />
                 </el-input>
               </el-form-item>
               <el-form-item label="总单单号：" class="width100">
-                <el-input v-model="tableFrom.group_order_sn" placeholder="请输入总单订单号" class="selWidth" size="small" @keyup.enter.native="getList(1),getCardList()">
-                  <el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1),getCardList()" />
+                <el-input
+                  v-model="tableFrom.group_order_sn"
+                  placeholder="请输入总单订单号"
+                  class="selWidth"
+                  size="small"
+                  @keyup.enter.native="getList(1), getCardList()"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    size="small"
+                    class="el-button-solt"
+                    @click="getList(1), getCardList()"
+                  />
                 </el-input>
               </el-form-item>
               <el-form-item label="活动类型：" class="width100">
@@ -40,7 +144,7 @@
                   placeholder="请选择"
                   class="filter-item selWidth mr20"
                   clearable
-                  @change="getList(1),getCardList()"
+                  @change="getList(1), getCardList()"
                 >
                   <el-option
                     v-for="item in activityList"
@@ -51,9 +155,25 @@
                 </el-select>
               </el-form-item>
             </div>
-            <el-form-item label="关键字：" class="width100" style="display: block;">
-              <el-input v-model="tableFrom.keywords" placeholder="请输入订单号/收货人/联系方式" class="selWidth" size="small" @keyup.enter.native="getList(1),getCardList()">
-                <el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1),getCardList()" />
+            <el-form-item
+              label="关键字："
+              class="width100"
+              style="display: block"
+            >
+              <el-input
+                v-model="tableFrom.keywords"
+                placeholder="请输入订单号/收货人/联系方式"
+                class="selWidth"
+                size="small"
+                @keyup.enter.native="getList(1), getCardList()"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  size="small"
+                  class="el-button-solt"
+                  @click="getList(1), getCardList()"
+                />
               </el-input>
               <el-dropdown class="dropdown" @command="exports">
                 <span class="el-dropdown-link">
@@ -67,13 +187,30 @@
               <!-- <el-button size="small" type="primary" @click="getExportFileList">导出记录</el-button> -->
             </el-form-item>
             <el-form-item label="用户信息：" class="width100">
-              <el-input v-model="tableFrom.username" placeholder="请输入用户昵称/手机号" class="selWidth" size="small" @keyup.enter.native="getList(1),getCardList()">
-                <el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1),getCardList()" />
+              <el-input
+                v-model="tableFrom.username"
+                placeholder="请输入用户昵称/手机号"
+                class="selWidth"
+                size="small"
+                @keyup.enter.native="getList(1), getCardList()"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  size="small"
+                  class="el-button-solt"
+                  @click="getList(1), getCardList()"
+                />
               </el-input>
 
-              <el-button size="small" type="primary" @click="orderCancellation('')">订单核销</el-button>
+              <el-button
+                size="small"
+                type="primary"
+                @click="orderCancellation('')"
+                >订单核销</el-button
+              >
               <el-upload
-                style="display: inline-block;"
+                style="display: inline-block"
                 class="upload-demo"
                 :headers="myHeaders"
                 :action="fileUrl"
@@ -83,17 +220,36 @@
                 <el-button size="small" type="primary">导入批量发货</el-button>
               </el-upload>
               <el-button @click="getDeliveryList">批量发货记录</el-button>
-              <el-button @click="downloadLogistics">下载物流公司对照表</el-button>
+              <el-button @click="downloadLogistics"
+                >下载物流公司对照表</el-button
+              >
               <!-- <el-button size="small" type="primary" @click="batchSend">批量发rr送货</el-button> -->
             </el-form-item>
           </el-form>
         </div>
-        <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.order_type" @tab-click="getList(1),getCardList(),getHeaderList()">
-          <el-tab-pane v-for="(item,index) in headeNum" :key="index" :name="item.order_type.toString()" :label="item.title +'('+item.count +')' " />
+        <el-tabs
+          v-if="headeNum.length > 0"
+          v-model="tableFrom.order_type"
+          @tab-click="getList(1), getCardList(), getHeaderList()"
+        >
+          <el-tab-pane
+            v-for="(item, index) in headeNum"
+            :key="index"
+            :name="item.order_type.toString()"
+            :label="item.title + '(' + item.count + ')'"
+          />
         </el-tabs>
         <cards-data :card-lists="cardLists" />
       </div>
-      <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini" class="table" highlight-current-row :cell-class-name="addTdClass">
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="mini"
+        class="table"
+        highlight-current-row
+        :cell-class-name="addTdClass"
+      >
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -104,7 +260,9 @@
                 <span>{{ props.row.create_time }}</span>
               </el-form-item>
               <el-form-item label="用户备注：">
-                <span style="display: inline-block; width: 200px;">{{ props.row.mark | filterEmpty }}</span>
+                <span style="display: inline-block; width: 200px">{{
+                  props.row.mark | filterEmpty
+                }}</span>
               </el-form-item>
               <el-form-item label="商家备注：">
                 <span>{{ props.row.remark | filterEmpty }}</span>
@@ -114,48 +272,149 @@
         </el-table-column>
         <el-table-column width="50">
           <template slot="header" slot-scope="scope">
-            <el-popover placement="top-start" width="100" trigger="hover" class="tabPop">
+            <el-popover
+              placement="top-start"
+              width="100"
+              trigger="hover"
+              class="tabPop"
+            >
               <div>
-                <span class="spBlock onHand" :class="{'check': chkName === 'dan'}" @click="onHandle('dan',scope.$index)">选中本页</span>
-                <span class="spBlock onHand" :class="{'check': chkName === 'duo'}" @click="onHandle('duo')">选中全部</span>
+                <span
+                  class="spBlock onHand"
+                  :class="{ check: chkName === 'dan' }"
+                  @click="onHandle('dan', scope.$index)"
+                  >选中本页</span
+                >
+                <span
+                  class="spBlock onHand"
+                  :class="{ check: chkName === 'duo' }"
+                  @click="onHandle('duo')"
+                  >选中全部</span
+                >
               </div>
-              <el-checkbox slot="reference" :value="(chkName === 'dan' && checkedPage.indexOf(tableFrom.page) > -1) || chkName === 'duo'" @change="changeType" />
+              <el-checkbox
+                slot="reference"
+                :value="
+                  (chkName === 'dan' &&
+                    checkedPage.indexOf(tableFrom.page) > -1) ||
+                  chkName === 'duo'
+                "
+                @change="changeType"
+              />
             </el-popover>
           </template>
           <template slot-scope="scope">
-            <el-checkbox :value="checkedIds.indexOf(scope.row.order_id) > -1 || (chkName === 'duo' && noChecked.indexOf(scope.row.order_id) === -1)" @change="(v)=>changeOne(v,scope.row)" />
+            <el-checkbox
+              :value="
+                checkedIds.indexOf(scope.row.order_id) > -1 ||
+                (chkName === 'duo' &&
+                  noChecked.indexOf(scope.row.order_id) === -1)
+              "
+              @change="(v) => changeOne(v, scope.row)"
+            />
           </template>
         </el-table-column>
         <el-table-column label="订单编号" min-width="170">
           <template slot-scope="scope">
-            <span style="display: block;" v-text="scope.row.order_sn" />
-            <span v-show="scope.row.is_del > 0" style="color: #ED4014;display: block;">用户已删除</span>
+            <span style="display: block" v-text="scope.row.order_sn" />
+            <span
+              v-show="scope.row.is_del > 0"
+              style="color: #ed4014; display: block"
+              >用户已删除</span
+            >
           </template>
         </el-table-column>
         <el-table-column label="订单类型" min-width="100">
           <template slot-scope="scope">
-            <span>{{ scope.row.is_virtual == 1 ? "虚拟订单" : scope.row.order_type == 0 ? "普通订单" : "核销订单" }}</span>
+            <span>{{
+              scope.row.is_virtual == 1
+                ? "虚拟订单"
+                : scope.row.order_type == 0
+                ? "普通订单"
+                : "核销订单"
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="活动类型" min-width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.activity_type != 4">{{ scope.row.activity_type === 1 ? "秒杀" : scope.row.activity_type === 2 ? "预售" : scope.row.activity_type === 3 ? "助力" : "--" }}</span>
-            <span v-else>拼团订单 <span v-if="scope.row.groupUser && scope.row.groupUser.groupBuying">-{{ scope.row.groupUser.groupBuying.status | activityOrderStatus }}</span></span>
+            <span v-if="scope.row.activity_type != 4">{{
+              scope.row.activity_type === 1
+                ? "秒杀"
+                : scope.row.activity_type === 2
+                ? "预售"
+                : scope.row.activity_type === 3
+                ? "助力"
+                : "--"
+            }}</span>
+            <span v-else
+              >拼团订单
+              <span
+                v-if="scope.row.groupUser && scope.row.groupUser.groupBuying"
+                >-{{
+                  scope.row.groupUser.groupBuying.status | activityOrderStatus
+                }}</span
+              ></span
+            >
           </template>
         </el-table-column>
-        <el-table-column prop="real_name" label="收货人/订购人" min-width="130" />
+        <el-table-column
+          prop="real_name"
+          label="收货人/订购人"
+          min-width="130"
+        />
         <el-table-column label="商品信息" min-width="330">
           <template slot-scope="scope">
-            <div v-for="(val, i) in scope.row.orderProduct" :key="i" class="tabBox acea-row row-middle">
+            <div
+              v-for="(val, i) in scope.row.orderProduct"
+              :key="i"
+              class="tabBox acea-row row-middle"
+            >
               <div class="demo-image__preview">
-                <el-image :src="val.cart_info.product.image" :preview-src-list="[val.cart_info.product.image]" />
+                <el-image
+                  :src="val.cart_info.product.image"
+                  :preview-src-list="[val.cart_info.product.image]"
+                />
               </div>
-              <span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
+              <span class="tabBox_tit"
+                >{{ val.cart_info.product.store_name + " | "
+                }}{{ val.cart_info.productAttr.sku }}</span
+              >
               <span class="tabBox_pice">
-                <span v-if="scope.row.activity_type === 2 && val.cart_info.productPresellAttr">{{ '￥'+ val.cart_info.productPresellAttr.presell_price + ' x '+ val.product_num }}</span>
-                <span v-else-if="scope.row.activity_type === 3 && val.cart_info.productAssistAttr">{{ '￥'+ val.cart_info.productAssistAttr.assist_price + ' x '+ val.product_num }}</span>
-                <span v-else>{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span>
-                <em v-if="val.refund_num < val.product_num && val.refund_num >= 0" style="color: red;font-style: normal;">(-{{ val.product_num - val.refund_num }})</em>
+                <span
+                  v-if="
+                    scope.row.activity_type === 2 &&
+                    val.cart_info.productPresellAttr
+                  "
+                  >{{
+                    "￥" +
+                    val.cart_info.productPresellAttr.presell_price +
+                    " x " +
+                    val.product_num
+                  }}</span
+                >
+                <span
+                  v-else-if="
+                    scope.row.activity_type === 3 &&
+                    val.cart_info.productAssistAttr
+                  "
+                  >{{
+                    "￥" +
+                    val.cart_info.productAssistAttr.assist_price +
+                    " x " +
+                    val.product_num
+                  }}</span
+                >
+                <span v-else>{{
+                  "￥" +
+                  val.cart_info.productAttr.price +
+                  " x " +
+                  val.product_num
+                }}</span>
+                <em
+                  v-if="val.refund_num < val.product_num && val.refund_num >= 0"
+                  style="color: red; font-style: normal"
+                  >(-{{ val.product_num - val.refund_num }})</em
+                >
               </span>
             </div>
           </template>
@@ -163,18 +422,41 @@
         <el-table-column label="实际支付" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.pay_price }}</span>
-            <p v-if="scope.row.finalOrder">尾款：{{ scope.row.finalOrder.pay_price }}</p>
+            <p v-if="scope.row.finalOrder">
+              尾款：{{ scope.row.finalOrder.pay_price }}
+            </p>
           </template>
         </el-table-column>
         <el-table-column label="订单佣金" min-width="100">
           <template slot-scope="scope">
-            <span>{{ (parseFloat(scope.row.extension_one) + parseFloat(scope.row.extension_two) + parseFloat(scope.row.refund_extension_one) + parseFloat(scope.row.refund_extension_two)).toFixed(2) }}</span>
-            <em v-if="(scope.row.refund_extension_one > 0) || (scope.row.refund_extension_two > 0)" style="color: red;font-style: normal;">(-{{ (parseFloat(scope.row.refund_extension_one)+parseFloat(scope.row.refund_extension_two)).toFixed(2) }})</em>
+            <span>{{
+              (
+                parseFloat(scope.row.extension_one) +
+                parseFloat(scope.row.extension_two) +
+                parseFloat(scope.row.refund_extension_one) +
+                parseFloat(scope.row.refund_extension_two)
+              ).toFixed(2)
+            }}</span>
+            <em
+              v-if="
+                scope.row.refund_extension_one > 0 ||
+                scope.row.refund_extension_two > 0
+              "
+              style="color: red; font-style: normal"
+              >(-{{
+                (
+                  parseFloat(scope.row.refund_extension_one) +
+                  parseFloat(scope.row.refund_extension_two)
+                ).toFixed(2)
+              }})</em
+            >
           </template>
         </el-table-column>
         <el-table-column label="支付类型" min-width="80">
           <template slot-scope="scope">
-            <span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
+            <span v-if="scope.row.paid === 1">{{
+              scope.row.pay_type | orderPayType
+            }}</span>
             <span v-else>--</span>
           </template>
         </el-table-column>
@@ -188,8 +470,15 @@
             <span v-if="scope.row.is_del === 0">
               <span v-if="scope.row.paid === 0">待付款</span>
               <span v-else>
-                <span v-if="scope.row.order_type === 0 || scope.row.order_type === 2">{{ scope.row.status | orderStatusFilter }}</span>
-                <span v-else>{{ scope.row.status | takeOrderStatusFilter }}</span>
+                <span
+                  v-if="
+                    scope.row.order_type === 0 || scope.row.order_type === 2
+                  "
+                  >{{ scope.row.status | orderStatusFilter }}</span
+                >
+                <span v-else>{{
+                  scope.row.status | takeOrderStatusFilter
+                }}</span>
               </span>
             </span>
             <span v-else>已删除</span>
@@ -198,23 +487,85 @@
         <el-table-column prop="create_time" label="下单时间" min-width="130" />
         <el-table-column label="推广人" min-width="100">
           <template slot-scope="scope">
-            <span>{{ scope.row.spread && scope.row.spread.nickname || '无' }}</span>
+            <span>{{
+              (scope.row.spread && scope.row.spread.nickname) || "无"
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="上级推广人" min-width="100">
           <template slot-scope="scope">
-            <span>{{ scope.row.TopSpread && scope.row.TopSpread.nickname || '无' }}</span>
+            <span>{{
+              (scope.row.TopSpread && scope.row.TopSpread.nickname) || "无"
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column key="8" label="操作" min-width="150" fixed="right" align="left">
+        <el-table-column
+          key="8"
+          label="操作"
+          min-width="150"
+          fixed="right"
+          align="left"
+        >
           <template slot-scope="scope">
-            <el-button v-if="orderFilter(scope.row) " type="text" size="small" @click="onRefundDetail(scope.row.order_sn)">查看退款单</el-button>
-            <el-button v-if="scope.row.paid === 0 && scope.row.is_del===0 && scope.row.activity_type != 2" type="text" size="small" class="mr10" @click="edit(scope.row.order_id)">编辑</el-button>
-            <el-button v-if="(scope.row.order_type == 0 || scope.row.order_type == 2) && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" class="mr10" @click="send(scope.row,scope.row.order_id)">发送货</el-button>
-            <el-button type="text" size="small" class="mr10" @click="onOrderDetails(scope.row.order_id)">订单详情</el-button>
-            <el-button v-if="scope.row.is_del !== 0" type="text" size="small" class="mr10" @click.native="handleDelete(scope.row, scope.$index)">删除</el-button>
-            <el-button v-if="scope.row.order_type == 1 && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" class="mr10" @click.native="orderCancellation(scope.row.verify_code)">去核销</el-button>
-            
+            <el-button
+              v-if="orderFilter(scope.row)"
+              type="text"
+              size="small"
+              @click="onRefundDetail(scope.row.order_sn)"
+              >查看退款单</el-button
+            >
+            <el-button
+              v-if="
+                scope.row.paid === 0 &&
+                scope.row.is_del === 0 &&
+                scope.row.activity_type != 2
+              "
+              type="text"
+              size="small"
+              class="mr10"
+              @click="edit(scope.row.order_id)"
+              >编辑</el-button
+            >
+            <el-button
+              v-if="
+                (scope.row.order_type == 0 || scope.row.order_type == 2) &&
+                scope.row.status === 0 &&
+                scope.row.paid === 1
+              "
+              type="text"
+              size="small"
+              class="mr10"
+              @click="send(scope.row, scope.row.order_id)"
+              >发送货</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              class="mr10"
+              @click="onOrderDetails(scope.row.order_id)"
+              >订单详情</el-button
+            >
+            <el-button
+              v-if="scope.row.is_del !== 0"
+              type="text"
+              size="small"
+              class="mr10"
+              @click.native="handleDelete(scope.row, scope.$index)"
+              >删除</el-button
+            >
+            <el-button
+              v-if="
+                scope.row.order_type == 1 &&
+                scope.row.status === 0 &&
+                scope.row.paid === 1
+              "
+              type="text"
+              size="small"
+              class="mr10"
+              @click.native="orderCancellation(scope.row.verify_code)"
+              >去核销</el-button
+            >
+
             <!-- <el-dropdown trigger="click">
               <span class="el-dropdown-link">
                 更多
@@ -232,29 +583,80 @@
         </el-table-column>
       </el-table>
       <div class="block">
-        <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
       </div>
     </el-card>
 
     <!--记录-->
     <el-dialog title="操作记录" :visible.sync="dialogVisible" width="700px">
-      <el-table v-loading="LogLoading" border :data="tableDataLog.data" style="width: 100%">
-        <el-table-column prop="order_id" align="center" label="订单ID" min-width="80" />
-        <el-table-column prop="change_message" label="操作记录" align="center" min-width="280" />
-        <el-table-column prop="change_time" label="操作时间" align="center" min-width="280" />
+      <el-table
+        v-loading="LogLoading"
+        border
+        :data="tableDataLog.data"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="order_id"
+          align="center"
+          label="订单ID"
+          min-width="80"
+        />
+        <el-table-column
+          prop="change_message"
+          label="操作记录"
+          align="center"
+          min-width="280"
+        />
+        <el-table-column
+          prop="change_time"
+          label="操作时间"
+          align="center"
+          min-width="280"
+        />
       </el-table>
       <div class="block">
-        <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFromLog.limit" :current-page="tableFromLog.page" layout="total, sizes, prev, pager, next, jumper" :total="tableDataLog.total" @size-change="handleSizeChangeLog" @current-change="pageChangeLog" />
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFromLog.limit"
+          :current-page="tableFromLog.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableDataLog.total"
+          @size-change="handleSizeChangeLog"
+          @current-change="pageChangeLog"
+        />
       </div>
     </el-dialog>
     <!--编辑-->
     <el-dialog title="修改订单" :visible.sync="editVisible" width="700px">
-      <el-form ref="formValidate" :model="formValidate" label-width="120px" @submit.native.prevent>
+      <el-form
+        ref="formValidate"
+        :model="formValidate"
+        label-width="120px"
+        @submit.native.prevent
+      >
         <el-form-item label="订单总价：">
-          <el-input-number v-model="formValidate.total_price" :min="0" placeholder="请输入订单总价" @change="changePrice" />
+          <el-input-number
+            v-model="formValidate.total_price"
+            :min="0"
+            placeholder="请输入订单总价"
+            @change="changePrice"
+          />
         </el-form-item>
         <el-form-item label="实际支付邮费：">
-          <el-input-number v-model="formValidate.pay_postage" :min="0" placeholder="请输入订单油费" @change="changePrice" />
+          <el-input-number
+            v-model="formValidate.pay_postage"
+            :min="0"
+            placeholder="请输入订单油费"
+            @change="changePrice"
+          />
         </el-form-item>
         <el-form-item label="优惠金额">
           <span>{{ formValidate.coupon_price }}</span>
@@ -268,38 +670,80 @@
       </span>
     </el-dialog>
     <!--发送货-->
-    <el-dialog :title="isBatch ? '批量发货':'订单发送货'" :visible.sync="sendVisible" width="800px" :before-close="handleClose">
-      <el-form ref="shipment" :model="shipment" :rules="rules" label-width="120px" @submit.native.prevent>
-        <el-form-item v-if="isResend && noLogistics != 3 && tableFrom.order_type != 2" :label="shipment.delivery_type == 1 || shipment.delivery_type == 4 ? '原快递公司：' : '送货人姓名：'">
+    <el-dialog
+      :title="isBatch ? '批量发货' : '订单发送货'"
+      :visible.sync="sendVisible"
+      width="800px"
+      :before-close="handleClose"
+    >
+      <el-form
+        ref="shipment"
+        :model="shipment"
+        :rules="rules"
+        label-width="120px"
+        @submit.native.prevent
+      >
+        <el-form-item
+          v-if="isResend && noLogistics != 3 && tableFrom.order_type != 2"
+          :label="
+            shipment.delivery_type == 1 || shipment.delivery_type == 4
+              ? '原快递公司：'
+              : '送货人姓名：'
+          "
+        >
           <span>{{ original.delivery_name }}</span>
         </el-form-item>
-        <el-form-item v-if="isResend && noLogistics != 3 && tableFrom.order_type != 2" :label="shipment.delivery_type == 1 || shipment.delivery_type == 4 ? '原快递单号：' : '送货人手机号：'">
+        <el-form-item
+          v-if="isResend && noLogistics != 3 && tableFrom.order_type != 2"
+          :label="
+            shipment.delivery_type == 1 || shipment.delivery_type == 4
+              ? '原快递单号：'
+              : '送货人手机号：'
+          "
+        >
           <span>{{ original.delivery_id }}</span>
         </el-form-item>
         <el-form-item label="选择类型：" prop="delivery_type">
           <el-radio-group v-model="shipment.delivery_type" @change="changeSend">
-            <el-radio v-if="!isBatch && tableFrom.order_type != 2 && orderType != 1" :label="1">手动发货</el-radio>
+            <el-radio :label="6">扫码发货</el-radio>
+            <!-- <el-radio v-if="!isBatch && tableFrom.order_type != 2 && orderType != 1" :label="1">手动发货</el-radio>
             <el-radio :label="3" class="radio"> {{orderType == 1 ? '虚拟发货' : '无需物流'}}</el-radio>
             <el-radio v-if="isDump==1 && tableFrom.order_type != 2 && orderType !=1" :label="4" class="radio">电子面单打印</el-radio>
             <el-radio v-if="tableFrom.order_type != 2 && orderType !=1" :label="2">自己配送</el-radio>
-            <el-radio v-if="tableFrom.order_type != 2 && orderType !=1 && !isBatch" :label="5">同城配送</el-radio>
+            <el-radio v-if="tableFrom.order_type != 2 && orderType !=1 && !isBatch" :label="5">同城配送</el-radio> -->
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 5 && tableFrom.order_type != 2 && orderType !=1" label="选择发货点：" prop="station_id">
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 5 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="选择发货点："
+          prop="station_id"
+        >
           <el-select
             v-model="shipment.station_id"
             placeholder="请选择配送发货点"
             class="filter-item selWidth mr20"
           >
             <el-option
-              v-for="(item,index) in storeList"
-              :key="item.value+index"
+              v-for="(item, index) in storeList"
+              :key="item.value + index"
               :label="item.label"
               :value="item.value"
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="(shipment.delivery_type == 1 || shipment.delivery_type == 4) && tableFrom.order_type != 2 && orderType !=1" label="快递公司：" prop="delivery_name">
+        <el-form-item
+          v-if="
+            (shipment.delivery_type == 1 || shipment.delivery_type == 4) &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="快递公司："
+          prop="delivery_name"
+        >
           <el-select
             filterable
             v-model="shipment.delivery_name"
@@ -315,46 +759,151 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 5 && tableFrom.order_type != 2 && orderType !=1" label="包裹重量(kg)：" prop="cargo_weight">
-          <el-input-number v-model="shipment.cargo_weight"  placeholder="请输入包裹重量" />
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 5 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="包裹重量(kg)："
+          prop="cargo_weight"
+        >
+          <el-input-number
+            v-model="shipment.cargo_weight"
+            placeholder="请输入包裹重量"
+          />
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 5 && tableFrom.order_type != 2 && orderType !=1" label="配送备注：" >
-          <el-input type="textarea" v-model="shipment.mark"  placeholder="请输入配送单备注" />
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 5 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="配送备注："
+        >
+          <el-input
+            type="textarea"
+            v-model="shipment.mark"
+            placeholder="请输入配送单备注"
+          />
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 1 && tableFrom.order_type != 2 && orderType !=1" label="快递单号：" prop="delivery_id">
-          <el-input v-model="shipment.delivery_id" placeholder="请输入快递单号" />
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 1 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="快递单号："
+          prop="delivery_id"
+        >
+          <el-input
+            v-model="shipment.delivery_id"
+            placeholder="请输入快递单号"
+          />
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 4 && tableFrom.order_type != 2 && orderType !=1" label="电子面单：" prop="temp_id">
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 4 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="电子面单："
+          prop="temp_id"
+        >
           <el-select
             v-model="shipment.temp_id"
             placeholder="请选择电子面单"
             class="filter-item selWidth mr20"
           >
             <el-option
-              v-for="(item,index) in eleTempsLst"
-              :key="item.temp_id+index"
+              v-for="(item, index) in eleTempsLst"
+              :key="item.temp_id + index"
               :label="item.title"
               :value="item.temp_id"
             />
           </el-select>
           <el-button type="text" @click="getPicture()">预览</el-button>
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 4 && tableFrom.order_type != 2 && orderType !=1" label="寄件人姓名：" prop="from_name">
-          <el-input v-model="shipment.from_name" placeholder="请输入寄件人姓名" />
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 4 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="寄件人姓名："
+          prop="from_name"
+        >
+          <el-input
+            v-model="shipment.from_name"
+            placeholder="请输入寄件人姓名"
+          />
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 4 && tableFrom.order_type != 2 && orderType !=1" label="寄件人电话：" prop="from_tel">
-          <el-input v-model="shipment.from_tel" placeholder="请输入寄件人电话" />
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 4 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="寄件人电话："
+          prop="from_tel"
+        >
+          <el-input
+            v-model="shipment.from_tel"
+            placeholder="请输入寄件人电话"
+          />
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 2 && tableFrom.order_type != 2 && orderType !=1" label="送货人姓名：" prop="to_name">
-          <el-input v-model="shipment.to_name"  maxlength="10" placeholder="请输入送货人姓名" />
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 2 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="送货人姓名："
+          prop="to_name"
+        >
+          <el-input
+            v-model="shipment.to_name"
+            maxlength="10"
+            placeholder="请输入送货人姓名"
+          />
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 2 && tableFrom.order_type != 2 && orderType !=2" label="送货人手机号：" prop="to_phone">
-          <el-input v-model="shipment.to_phone" placeholder="请输入送货人手机号" />
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 2 &&
+            tableFrom.order_type != 2 &&
+            orderType != 2
+          "
+          label="送货人手机号："
+          prop="to_phone"
+        >
+          <el-input
+            v-model="shipment.to_phone"
+            placeholder="请输入送货人手机号"
+          />
         </el-form-item>
-        <el-form-item v-if="shipment.delivery_type == 4 && tableFrom.order_type != 2 && orderType !=1" label="寄件人地址：" prop="from_addr">
-          <el-input v-model="shipment.from_addr" type="textarea" placeholder="请输入寄件人地址" />
+        <el-form-item
+          v-if="
+            shipment.delivery_type == 4 &&
+            tableFrom.order_type != 2 &&
+            orderType != 1
+          "
+          label="寄件人地址："
+          prop="from_addr"
+        >
+          <el-input
+            v-model="shipment.from_addr"
+            type="textarea"
+            placeholder="请输入寄件人地址"
+          />
         </el-form-item>
-        <el-form-item v-if="shipment.type != 4 && activityType != 2 && (productList.length > 1 || productNum > 1)" label="分单发货：">
+        <el-form-item
+          v-if="
+            shipment.type != 4 &&
+            activityType != 2 &&
+            (productList.length > 1 || productNum > 1)
+          "
+          label="分单发货："
+        >
           <el-switch
             v-model="shipment.is_split"
             :active-value="1"
@@ -362,69 +911,140 @@
             active-text="开启"
             inactive-text="关闭"
           />
-          <p class="area-desc">可选择表格中的商品单独发货，发货后会生成新的订单且不能撤回，请谨慎操作！</p>
+          <p class="area-desc">
+            可选择表格中的商品单独发货，发货后会生成新的订单且不能撤回，请谨慎操作！
+          </p>
         </el-form-item>
-        <el-form-item v-if="shipment.is_split == 1 && tableFrom.order_type != 2 && (productList.length > 1 || productNum > 1)" label="">
+        <el-form-item
+          v-if="
+            shipment.is_split == 1 &&
+            tableFrom.order_type != 2 &&
+            (productList.length > 1 || productNum > 1)
+          "
+          label=""
+        >
           <el-table
-                ref="multipleSelection"
-                :data="productList"
-                tooltip-effect="dark"
-                size="mini"
-                :row-key="(row) => { return row.product_id }"
-                @selection-change="handleSelectionChange"
-              >
-                <el-table-column align="center" type="selection" :reserve-selection="true" min-width="50"/>
-                <el-table-column align="center" label="商品信息" min-width="200">
-                  <template slot-scope="scope">
-                    <div class="acea-row" style="align-items: center;">
-                      <div class="demo-image__preview">
-                        <el-image :src="scope.row.cart_info.product.image" :preview-src-list="[scope.row.cart_info.product.image]" />
-                      </div>
-                      <span class="priceBox" style="width: 150px;">{{scope.row.cart_info.product.store_name}}</span>
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="规格" min-width="80">
-                  <template slot-scope="scope">
-                    <span class="priceBox">{{scope.row.cart_info.productAttr.sku}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="商品售价" min-width="80">
-                  <template slot-scope="scope">
-                    <span class="priceBox">{{scope.row.cart_info.productAttr.price}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="总数" min-width="80">
-                  <template slot-scope="scope">
-                    <span class="priceBox">{{scope.row.stock_num}}</span>
-                  </template>
-                </el-table-column>                    
-                <el-table-column label="待发数量" align="center" min-width="120">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row['product_num_input']"
-                      type="number"
-                      :min="0"
-                      :max="scope.row.refund_num"
-                      class="priceBox"
-                      @blur="limitCount(scope.row)"
-                    />  
-                  </template>
-                </el-table-column>
-              </el-table>
+            ref="multipleSelection"
+            :data="productList"
+            tooltip-effect="dark"
+            size="mini"
+            :row-key="
+              (row) => {
+                return row.product_id;
+              }
+            "
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column
+              align="center"
+              type="selection"
+              :reserve-selection="true"
+              min-width="50"
+            />
+            <el-table-column align="center" label="商品信息" min-width="200">
+              <template slot-scope="scope">
+                <div class="acea-row" style="align-items: center">
+                  <div class="demo-image__preview">
+                    <el-image
+                      :src="scope.row.cart_info.product.image"
+                      :preview-src-list="[scope.row.cart_info.product.image]"
+                    />
+                  </div>
+                  <span class="priceBox" style="width: 150px">{{
+                    scope.row.cart_info.product.store_name
+                  }}</span>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="规格" min-width="80">
+              <template slot-scope="scope">
+                <span class="priceBox">{{
+                  scope.row.cart_info.productAttr.sku
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="商品售价" min-width="80">
+              <template slot-scope="scope">
+                <span class="priceBox">{{
+                  scope.row.cart_info.productAttr.price
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="总数" min-width="80">
+              <template slot-scope="scope">
+                <span class="priceBox">{{ scope.row.stock_num }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="待发数量" align="center" min-width="120">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row['product_num_input']"
+                  type="number"
+                  :min="0"
+                  :max="scope.row.refund_num"
+                  class="priceBox"
+                  @blur="limitCount(scope.row)"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
         </el-form-item>
-        <el-form-item  label="备注：" prop="remark">
-          <el-input v-model="shipment.remark" type="textarea" placeholder="请输入备注" />
+        <el-form-item
+          v-if="shipment.delivery_type == 6"
+          label="取件码："
+          prop="remark"
+        >
+          <el-image
+            :src="orderSendQrCode"
+            style="width: 200px; height: 200px; background-color: #efefef"
+          >
+            <template #error>
+              <div
+                style="
+                  width: 100%;
+                  height: 100%;
+                  display: flex;
+                  justify-content: center;
+                  align-items: center;
+                  color: #333;
+                  font-size: 30px;
+                "
+              >
+                <el-icon style="font-size: 30px"><icon-picture /></el-icon>
+              </div>
+            </template>
+          </el-image>
+        </el-form-item>
+        <el-form-item
+          v-if="shipment.delivery_type != 6"
+          label="备注："
+          prop="remark"
+        >
+          <el-input
+            v-model="shipment.remark"
+            type="textarea"
+            placeholder="请输入备注"
+          />
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span
+        slot="footer"
+        class="dialog-footer"
+        v-if="shipment.delivery_type != 6"
+      >
         <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" @click="submitForm('shipment')">提交</el-button>
+        <el-button type="primary" @click="submitForm('shipment')"
+          >提交</el-button
+        >
       </span>
     </el-dialog>
     <!--电子面单预览-->
-    <el-dialog v-if="pictureVisible" :visible.sync="pictureVisible" width="500px">
-      <img :src="pictureUrl" class="pictures">
+    <el-dialog
+      v-if="pictureVisible"
+      :visible.sync="pictureVisible"
+      width="500px"
+    >
+      <img :src="pictureUrl" class="pictures" />
     </el-dialog>
     <!--详情-->
     <order-detail
@@ -476,6 +1096,7 @@ import {
   exprTempsLst,
   getEleTempData,
   getDeliveryStoreLst,
+  getLogisticsCode
 } from '@/api/order'
 import createWorkBook from '@/utils/newToExcel.js'
 import { serveInfoApi } from '@/api/setting'
@@ -495,11 +1116,12 @@ export default {
     deliveryRecord,
     orderCancellate
   },
-  data() {
+  data () {
     return {
       fileUrl: SettingMer.https + '/store/import/delivery',
       myHeaders: { 'X-Token': getToken() },
       orderId: 0,
+      orderSendQrCode: '',
       tableData: {
         data: [],
         total: 0
@@ -598,8 +1220,8 @@ export default {
       shipment: {
         delivery_type: 1,
         station_id: '',
-        is_split:"0",
-        split:[]
+        is_split: "0",
+        split: []
       },
       original: {
         delivery_name: '',
@@ -656,7 +1278,7 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     if (this.$route.query.hasOwnProperty('order_sn')) {
       this.tableFrom.order_sn = this.$route.query.order_sn
     } else {
@@ -671,26 +1293,26 @@ export default {
     this.getStoreList()
   },
   methods: {
-    limitCount(row) {
-      if (row.stock > row.product_num)row.stock = row.product_num
+    limitCount (row) {
+      if (row.stock > row.product_num) row.stock = row.product_num
     },
-    changeDrawer(v) {
+    changeDrawer (v) {
       this.drawer = v;
     },
-    closeDrawer() {
+    closeDrawer () {
       this.drawer = false;
     },
     // 分单发货选择商品
-    handleSelectionChange(val) {
+    handleSelectionChange (val) {
       this.multipleSelection = val
       const data = []
       this.multipleSelection.map((item) => {
-        data.push({id:item.order_product_id,num:item.product_num})
+        data.push({ id: item.order_product_id, num: item.product_num })
       })
       this.ids = data
     },
     // 是否开启电子面单
-    isOpenDump() {
+    isOpenDump () {
       serveInfoApi().then((res) => {
         this.isDump = res.data.crmeb_serve_dump
         if (res.data.crmeb_serve_dump == 1) this.getEleTempData()
@@ -699,7 +1321,7 @@ export default {
       })
     },
     // 获取快递公司列表
-    getExpressLst() {
+    getExpressLst () {
       expressLst().then((res) => {
         this.deliveryList = res.data
       }).catch((res) => {
@@ -707,13 +1329,13 @@ export default {
       })
     },
     // 获取电子面单列表
-    getTempsLst(name) {
+    getTempsLst (name) {
       exprTempsLst({ com: name }).then((res) => {
         this.eleTempsLst = res.data.data
       })
     },
     // 获取电子面单默认数据
-    getEleTempData() {
+    getEleTempData () {
       getEleTempData().then((res) => {
         const data = res.data
         const delivery_type = this.shipment.delivery_type
@@ -725,32 +1347,32 @@ export default {
           delivery_name: data.mer_from_com,
           temp_id: data.mer_config_temp_id
         }
-        if(data.mer_from_com != ''){
+        if (data.mer_from_com != '') {
           this.getTempsLst(data.mer_from_com)
         }
-        
+
       })
         .catch((res) => {
           this.$message.error(res.message)
         })
     },
     //获取门店列表
-    getStoreList() {
+    getStoreList () {
       getDeliveryStoreLst().then((res) => {
         this.storeList = res.data
       }).catch((res) => {
         this.$message.error(res.message)
       })
     },
-    changeSend(e) {
+    changeSend (e) {
       this.$refs['shipment'].clearValidate();
-      if(e == 3){
+      if (e == 3) {
         //如果是无需配送，就重置拆单信息
         this.shipment.is_split = '0';
         delete this.shipment.split;
       }
     },
-    getPicture(name) {
+    getPicture (name) {
       if (this.shipment.temp_id) {
         this.eleTempsLst.forEach((o, i) => {
           if (o['temp_id'] == this.shipment.temp_id) {
@@ -763,7 +1385,7 @@ export default {
       }
     },
     // 批量发送货
-    batchSend() {
+    batchSend () {
       if (this.checkedIds.length == 0) {
         return this.$message.warning('请先选择订单')
       } else {
@@ -773,15 +1395,15 @@ export default {
         this.shipment.order_id = this.checkedIds
       }
     },
-    handleClose() {
+    handleClose () {
       this.sendVisible = false
       this.$refs['shipment'].resetFields()
     },
-    onHandle(name) {
+    onHandle (name) {
       this.chkName = this.chkName === name ? '' : name
       this.changeType(!(this.chkName === ''))
     },
-    changeType(v) {
+    changeType (v) {
       if (v) {
         if (!this.chkName) {
           this.chkName = 'dan'
@@ -798,7 +1420,7 @@ export default {
       }
       this.syncCheckedId()
     },
-    syncCheckedId() {
+    syncCheckedId () {
       const ids = this.tableData.data.map(v => v.order_id)
       if (this.chkName === 'duo') {
         this.checkedIds = []
@@ -821,7 +1443,7 @@ export default {
       }
     },
     // 分开选择
-    changeOne(v, row) {
+    changeOne (v, row) {
       if (v) {
         if (this.chkName === 'duo') {
           const index = this.noChecked.indexOf(row.order_id)
@@ -841,7 +1463,7 @@ export default {
       }
     },
     // 头部
-    getHeaderList() {
+    getHeaderList () {
       orderHeadListApi()
         .then((res) => {
           this.headeNum = res.data
@@ -851,7 +1473,7 @@ export default {
         })
     },
     // 订单筛选
-    orderFilter(item) {
+    orderFilter (item) {
       let status = false
       item.orderProduct.forEach((el) => {
         if (el.refund_num < el.product_num) {
@@ -861,7 +1483,7 @@ export default {
       return status
     },
     // 退款详情页
-    onRefundDetail(sn) {
+    onRefundDetail (sn) {
       this.$router.push({
         path: 'refund',
         query: {
@@ -870,7 +1492,7 @@ export default {
       })
     },
     // 表格某一行添加特定的样式
-    addTdClass(val) {
+    addTdClass (val) {
       if (val.row.status > 0 && val.row.paid == 1) {
         for (let i = 0; i < val.row.orderProduct.length; i++) {
           if (val.row.orderProduct[i].refund_num >= 0 && val.row.orderProduct[i].refund_num < val.row.orderProduct[i].product_num) {
@@ -882,7 +1504,7 @@ export default {
       }
     },
     // 详情
-    onOrderDetails(id) {
+    onOrderDetails (id) {
       this.orderId = id
       this.$refs.orderDetail.getInfo(id);
       this.drawer = true;
@@ -890,25 +1512,25 @@ export default {
       // this.$refs.orderDetail.onOrderDetails(id)
       // this.$refs.orderDetail.onOrderLog(id)
     },
-    async exports(value) {
+    async exports (value) {
       let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = []
       excelData.page = 1
-      excelData.ids = this.checkedIds.toString() 
+      excelData.ids = this.checkedIds.toString()
       let pageCount = 1
       let lebData = {};
       for (let i = 0; i < pageCount; i++) {
         lebData = value == 1 ? await this.downOrderData(excelData) : await this.downInvoiceData(excelData)
-        pageCount = Math.ceil(lebData.count/excelData.limit)
+        pageCount = Math.ceil(lebData.count / excelData.limit)
         if (lebData.export.length) {
           data = data.concat(lebData.export)
           excelData.page++
-        }  
+        }
       }
-      createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
+      createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
       return
     },
     /**订单 */
-    downOrderData(excelData) {
+    downOrderData (excelData) {
       return new Promise((resolve, reject) => {
         exportOrderApi(excelData).then((res) => {
           return resolve(res.data)
@@ -916,7 +1538,7 @@ export default {
       })
     },
     /**发货单 */
-    downInvoiceData(excelData) {
+    downInvoiceData (excelData) {
       return new Promise((resolve, reject) => {
         exportInvoiceApi(excelData).then((res) => {
           return resolve(res.data)
@@ -969,11 +1591,11 @@ export default {
     //   this.$refs.exportList.exportFileList()
     // },
     // 批量发货记录
-    getDeliveryList() {
+    getDeliveryList () {
       this.$refs.deliveryList.getList()
     },
     // 上传成功
-    handleSuccess(response) {
+    handleSuccess (response) {
       if (response.status === 200) {
         this.$message.success(response.message)
       } else {
@@ -981,18 +1603,18 @@ export default {
       }
     },
     // 下载物流公司对照表
-    downloadLogistics() {
+    downloadLogistics () {
       window.open(SettingMer.https + `/excel/download/express?token=` + getToken())
     },
     // 订单核销
-    orderCancellation(code) {
+    orderCancellation (code) {
       const that = this
       that.$refs.orderCancellate.dialogVisible = true;
-      if(code) {
-         that.$refs.orderCancellate.productDetails(code)
-         that.$refs.orderCancellate.isColum = true;
-      }else{
-         that.$refs.orderCancellate.isColum = false;
+      if (code) {
+        that.$refs.orderCancellate.productDetails(code)
+        that.$refs.orderCancellate.isColum = true;
+      } else {
+        that.$refs.orderCancellate.isColum = false;
       }
       // this.$prompt('', '提示', {
       //   confirmButtonText: '立即核销',
@@ -1014,7 +1636,7 @@ export default {
 
     },
     // 去核销
-    handleCancellation(code) {
+    handleCancellation (code) {
       this.$confirm('确定核销此订单?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1039,7 +1661,7 @@ export default {
         })
     },
     // 订单记录
-    onOrderLog(id) {
+    onOrderLog (id) {
       this.dialogVisible = true
       this.LogLoading = true
       orderLogApi(id, this.tableFromLog)
@@ -1053,16 +1675,16 @@ export default {
           this.LogLoading = false
         })
     },
-    pageChangeLog(page) {
+    pageChangeLog (page) {
       this.tableFromLog.page = page
       this.getList('')
     },
-    handleSizeChangeLog(val) {
+    handleSizeChangeLog (val) {
       this.tableFromLog.limit = val
       this.getList('')
     },
     // 打印订单
-    printOrder(id) {
+    printOrder (id) {
       orderPrintApi(id)
         .then((res) => {
           this.$message.success(res.message)
@@ -1072,7 +1694,7 @@ export default {
         })
     },
     // 订单删除
-    handleDelete(row, idx) {
+    handleDelete (row, idx) {
       if (row.is_del === 1) {
         this.$modalSure().then(() => {
           orderDeleteApi(row.order_id)
@@ -1092,32 +1714,32 @@ export default {
         this.$confirm(
           '您选择的的订单存在用户未删除的订单，无法删除用户未删除的订单！',
           '提示', {
-            confirmButtonText: '确定',
-            type: 'error'
-          }
+          confirmButtonText: '确定',
+          type: 'error'
+        }
         )
       }
     },
     // 备注
-    onOrderMark(id) {
+    onOrderMark (id) {
       this.$modalForm(orderRemarkApi(id)).then(() => this.getList(''))
     },
     // 选择时间
-    selectChange(tab) {
+    selectChange (tab) {
       this.timeVal = []
       this.tableFrom.date = tab
       this.getCardList()
       this.getList(1)
     },
     // 具体日期
-    onchangeTime(e) {
+    onchangeTime (e) {
       this.timeVal = e
       this.tableFrom.date = e ? this.timeVal.join('-') : ''
       this.getCardList()
       this.getList(1)
     },
     // 编辑
-    edit(id) {
+    edit (id) {
       this.editId = id
       this.editVisible = true
       orderDetailApi(id).then(res => {
@@ -1133,7 +1755,7 @@ export default {
         this.$message.error(message)
       })
     },
-    editConfirm() {
+    editConfirm () {
       orderUpdateApi(this.editId, this.formValidate).then(res => {
         this.editVisible = false
         this.$message.success(res.message)
@@ -1142,11 +1764,11 @@ export default {
         this.$message.error(message)
       })
     },
-    changePrice() {
+    changePrice () {
       this.formValidate.pay_price = (this.formValidate.total_price + this.formValidate.pay_postage - this.formValidate.coupon_price).toFixed(2)
     },
     // 发货
-    send(row,id) {
+    send (row, id) {
       this.isBatch = false
       this.sendVisible = true
       this.isResend = false
@@ -1155,14 +1777,18 @@ export default {
       this.orderType = row.is_virtual
       this.shipment.delivery_type = this.orderType === 1 ? 3 : 1
       row.orderProduct.forEach(item => {
-          item.stock_num = item.product_num
+        item.stock_num = item.product_num
+      })
+      getLogisticsCode(id).then((res) => {
+        this.orderSendQrCode = res.data.qrcode;
       })
       this.productList = row.orderProduct
-      this.productNum  = row.orderProduct && row.orderProduct[0] && row.orderProduct[0]['product_num'] || 0
+      this.productNum = row.orderProduct && row.orderProduct[0] && row.orderProduct[0]['product_num'] || 0
       delete this.shipment.order_id
-      if(this.tableFrom.order_type == 2)this.shipment.delivery_type = 3
+      if (this.tableFrom.order_type == 2) this.shipment.delivery_type = 3
+      this.shipment.delivery_type = 6
     },
-    sendReset() {
+    sendReset () {
       this.shipment = {
         delivery_type: 1,
         delivery_name: '',
@@ -1174,7 +1800,7 @@ export default {
       }
     },
     // 修改发货信息
-    reSend(id) {
+    reSend (id) {
       this.isBatch = false
       this.sendVisible = true
       this.orderId = id
@@ -1195,18 +1821,18 @@ export default {
         this.$message.error(message)
       })
     },
-    submitForm(name) {
+    submitForm (name) {
       if (this.shipment.delivery_type == 2) {
         this.shipment.delivery_name = this.shipment.to_name
         this.shipment.delivery_id = this.shipment.to_phone
       }
-      if(this.shipment.is_split != '0' && this.shipment.is_split && this.orderType != 2){ 
+      if (this.shipment.is_split != '0' && this.shipment.is_split && this.orderType != 2) {
         if (!this.multipleSelection.length) {
           return this.$message.warning('请选择拆单商品!')
         }
         const data = []
         this.multipleSelection.map((item) => {
-          data.push({id:item.order_product_id,num:item.product_num_input})
+          data.push({ id: item.order_product_id, num: item.product_num_input })
         })
         this.ids = data
         this.shipment.split = this.ids
@@ -1241,7 +1867,7 @@ export default {
       })
     },
     // 列表
-    getList(num) {
+    getList (num) {
       this.listLoading = true
       this.tableFrom.page = num || this.tableFrom.page
       orderListApi(this.tableFrom)
@@ -1261,7 +1887,7 @@ export default {
           this.listLoading = false
         })
     },
-    getCardList() {
+    getCardList () {
       cardListApi(this.tableFrom)
         .then((res) => {
           this.cardLists = res.data
@@ -1270,15 +1896,15 @@ export default {
           this.$message.error(res.message)
         })
     },
-    pageChange(page) {
+    pageChange (page) {
       this.tableFrom.page = page
       this.getList('')
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.tableFrom.limit = val
       this.getList('')
     },
-    headerList() {
+    headerList () {
       chartApi()
         .then((res) => {
           this.orderChartType = res.data
@@ -1292,59 +1918,59 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.pictures{
-    max-width: 100%;
+.pictures {
+  max-width: 100%;
 }
-.area-desc{
-    margin: 0;
-    color: #999;
-    font-size: 12px;
+.area-desc {
+  margin: 0;
+  color: #999;
+  font-size: 12px;
 }
 .selWidth {
-    width: 300px;
+  width: 300px;
 }
 .spBlock {
-    cursor: pointer;
-    display: block;
-    padding: 5px 0;
+  cursor: pointer;
+  display: block;
+  padding: 5px 0;
 }
 .check {
-    color: #00a2d4;
+  color: #00a2d4;
 }
 .el-dropdown-link {
-    cursor: pointer;
-    color: #409eff;
-    font-size: 12px;
+  cursor: pointer;
+  color: #409eff;
+  font-size: 12px;
 }
 .el-icon-arrow-down {
-    font-size: 12px;
+  font-size: 12px;
 }
 .tabBox_tit {
-    width: 53%;
-    font-size: 12px !important;
-    margin: 0 2px 0 10px;
-    letter-spacing: 1px;
-    padding: 5px 0;
-    box-sizing: border-box;
+  width: 53%;
+  font-size: 12px !important;
+  margin: 0 2px 0 10px;
+  letter-spacing: 1px;
+  padding: 5px 0;
+  box-sizing: border-box;
 }
 /deep/.row-bg {
-    .cell {
-        color: red !important;
-    }
+  .cell {
+    color: red !important;
+  }
 }
-.headTab{
-    position: relative;
-    .headBtn{
-        position: absolute;
-        right: 0;
-        top: -6px;
-    }
+.headTab {
+  position: relative;
+  .headBtn {
+    position: absolute;
+    right: 0;
+    top: -6px;
+  }
 }
-.dropdown{
-    padding: 0 10px;
-    border: 1px solid #409eff;
-    margin-right: 10px;
-    line-height: 28px;
-    border-radius: 4px;
+.dropdown {
+  padding: 0 10px;
+  border: 1px solid #409eff;
+  margin-right: 10px;
+  line-height: 28px;
+  border-radius: 4px;
 }
 </style>
diff --git a/src/views/order/orderCancellate.vue b/src/views/order/orderCancellate.vue
index 8051be6..3fcd92f 100644
--- a/src/views/order/orderCancellate.vue
+++ b/src/views/order/orderCancellate.vue
@@ -4,56 +4,87 @@
       v-if="dialogVisible"
       title="订单核销"
       :visible.sync="dialogVisible"
-      width="900px"
+      width="1000px"
     >
       <div class="container">
-          <el-form label-width="80px" size="small">
-            <el-form-item v-if="!isColum" label="核销码：">
-              <el-input v-model="code" placeholder="请输入核销码查询订单号和商品" class="selWidth" size="small" @keyup.enter.native="searchOrder" /> 
-              <el-button size="small" type="primary" @click="searchOrder">搜索</el-button>         
-            </el-form-item>
-            <el-form-item label="订单号：">
-              <span>{{orderData.order_sn}}</span>
-            </el-form-item>
-          </el-form>
-          <div style="margin-top: 20px;">
-            <el-table
-              ref="multipleSelection"
-              :data="productList"
-              tooltip-effect="dark"
-              size="mini"
-              :row-key="(row) => { return row.product_id }"
-              @selection-change="handleSelectionChange"
-              :header-cell-style="{background:'#F0F5FF'}"
+        <el-form label-width="80px" size="small">
+          <el-form-item v-if="!isColum" label="核销码：">
+            <el-input
+              v-model="code"
+              placeholder="请输入核销码查询订单号和商品"
+              class="selWidth"
+              size="small"
+              @keyup.enter.native="searchOrder"
+            />
+            <el-button size="small" type="primary" @click="searchOrder"
+              >搜索</el-button
             >
-            <el-table-column align="center" type="selection" :reserve-selection="true" min-width="50"/>
+          </el-form-item>
+          <el-form-item label="订单号：">
+            <span>{{ orderData.order_sn }}</span>
+          </el-form-item>
+        </el-form>
+        <div style="margin-top: 20px">
+          <el-table
+            ref="multipleSelection"
+            :data="productList"
+            :default-selection="[0]"
+            size="mini"
+            :row-key="
+              (row) => {
+                return row.product_id;
+              }
+            "
+            @selection-change="handleSelectionChange"
+            :header-cell-style="{ background: '#F0F5FF' }"
+          >
+            <el-table-column
+              align="center"
+              type="selection"
+              :reserve-selection="true"
+              min-width="50"
+            />
             <el-table-column align="center" label="商品信息" min-width="200">
               <template slot-scope="scope">
-                <div class="acea-row" style="align-items: center;">
+                <div class="acea-row" style="align-items: center">
                   <div class="demo-image__preview">
-                    <el-image :src="scope.row.cart_info.product.image" :preview-src-list="[scope.row.cart_info.product.image]" />
+                    <el-image
+                      :src="scope.row.cart_info.product.image"
+                      :preview-src-list="[scope.row.cart_info.product.image]"
+                    />
                   </div>
-                  <span class="priceBox" style="width: 150px;">{{scope.row.cart_info.product.store_name}}</span>
+                  <span class="priceBox" style="width: 150px">{{
+                    scope.row.cart_info.product.store_name
+                  }}</span>
                 </div>
               </template>
             </el-table-column>
             <el-table-column align="center" label="规格" min-width="80">
               <template slot-scope="scope">
-                <span class="priceBox">{{scope.row.cart_info.productAttr.sku}}</span>
+                <span class="priceBox">{{
+                  scope.row.cart_info.productAttr.sku
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="订单金额" min-width="80">
               <template slot-scope="scope">
-                <span class="priceBox">{{scope.row.cart_info.productAttr.price}}</span>
+                <span class="priceBox">{{
+                  scope.row.cart_info.productAttr.price
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="状态" min-width="80">
               <template slot-scope="scope">
                 <span class="priceBox">待核销</span>
               </template>
-            </el-table-column> 
-            <el-table-column align="center" prop="product_num" label="总数" min-width="80" />                 
-            <el-table-column label="待核销数量" align="center" min-width="120">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="product_num"
+              label="总数"
+              min-width="80"
+            />
+            <!-- <el-table-column label="待核销数量" align="center" min-width="120">
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row['refund_num']"
@@ -62,18 +93,24 @@
                   :max="scope.row.max_num"
                   class="priceBox"
                   @change="limitNum(scope.row)"
-                />  
+                />
+              </template>
+            </el-table-column> -->
+            <el-table-column label="核销码" align="center" min-width="180">
+              <template slot-scope="scope">
+                <el-input v-model="verify_code" class="priceBox" />
               </template>
             </el-table-column>
           </el-table>
-          </div>
-        </div> 
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false" size="small">取消</el-button>
-          <el-button type="primary" @click="handleCancellation" size="small">核销</el-button>
-        </span>    
-    </el-dialog> 
-
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="small">取消</el-button>
+        <el-button type="primary" @click="handleCancellation" size="small"
+          >核销</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -87,15 +124,16 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-import { orderCancellationApi, goCancellationApi  } from '@/api/order'
+import { orderCancellationApi, goCancellationApi } from '@/api/order'
 
 export default {
   name: 'OrderCancellate',
-  data() {
+  data () {
     return {
       dialogVisible: false,
       loading: false,
       code: '',
+      verify_code: '', //核销码
       order_id: "",
       orderData: "",
       multipleSelection: [],
@@ -105,14 +143,14 @@ export default {
     }
   },
   methods: {
-    searchOrder() {
-      if(!this.code){
+    searchOrder () {
+      if (!this.code) {
         return this.$message.warning('输入核销码!')
       }
-      this.productDetails(this.code)
+      this.productDetails(this.code, true)
     },
-    handleCancellation() {
-      if(!this.code){
+    handleCancellation () {
+      if (!this.verify_code) {
         return this.$message.warning('输入核销码!')
       }
       if (!this.multipleSelection.length) {
@@ -120,40 +158,46 @@ export default {
       }
       const data = []
       this.multipleSelection.map((item) => {
-        data.push({id:item.order_product_id,num:item.refund_num})
+        data.push({ id: item.order_product_id, num: item.refund_num })
       })
-      goCancellationApi(this.order_id,{verify_code: this.code,data: data}).then(res => {
-         this.$message.success(res.message)
-         this.dialogVisible = false
-         this.$emit('getList','')
+      goCancellationApi(this.order_id, { verify_code: this.verify_code, data: data }).then(res => {
+        this.$message.success(res.message)
+        this.dialogVisible = false
+        this.$emit('getList', '')
       }).catch(({ message }) => {
         this.$message.error(message)
       })
     },
-    productDetails(code) {
-      this.code = code
+    productDetails (code, type = false) {
+      if (type) this.code = code
+      else {
+        this.code = "";
+        this.verify_code = "";
+      }
       this.loading = true
       orderCancellationApi(code).then(res => {
         this.orderData = res.data
         this.order_id = res.data.order_id
+        if (type) this.verify_code = res.data.verify_code
         this.productList = res.data.orderProduct
-        this.productList.forEach((item, index)=>{
+        this.productList.forEach((item, index) => {
           item.max_num = item.refund_num
         })
         this.loading = false
+        this.$refs.multipleSelection.toggleAllSelection()
       }).catch(({ message }) => {
         this.loading = false
         this.$message.error(message)
       })
     },
-     // 选择商品
-    handleSelectionChange(val) {
+    // 选择商品
+    handleSelectionChange (val) {
       this.multipleSelection = val
     },
-    limitNum(row){
-      if(row.refund_num > row.max_num){
+    limitNum (row) {
+      if (row.refund_num > row.max_num) {
         row.refund_num = row.max_num
-      }else if(row.refund_num < 1){
+      } else if (row.refund_num < 1) {
         row.refund_num = 1
       }
     }
@@ -162,10 +206,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.selWidth{
+.selWidth {
   width: 330px;
 }
-.title{
+.title {
   margin-bottom: 16px;
   color: #17233d;
   font-weight: 500;