支付单号，删除订单

2023-12-08 10:35:24 +08:00
parent 3a2e92b82d
commit 2489d1a17b
2 changed files with 1221 additions and 1109 deletions
--- a/src/views/modules/order/buyorder.vue
+++ b/src/views/modules/order/buyorder.vue
@@ -24,23 +24,21 @@
      <!-- <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder:delete')" type="primary" @click="printHandle(dataListSelections)"
                :disabled="dataListSelections.length <= 0" >批量打印</el-button> -->
    </div>
-    <div style="margin-bottom: 10px; float:left;  margin-right: 15px" v-if="tabChange.isPrint == '1' && tabChange.tabActiveName == 2">
+    <div style="margin-bottom: 10px; float:left;  margin-right: 15px"
+      v-if="tabChange.isPrint == '1' && tabChange.tabActiveName == 2">
      <el-radio v-model="tabChange.sheetCode" :label="0" border size="mini">全部</el-radio>
      <el-radio v-model="tabChange.sheetCode" :label="2" border size="mini">未打印</el-radio>
      <el-radio v-model="tabChange.sheetCode" :label="1" border size="mini">已打印</el-radio>
    </div>
    <div style="margin-bottom: 10px; float:left;">
-      <el-form v-if="tabChange.isPrint == '1'" :inline="true" size="mini" :model="MdDataForm" @keyup.enter.native="getDataList()">
+      <el-form v-if="tabChange.isPrint == '1'" :inline="true" size="mini" :model="MdDataForm"
+        @keyup.enter.native="getDataList()">
        <el-form-item>
          <div class="block">
            <!-- <el-date-picker size="mini" value-format="timestamp" v-model="" type="datetimerange" :picker-options="timePickerOptions"
            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" @change="test">
          </el-date-picker> -->
-          <el-date-picker
-          v-model="MdDataForm.date"
-          type="date"
-          format="yyyy 年 MM 月 dd 日"
-          value-format="yyyy-MM-dd"
+            <el-date-picker v-model="MdDataForm.date" type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd"
              placeholder="选择日期">
            </el-date-picker>
          </div>
@@ -54,18 +52,24 @@
      </el-form>
    </div>

-    <el-form v-if="tabChange.isPrint != '1'" :inline="true" size="mini" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form v-if="tabChange.isPrint != '1'" :inline="true" size="mini" :model="dataForm"
+      @keyup.enter.native="getDataList()">
      <el-form-item>
        <el-input style="width:200px" v-model="dataForm.key" placeholder="订单编号/收件人姓名/手机号" clearable></el-input>
      </el-form-item>
+      <el-form-item>
+        <el-input style="width:120px" v-model="dataForm.productName" placeholder="商品名称" clearable></el-input>
+      </el-form-item>
      <!-- 按时间筛选 -->
      <el-form-item>
        <div class="block">
-          <el-date-picker size="mini" value-format="timestamp" v-model="dataForm.time" type="datetimerange" :picker-options="timePickerOptions"
-            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" @change="test">
+          <el-date-picker size="mini" value-format="timestamp" v-model="dataForm.time" type="datetimerange"
+            :picker-options="timePickerOptions" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+            align="right" @change="test">
          </el-date-picker>
        </div>
      </el-form-item>
+
      <el-form-item>
        <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
      </el-form-item>
@@ -74,14 +78,15 @@
      <!-- <el-checkbox :disabled="multipleDisabled" :indeterminate="checkboxGroup.isIndeterminate"
        v-model="checkboxGroup.checkAll" v-if="tabChange.tabActiveName == 1" class="checkAll showLabel"
        @change="handleCheckAllChange">全选</el-checkbox> -->
-      <!-- <span v-if="tabChange.tabActiveName == 3">
+      <!-- <span v-if="tabChange.tabActiveName == 0||tabChange.tabActiveName == 1" style="display: inline-block;margin-bottom: 20px;">
        <el-button size="mini" v-if="isAuth('book:buyorder:delete')" type="danger" @click="deleteHandle()"
