zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小班、自考证书合并列表导出功能，培训班管理可在3个app中选择显示模块

Browse Source
This commit is contained in:
liuyuan
2025-06-27 15:05:41 +08:00
parent 2c89e36035
commit 4f52d8377d
6 changed files with 395 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
src/views/modules/order/buyorder.vue
View File

@@ -6,24 +6,30 @@
<el-tab-pane label="电子书" name="1"> </el-tab-pane>
<el-tab-pane label="充值订单" name="2"></el-tab-pane>
</el-tabs> -->
<el-radio-group size="mini" v-model="tabChange.tabActiveName" style="margin-bottom: 10px;">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button label="0">待付款</el-radio-button>
<el-radio-button label="1">待发货</el-radio-button>
<el-radio-button label="2">已发货</el-radio-button>
<el-radio-button label="3">已完成</el-radio-button>
</el-radio-group>
<div style=" display: flex; margin-bottom: 15px;">
<el-radio-group size="mini" v-model="tabChange.tabActiveName">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button label="0">待付款</el-radio-button>
<el-radio-button label="1">待发货</el-radio-button>
<el-radio-button label="2">已发货</el-radio-button>
<el-radio-button label="3">已完成</el-radio-button>
</el-radio-group>
<div class="order_type_block" style=" display: none;">
<span>订单类型</span>
<el-select v-model="orderType" placeholder="请选择" style=" padding-left: 10px;">
<el-option label="VIP订单" value="1">VIP订单</el-option>
<el-option label="名医精彩订单" value="2">名医精彩订单</el-option>
<el-option label="普通订单" value="3">普通订单</el-option>
</el-select>
</div>
</div>
<div style="margin-bottom: 10px;">
<el-radio-group size="mini" v-model="tabChange.isPrint" v-if="tabChange.tabActiveName == 2">
<el-radio-button label="0">已发货订单</el-radio-button>
<el-radio-button label="1">打印面单</el-radio-button>
</el-radio-group>
<!-- <el-radio v-model="tabChange.isPrint" label="" border size="mini">全部</el-radio> -->
<!-- <el-radio v-model="tabChange.isPrint" label="1" border size="mini">已打印</el-radio>
<el-radio v-model="tabChange.isPrint" label="2" border size="mini">未打印</el-radio> -->
<!-- <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">
@@ -36,17 +42,11 @@
@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"
placeholder="选择日期">
</el-date-picker>
</div>
</el-form-item>
<!-- <el-form-item>
<el-input style="width:200px" v-model="MdDataForm.key" placeholder="订单编号/运单编号" clearable></el-input>
</el-form-item> -->
<el-form-item>
<el-button @click="pageIndex = 1;getPrintSheetList()">查询</el-button>
</el-form-item>
@@ -85,13 +85,6 @@
</el-form-item>
</el-form>
<div class="buttonGroup">
<!-- <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 == 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">{{tabChange.tabActiveName}}批量删除</el-button>
</span> -->
<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: {} }">
@@ -100,10 +93,6 @@
</router-link>
</el-badge>
</span>
<!-- <span style="" v-if="tabChange.tabActiveName == 1">
<el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="primary"
:disabled="checkedOrders.length <= 0" @click="checkDeliver">批量发货</el-button>
</span> -->
<span style="" v-if="tabChange.tabActiveName == 2 && tabChange.isPrint == 1">
<el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="warning"
:disabled="SheetSelectionList.length <= 0" @click="printHandle(null,null,'piliang')">批量打印</el-button>
@@ -127,14 +116,9 @@
</el-table-column>
<el-table-column width="280" label="操作">
<template slot-scope="scope">
<!-- <el-button type="text" size="mini" >查看面单</el-button> -->
<el-button size="mini" type="warning" plain @click="showAnyDialog(scope.row)">查看面单</el-button>
<!-- <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="danger" plain @click="deleteVoid">面单作废</el-button> -->
</template>
</el-table-column>
</el-table>
@@ -175,13 +159,8 @@
</el-col>
<el-col :span="6">
<div class="tip">
<div v-if="fitem.isSend == 1" class="hasSplit"><span style="color:#999">该订单已被拆分发货</span>
<!-- <el-button type="text" @click="showOrderSheet(fitem.orderId)" size="mini">查看面单</el-button> -->
<div v-if="fitem.isSend == 1" class="hasSplit"><span style="color:#999">该订单已被拆分发货</span> -->
</div>
<!-- <icon-svg name="zhuyi"></icon-svg> 订单存在可合并发货项 -->
<!-- <router-link :to="{ path: 'order-buyorderdetail', query: { orderId: fitem.orderId , ordertype: fitem.orderStatus} }">
<el-button type="primary" style="color: #515a6e;" size="mini">订单详情</el-button>
</router-link> -->
</div>
</el-col>
</el-row>
@@ -232,7 +211,6 @@
<div><span>￥{{ fitem.realMoney }}</span> × 1 </div>
</div>
</div>
<!-- <img v-if="fitem.orderType == 'vip'" src="../../../../static/img/oder_vip.png" width="60px" height="60px"> -->
</div>
<div class="total td2 xcenter">
<div class="tabName">商品合计：<em>￥{{ fitem.orderMoney }}</em></div>
@@ -240,7 +218,6 @@
<div class="tabName">实收：<em>￥{{ fitem.realMoney }}</em></div>
<div class="tabContent">
<div></div>
<!-- <div>含快递费：10.00，优惠券：{{ fitem.couponName }}，积分抵扣：-10.00</div> -->
<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>
@@ -248,27 +225,9 @@
height="22px">天医币支付</div>
</div>
<div>
<!-- <span v-if="fitem.user.vip==1">
<img style="width: 20px;height: 20px;" src="../../../assets/img/vip.png" alt="">
<el-tag size="mini" type="warning" style="font-weight: bold;" effect="dark">超级VIP</el-tag>
</span>
<span v-if="fitem.user.vip==2">
<img style="width: 20px;height: 20px;" src="../../../assets/img/wumen.png" alt="">
<el-tag size="mini" style="font-weight: bold;">吴门医述</el-tag>
</span>
<span v-if="fitem.user.vip==3">
<img style="width: 20px;height: 20px;" src="../../../assets/img/zm.png" alt="">
<el-tag size="mini" type="success" style="font-weight: bold;" >众秒之门</el-tag>
</span> -->
<span v-if="!fitem.user.userVips||fitem.user.userVips.length==0">-</span>
<span v-if="!fitem.user.userVips||fitem.user.userVips.length==0">-</span>
<span v-else v-html="computedVipType(fitem.user.userVips)">
<!-- <img style="width: 25px;height: 25px;" src="../../../assets/img/vip.png" alt=""> -->
</span>
<span v-else v-html="computedVipType(fitem.user.userVips)"></span>
</div>
</div>
<div class="buier td3 xcenter">
@@ -281,37 +240,24 @@
</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> -->
</div>
</div>
<div class="tabContent">
<!-- <div>用户id：{{ fitem.userId }}</div> -->
<!-- <div>收货地址：{{ fitem.address }}</div> -->
<!-- <div class="buier_tip">买家备注：尽快发货</div> -->
</div>
</div>
<div class="buier td4 xcenter flexbox" style="align-items: center; justify-content: center;">
<div>
<div class="orderStatus">待发货</div>
<!-- <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>
</div>
</div>
<div class="td5 flexbox" style="justify-content: center; align-items: center; width: 150px; text-align:center">
<!-- <div class="tabName" style="">备注信息：
<br/>
<span :style="fitem.remark != '' ? 'color: red' : 'color: #999'">{{ fitem.remark != '' ? fitem.remark : '无' }}</span></div> -->
<div style="margin-bottom: 15px; text-align: center;">
<div class="tabContent">
<span class="tabName">备注</span>
<!-- <el-button v-if="fitem.remark" size="mini" type="text"
@click="openShutManager(this, 'box' + index)">查看</el-button> -->
<span @click="editBeizhu(fitem)">
<icon-svg name="beizhu"
style="width: 14px; height:14px; margin-left: 10px; cursor: pointer;"></icon-svg>
@@ -334,11 +280,6 @@
v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50">
</el-table-column>
<!-- <el-table-column label="序号" width="70" align="center">
<template slot-scope="scope">
{{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
</template>
</el-table-column> -->
<el-table-column prop="orderSn" header-align="center" align="center" label="订单编号" width="150">
</el-table-column>
<el-table-column prop="userName" header-align="center" align="center" label="VIP" width="140">
@@ -346,22 +287,8 @@
<span v-if="!scope.row.user.userVips||scope.row.user.userVips.length==0">-</span>
<span v-else v-html="computedVipType(scope.row.user.userVips)">
<!-- <img style="width: 25px;height: 25px;" src="../../../assets/img/vip.png" alt=""> -->
</span>
<!-- <span v-if="scope.row.user.vip==2">
<img style="width: 25px;height: 25px;" src="../../../assets/img/wumen.png" alt="">
<el-tag size="mini" style="font-weight: bold;">吴门医述</el-tag>
</span>
<span v-if="scope.row.user.vip==3">
<img style="width: 25px;height: 25px;" src="../../../assets/img/zm.png" alt="">
<el-tag size="mini" type="success" style="font-weight: bold;" >众秒之门</el-tag>
</span> -->
</template>
</el-table-column>
<el-table-column prop="shippingUser" header-align="center" align="center" label="收货人信息">
@@ -743,7 +670,8 @@
SheetSelectionList: [],
addressLoad: false, // 省份加载动画
booksShow: false, // 展示包含书籍信息
currBookLIst: []
currBookLIst: [],
orderType: '', //订单类型
}
},
components: {
@@ -1747,4 +1675,16 @@ this.pageIndex = 1
.fengbi {
margin-left: 0 !important;
}
.order_type_block{
display: flex;
align-items: center;
justify-content: center;
margin-left: 40px;
}
/deep/ .order_type_block .el-input__inner{
height: 28px;
line-height: 28px;
font-size: 12px;
}
</style>