-          :disabled="dataListSelections.length <= 0">批量删除</el-button>
+          :disabled="dataListSelections.length <= 0">{{tabChange.tabActiveName}}批量删除</el-button>
      </span> -->
-      <span style="" v-if="tabChange.tabActiveName == 1">
+      <span style="" v-if="tabChange.tabActiveName == 1" style="display: inline-block;margin-bottom: 20px;">
        <el-badge :value="mergeList.length" class="item">
          <router-link :to="{ path: 'buyorder-mergeorder', query: {} }">
-          <el-button style="" size="mini" v-if="isAuth('book:buyorder')" type="primary" :disabled="mergeList.length > 0 ? false : true">合并发货</el-button>
+            <el-button style="" size="mini" v-if="isAuth('book:buyorder')" type="primary"
+              :disabled="mergeList.length > 0 ? false : true">合并发货</el-button>
          </router-link>
        </el-badge>
      </span>
@@ -97,8 +102,8 @@
    <!-- 更新样式 -->
    <!--面单列表  -->
    <div class="order_list_ui paper_list_ui" v-if="tabChange.tabActiveName == 2 && tabChange.isPrint == 1">
-      <el-table border v-loading="sheetListLoading" :data="PrintSheetList" stripe @selection-change="SheetSelectionChangeHandle"
-        style="width: 100%">
+      <el-table border v-loading="sheetListLoading" :data="PrintSheetList" stripe
+        @selection-change="SheetSelectionChangeHandle" style="width: 100%">
        <el-table-column type="selection" width="55">
        </el-table-column>
        <el-table-column label="运单号" prop="expressOrderSn"></el-table-column>
@@ -117,13 +122,14 @@
            <!-- <router-link :to="{ path: 'buyorder-print', query: { orderId: scope.row.orderId } }">
              <el-button size="mini" type="primary" plain>打印面单</el-button>     跳转到详情页面
            </router-link> -->
-            <el-button size="mini" type="primary" plain @click="printHandle(scope.row.expressOrderSn,scope.row)">打印面单</el-button>
+            <el-button size="mini" type="primary" plain
+              @click="printHandle(scope.row.expressOrderSn,scope.row)">打印面单</el-button>
            <!-- <el-button size="mini" type="danger" plain @click="deleteVoid">面单作废</el-button> -->
          </template>
        </el-table-column>
      </el-table>
-      <el-pagination @size-change="sheetSizeChangeHandle" @current-change="currentSheetChangeHandle" :current-page="sheetPageIndex"
-      :page-sizes="[40, 60, 100, 150]" :page-size="sheetPageSize" :total="MDtotal"
+      <el-pagination @size-change="sheetSizeChangeHandle" @current-change="currentSheetChangeHandle"
+        :current-page="sheetPageIndex" :page-sizes="[40, 60, 100, 150]" :page-size="sheetPageSize" :total="MDtotal"
        layout="total, sizes, prev, pager, next, jumper">
      </el-pagination>
    </div>
@@ -149,10 +155,13 @@
                  <span><span class="infoTitle">订单编号：</span>{{ fitem.orderSn }} </span>
                  <span style="margin-left: 20px;">
                    <span class="infoTitle">下单时间：</span>{{ fitem.createTime }}</span>
-                    <router-link :to="{ path: 'order-buyorderdetail', query: { orderSn: fitem.orderSn , ordertype: fitem.orderStatus} }" style="margin-left:20px">
+                  <router-link
+                    :to="{ path: 'order-buyorderdetail', query: { orderSn: fitem.orderSn , ordertype: fitem.orderStatus} }"
+                    style="margin:0 5px 0 20px">
                    <el-button type="warning" style="" size="mini" plain>订单详情</el-button>
                  </router-link>
-                    <!-- <el-button type="danger" style="" size="mini" plain @click="deleteHandle(fitem.orderId)">删除订单</el-button>  -->
+                  <el-button type="danger" style="" size="mini" plain
+                    @click="deleteOrder(fitem)">删除订单</el-button>
                </el-col>
                <el-col :span="6">
                  <div class="tip">
@@ -170,18 +179,25 @@
            <div class="item_body">
              <div class="flexbox" style="justify-content: space-between;">
                <div class="td1 flexbox" style="width:600px; align-items: flex-start; flex-wrap: wrap;">
-                  <div v-show="fitem.orderType == 'order'" class="flexbox orderProducts" :class="{ nobottomBorder: fitem.goodsList.length <= 3 }"
+                  <div v-show="fitem.orderType == 'order'" class="flexbox orderProducts"
+                    :class="{ nobottomBorder: fitem.goodsList.length <= 3 }"
                    v-for="(children, index2) in fitem.goodsList" :key="children.id" style="width: 50%;">
-                    <el-tooltip class="item" v-if="children.expressInfo && children.expressInfo.expressOrderSn != null" effect="light" :content="`快递信息：${children.expressInfo.expressCompany} ${children.expressInfo.expressOrderSn}`"
+                    <el-tooltip class="item" v-if="children.expressInfo && children.expressInfo.expressOrderSn != null"
+                      effect="light"
+                      :content="`快递信息：${children.expressInfo.expressCompany} ${children.expressInfo.expressOrderSn}`"
                      placement="right">
                      <span class="normal hasDeliver"></span>
                    </el-tooltip>
                    <div class=" productItem k4545">
-                      <img  :class="children.expressInfo && children.expressInfo.expressOrderSn != null ? 'greeyImg' : 'lightImg'" :src="children.productImage" width="60px" height="60px">
+                      <img
+                        :class="children.expressInfo && children.expressInfo.expressOrderSn != null ? 'greeyImg' : 'lightImg'"
+                        :src="children.productImage" width="60px" height="60px">
                    </div>
                    <div class="price " style="flex:1">
                      <div class="bookName">{{ children.productName }} &nbsp;
-                        <i v-if="children.books && children.books.length > 0" @click.stop="seeBooks(children.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></div>
+                        <i v-if="children.books && children.books.length > 0" @click.stop="seeBooks(children.books)"
+                          class="el-icon-view" style="color:#409eff; cursor: pointer;"></i>
+                      </div>
                      <div><span>￥{{ children.productPrice }}</span> × {{ children.quantity }} </div>

                    </div>
@@ -218,13 +234,18 @@
                    <div></div>
                    <div v-if="fitem.paymentMethod == 1"><icon-svg name="weixin"></icon-svg> 微信支付</div>
                    <div v-if="fitem.paymentMethod == 2"><icon-svg name="zhifubao"></icon-svg> 支付宝支付</div>
-                    <div v-if="fitem.paymentMethod == 4"><img  src="../../../../static/img/oder_chong.png"  width="22px" height="22px">天医币支付</div>
+                    <div v-if="fitem.paymentMethod == 4"><img src="../../../../static/img/oder_chong.png" width="22px"
+                        height="22px">天医币支付</div>
                  </div>
                </div>
                <div class="buier td3 xcenter">
                  <div class="tabName">收货信息：
-                    <div style="color: #515a6e;"><span style="color: #515a6e;">{{ fitem.consignee.consigneeName }}</span>&nbsp;&nbsp;&nbsp;<span style="color: #515a6e;">{{ fitem.consignee.consigneeMobile }}</span></div>
-                    <div style="color: #515a6e;">{{ fitem.consignee.province }}-{{ fitem.consignee.city }}-{{ fitem.consignee.county }}-{{ fitem.consignee.address }}</div>
+                    <div style="color: #515a6e;"><span
+                        style="color: #515a6e;">{{ fitem.consignee.consigneeName }}</span>&nbsp;&nbsp;&nbsp;<span
+                        style="color: #515a6e;">{{ fitem.consignee.consigneeMobile }}</span></div>
+                    <div style="color: #515a6e;">
+                      {{ fitem.consignee.province }}-{{ fitem.consignee.city }}-{{ fitem.consignee.county }}-{{ fitem.consignee.address }}
+                    </div>
                    <div style="margin-bottom:10px">
                      <el-button @click="changeAddressShow(fitem)" type="primary" size="mini" plain>修改收货信息</el-button>
                      <!-- <a href="#"  v-if="fitem.orderStatus <= 1"><i class="el-icon-edit"></i>修改收货信息</a> -->
@@ -243,8 +264,8 @@
                    <!-- <div class="tabContent">
                          <div class="time">支付时间：2023-02-09 14:16:08</div>
                        </div> -->
-                    <div><el-button style=" line-height: 6px;" type="primary" size="mini" @click="orderDeliver(fitem)"
-                        >发货</el-button>
+                    <div><el-button style=" line-height: 6px;" type="primary" size="mini"
+                        @click="orderDeliver(fitem)">发货</el-button>
                    </div>
                  </div>
                </div>
@@ -286,19 +307,19 @@
      </el-table-column>
      <!-- <el-table-column prop="userName" header-align="center" align="center" label="下单人姓名">
      </el-table-column> -->
-       <el-table-column
-            prop="shippingUser"
-            header-align="center"
-            align="center"
-            label="收货人信息">
+      <el-table-column prop="shippingUser" header-align="center" align="center" label="收货人信息">
        <template slot-scope="scope">
-              <span v-if="scope.row.consignee.consigneeName && scope.row.consignee.consigneeName != ''">{{scope.row.consignee.consigneeName}}</span>
+          <span
+            v-if="scope.row.consignee.consigneeName && scope.row.consignee.consigneeName != ''">{{scope.row.consignee.consigneeName}}</span>
          <span v-else>暂无</span>
          -<span>{{scope.row.consignee.consigneeMobile}}</span><br />
          <span>{{scope.row.consignee.province}}</span>
-              <span v-if="scope.row.consignee.city && scope.row.consignee.city != ''">-</span><span>{{scope.row.consignee.city}}</span>
-              <span v-if="scope.row.consignee.county && scope.row.consignee.county != ''">-</span><span>{{scope.row.consignee.county}}</span>
-              <span v-if="scope.row.consignee.address && scope.row.consignee.address != ''">-</span><span>{{scope.row.consignee.address}}</span>
+          <span
+            v-if="scope.row.consignee.city && scope.row.consignee.city != ''">-</span><span>{{scope.row.consignee.city}}</span>
+          <span
+            v-if="scope.row.consignee.county && scope.row.consignee.county != ''">-</span><span>{{scope.row.consignee.county}}</span>
+          <span
+            v-if="scope.row.consignee.address && scope.row.consignee.address != ''">-</span><span>{{scope.row.consignee.address}}</span>
        </template>
      </el-table-column>
      <!--<el-table-column
@@ -366,11 +387,13 @@
          <div v-for="(item, index) in scope.row.goodsList" :key="index">
            <div class="flexbox" style="align-items:center; margin-bottom:10px">
              <div class="img">
-                 <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.productImage" width="40px" height="40px">
+                <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.productImage"
+                  width="40px" height="40px">
              </div>
              <div>
                <span>{{item.productName}} [ ￥{{item.productPrice}} × {{item.quantity}} ]
-                  <i v-if="item.books && item.books.length > 0" @click.stop="seeBooks(item.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></span>
+                  <i v-if="item.books && item.books.length > 0" @click.stop="seeBooks(item.books)" class="el-icon-view"
+                    style="color:#409eff; cursor: pointer;"></i></span>
              </div>
            </div>
          </div>
@@ -391,9 +414,12 @@
          </el-table-column> -->
      <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
        <template slot-scope="scope">
-          <router-link :to="{ path: 'order-buyorderdetail', query: { orderSn: scope.row.orderSn, ordertype: scope.row.orderStatus} }">
+          <router-link
+            :to="{ path: 'order-buyorderdetail', query: { orderSn: scope.row.orderSn, ordertype: scope.row.orderStatus} }">
            <el-button type="text" size="small">订单详情</el-button>
          </router-link>
+          <el-button type="text" size="small" @click="deleteOrder(scope.row)" v-if="tabChange.tabActiveName ==0"
+            style="color: #f11f3b;">删除</el-button>
          <!-- <span v-if="scope.row.orderStatus">
            <el-button type="text" size="small" @click="deliverDetail(scope.row)"
              v-if="isAuth('book:buyorderdetail:deliver')">物流详情</el-button>
@@ -413,9 +439,9 @@
              <el-dropdown-item>
                <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.orderId)">修改</el-button>
              </el-dropdown-item>
-              <el-dropdown-item>
+              <!-- <el-dropdown-item>
                <el-button type="text" size="small" @click="deleteHandle(scope.row.orderId)">删除</el-button>
-              </el-dropdown-item>
+              </el-dropdown-item> -->
            </el-dropdown-menu>
          </el-dropdown>
          <span>
@@ -425,11 +451,7 @@
        </template>
      </el-table-column>
    </el-table>
-    <el-dialog
-      title="修改收货信息"
-      :visible.sync="changeAddVisible"
-      width="500"
-      v-loading="addressLoad"
+    <el-dialog title="修改收货信息" :visible.sync="changeAddVisible" width="500" v-loading="addressLoad"
      :close="changeAddHandleClose">
      <div>
        <el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule">
@@ -443,27 +465,19 @@
            <!-- <el-input v-model="addressForm.address"></el-input> -->
            <!-- 省市区-->
            <!-- 省 -->
-            <el-select  v-model="addressForm.provinceCode" placeholder="请选择省份" style="width:200px" @change="provinceChange">
-              <el-option
-                v-for="item in provinceEntity"
-                :key="item.regionCode"
-                :label="item.provName"
+            <el-select v-model="addressForm.provinceCode" placeholder="请选择省份" style="width:200px"
+              @change="provinceChange">
+              <el-option v-for="item in provinceEntity" :key="item.regionCode" :label="item.provName"
                :value="item.regionCode">
              </el-option>
            </el-select>
            <el-select v-model="addressForm.cityCode" placeholder="请选择市" @change="cityChange">
-              <el-option
-                v-for="item in cityEntity.cityList"
-                :key="item.regionCode"
-                :label="item.cityName"
+              <el-option v-for="item in cityEntity.cityList" :key="item.regionCode" :label="item.cityName"
                :value="item.regionCode">
              </el-option>
            </el-select>
            <el-select v-model="addressForm.countyCode" placeholder="请选择区" @change="countyChange">
-              <el-option
-                v-for="item in countyEntity.countyList"
-                :key="item.regionCode"
-                :label="item.countyName"
+              <el-option v-for="item in countyEntity.countyList" :key="item.regionCode" :label="item.countyName"
                :value="item.regionCode">
              </el-option>
            </el-select>
@@ -478,17 +492,14 @@
        <el-button type="primary" @click="changeAddress">确 定</el-button>
      </span>
    </el-dialog>
-    <el-dialog center
-      title="商品包含的书籍信息"
-      :visible.sync="booksShow"
-      width="500"
-      :close="booksHandleClose">
+    <el-dialog center title="商品包含的书籍信息" :visible.sync="booksShow" width="500" :close="booksHandleClose">
      <div>
        <span>该商品共包含了 {{currBookLIst.length}} 个书籍</span>
        <ul class="booksUl ">
          <li class="flexbox" v-for="item in currBookLIst" :key="item.id">
            <div class="img">
-              <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.images" width="100px" height="100px">
+              <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.images" width="100px"
+                height="100px">
            </div>
            <div>
              <span>{{item.name}}[{{item.id}}]</span>
@@ -500,8 +511,8 @@
        <el-button type="primary" @click="booksHandleClose">确 定</el-button>
      </span>
    </el-dialog>
-    <el-pagination v-if="tabChange.isPrint != 1" @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
-      :page-sizes="[40, 60, 100, 150]" :page-size="pageSize" :total="totalPage"
+    <el-pagination v-if="tabChange.isPrint != 1" @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+      :current-page="pageIndex" :page-sizes="[40, 60, 100, 150]" :page-size="pageSize" :total="totalPage"
      layout="total, sizes, prev, pager, next, jumper">
    </el-pagination>
    <!-- 弹窗, 新增 / 修改 -->
@@ -513,8 +524,9 @@
    <setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="checkedOrders"
      @closeDeliverDialog='closeDeliverDialog'></setDeliverDialog>
    <!-- 设置备注 -->
-    <updateOrderBeiZhu ref="updateOrderBeiZhu" :orderId="oprateOrder.orderId" :orderSn="oprateOrder.orderSn" :visible="editBeizhudialogVisible"
-      :editBeizhuform="editBeizhuform" @closeDialog='closeBeizhuDialog' @refreshDataList="getDataList">
+    <updateOrderBeiZhu ref="updateOrderBeiZhu" :orderId="oprateOrder.orderId" :orderSn="oprateOrder.orderSn"
+      :visible="editBeizhudialogVisible" :editBeizhuform="editBeizhuform" @closeDialog='closeBeizhuDialog'
+      @refreshDataList="getDataList">
    </updateOrderBeiZhu>
    <!-- 单个订单发货 -->
    <splitDeliver :orderitem="oprateOrder" :visible="splitDeliverVisible" @closeDialog='closeOrder1Dialog'>
@@ -535,8 +547,6 @@
 </template>

 <script>
-
-
  import updateOrderBeiZhu from './orderbeizhu-add-or-update'
  import anyDialog from './anyDialog'
  import splitDeliver from './orderdeliver-split'
@@ -557,7 +567,8 @@ export default {
        orderInfo: {},
        dataForm: {
          key: '',
-        time: ''
+          time: '',
+          productName: ''
        },
        PrintSheetList: [], //打印列表
        sheetListLoading: false,
@@ -646,21 +657,31 @@ export default {
        countyEntity: [], // 区
        changeAddVisible: false,
        addressFormRule: {
-        name: [
-            { required: true, message: '请输入收货人信息', trigger: 'blur' }
-          ],
-          tel: [
-            { required: true, message: '请输入收货联系电话信息', trigger: 'blur' }
-          ],
-          county: [
-            { required: true, message: '请选择收货地址', trigger: 'blur' }
-          ],
-          addressXX: [
-            { required: true, message: '请输入详细地址信息', trigger: 'blur' }
-          ],
-          haveValue:[
-            { required: true, message: '请选择要修改的省市区', trigger: 'blur' }
-          ]
+          name: [{
+            required: true,
+            message: '请输入收货人信息',
+            trigger: 'blur'
+          }],
+          tel: [{
+            required: true,
+            message: '请输入收货联系电话信息',
+            trigger: 'blur'
+          }],
+          county: [{
+            required: true,
+            message: '请选择收货地址',
+            trigger: 'blur'
+          }],
+          addressXX: [{
+            required: true,
+            message: '请输入详细地址信息',
+            trigger: 'blur'
+          }],
+          haveValue: [{
+            required: true,
+            message: '请选择要修改的省市区',
+            trigger: 'blur'
+          }]
        },
        SheetSelectionList: [],
        addressLoad: false, // 省份加载动画
@@ -712,7 +733,9 @@ export default {
                "countyCode": this.addressForm.countyCode,
                //'orderId': this.addressForm.orderId
              })
-              }).then(({ data }) => {
+            }).then(({
+              data
+            }) => {
              // console.log('修改地址返回值', data)
              this.$message.success('修改地址成功！')
              this.changeAddHandleClose()
@@ -782,7 +805,9 @@ export default {
          // params: this.$http.adornParams({
          //   'orderId': this.query.orderId
          // })
-      }).then(({ data }) => {
+        }).then(({
+          data
+        }) => {
          // console.log('获取地址三级列表', data)
          if (data.code == 0) {
            this.addressForm.orderSn = val.orderSn
@@ -839,7 +864,9 @@ export default {
            "date": this.MdDataForm.date, //string类型,非必传字段2023-10-30
            "expressOrderSn": "" //string类型，非必传字段
          })
-      }).then(({ data }) => {
+        }).then(({
+          data
+        }) => {
          // console.log(data.page.records,'面单列表')
          if (data && data.code === 0 && data.page.records.length > 0) {
            this.PrintSheetList = data.page.records
@@ -849,7 +876,9 @@ export default {
            this.MDtotal = 0
          }
          this.sheetListLoading = false
-      }).catch(({e}) => {
+        }).catch(({
+          e
+        }) => {
          console.log(e, 'e')
          this.sheetListLoading = false
        })
@@ -916,13 +945,16 @@ export default {
          // }),
          data: this.$http.adornData({
            "searchKeyWord": this.dataForm.key,
+            "productName": this.dataForm.productName,
            "startTime": this.dataForm.time[0],
            "endTime": this.dataForm.time[1],
            "orderStatus": this.tabChange.tabActiveName,
            "pageIndex": this.pageIndex,
            "pageSize": this.pageSize,
          })
-      }).then(({ data }) => {
+        }).then(({
+          data
+        }) => {
          // console.log(data,'列表数据')
          if (data && data.code === 0) {
            this.dataList = data.result.data
@@ -992,7 +1024,9 @@ export default {
            url: this.$http.adornUrl('/book/buyOrder/delete'),
            method: 'post',
            data: this.$http.adornData(ids, false)
-        }).then(({ data }) => {
+          }).then(({
+            data
+          }) => {
            if (data && data.code === 0) {
              this.$message({
                message: '操作成功',
@@ -1008,6 +1042,37 @@ export default {
          })
        })
      },
+      // 删除订单
+      deleteOrder(row) {
+        console.log(row)
+        this.$confirm(`确定对订单编号${row.orderSn}进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/book/buyOrder/orderDel'),
+            method: 'post',
+            params: this.$http.adornParams({
+              'orderSn': row.orderSn
+            })
+          }).then(({
+            data
+          }) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.$message({
+                message: '删除成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        })
+      },
      // 点击展示备注信息
      openShutManager(oSourceObj, oTargetObj, shutAble, oOpenTip, oShutTip) {
        var sourceObj = typeof oSourceObj == "string" ? document.getElementById(oSourceObj) : oSourceObj;
@@ -1113,17 +1178,21 @@ export default {
          this.$http({
            url: this.$http.adornUrl('/express/printTemplate'),
            method: 'post',
-        data:
-          printids
+            data: printids

-      }).then(({ data }) => {
+          }).then(({
+            data
+          }) => {
            if (data.code == 0) {
              // console.log(data,'data')
              this.selectedPrintList = []
              this.SheetSelectionList = []
              this.getPrintSheetList()
-          loading.close()  }
-      }).catch(({e}) => {
+              loading.close()
+            }
+          }).catch(({
+            e
+          }) => {
            this.selectedPrintList = []
            this.SheetSelectionList = []
            console.log(e, 'e')
@@ -1173,8 +1242,7 @@ export default {
          // 点确定时
          this.mergeList = this.checkedOrders
          this.setDeliverVisible = true
-      }).catch(() => {
-      });
+        }).catch(() => {});

      },
      // 单个订单发货
@@ -1202,7 +1270,9 @@ export default {
          params: this.$http.adornParams({
            'orderId': orderid,
          })
-      }).then(({ data }) => {
+        }).then(({
+          data
+        }) => {
          if (data && data.code === 0) {
            this.orderInfo = data.buyOrder
          } else {
@@ -1253,10 +1323,13 @@ export default {
        handler(val, oldVal) {
          //console.log(val)
          this.getDataList()
-        if (this.tabChange.tabActiveName === '' || this.tabChange.tabActiveName === '0' || this.tabChange.tabActiveName === '1' || this.tabChange.tabActiveName === '3') {
+          if (this.tabChange.tabActiveName === '' || this.tabChange.tabActiveName === '0' || this.tabChange
+            .tabActiveName === '1' || this.tabChange.tabActiveName === '3') {
            this.tabChange.isPrint = '0'
          }
-        if (this.tabChange.isPrint === '1') { this.getPrintSheetList() }
+          if (this.tabChange.isPrint === '1') {
+            this.getPrintSheetList()
+          }

        },
        deep: true
@@ -1282,14 +1355,27 @@ export default {
  }
 </style>
 <style lang="less" scoped>
-.booksUl{ overflow: hidden; margin-top: 15px; padding-left: 0;
-  li{list-style: none; width: 50%; float: left; align-items: center; margin-bottom: 15px;}
+  .booksUl {
+    overflow: hidden;
+    margin-top: 15px;
+    padding-left: 0;
+
+    li {
+      list-style: none;
+      width: 50%;
+      float: left;
+      align-items: center;
+      margin-bottom: 15px;
    }
+  }
+
  .flexbox {
    display: flex;
  }

  .order_list_ui {
+
+
    * {
      font-size: 12px;
      //color: #777;
@@ -1298,6 +1384,7 @@ export default {
    ul {
      color: #515a6e;
      padding: 0;
+      margin-top: 0;

      li {
        list-style: none;
@@ -1343,8 +1430,15 @@ export default {
    .price {
      // width: 40px;
      line-height: 14px;
-    span{color: #E6A23C; font-size: 14px;}
-    .bookName{margin-bottom: 5px;}
+
+      span {
+        color: #E6A23C;
+        font-size: 14px;
+      }
+
+      .bookName {
+        margin-bottom: 5px;
+      }
    }

    .num {
@@ -1389,9 +1483,15 @@ export default {
  .normal {
    display: none;
  }
-.detailsFonts{font-size: 12px;
-  span{display: block;}
+
+  .detailsFonts {
+    font-size: 12px;
+
+    span {
+      display: block;
    }
+  }
+
  .hasDeliver {
    display: block;
    width: 20px;
@@ -1488,7 +1588,11 @@ export default {
      // margin-top: 15px;
    }
  }
-.greeyImg{filter: grayscale(100%);}
+
+  .greeyImg {
+    filter: grayscale(100%);
+  }
+
  .td5 {
    padding: 5px;
    line-height: 24px;
@@ -1514,7 +1618,7 @@ export default {
    }
  }

-.buttonGroup { height: 32px;
+  .buttonGroup {
    .el-checkbox {
      margin-right: 10px;
    }
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -44,6 +44,14 @@
            <span>IOS内购</span>
          </span>
        </li>
+        <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2">
+          <span class="infoTitle">商家订单号：</span>
+          <span>{{orderDetails.outTradeNo}}</span>
+        </li>
+        <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2">
+          <span class="infoTitle">支付宝订单号：</span>
+          <span>{{orderDetails.tradeNo}}</span>
+        </li>
        <li class="line"></li>
        <div style="clear:both"></div>
        <div v-if="orderDetails.orderStatus > 0">