zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

master
夜良king 2023-04-19 10:34:43 +08:00
parent c8e8685586 73ce45aff9
commit 0883a967b6
3 changed files with 445 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
manager/src/views/order/order/fictitiousOrderList.vue
View File

@ -4,22 +4,10 @@
<Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<Form-item label="订单号" prop="orderSn">
<Input
type="text"
v-model="searchForm.orderSn"
placeholder="请输入订单号"
clearable
style="width: 200px"
/>
<Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 200px" />
</Form-item>
<Form-item label="会员名称" prop="buyerName">
<Input
type="text"
v-model="searchForm.buyerName"
placeholder="请输入会员名称"
clearable
style="width: 200px"
/>
<Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 200px" />
</Form-item>
<Form-item label="订单状态" prop="orderStatus">
<Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
@ -32,54 +20,30 @@
</Select>
</Form-item>
<Form-item label="下单时间">
<DatePicker
v-model="selectDate"
type="datetimerange"
format="yyyy-MM-dd"
clearable
@on-change="selectDateRange"
placeholder="选择起始时间"
style="width: 200px"
></DatePicker>
<DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable
@on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form>
</Row>
<Table
:loading="loading"
border
:columns="columns"
:data="data"
ref="table"
class="mt_10"
sortable="custom"
@on-sort-change="changeSort"
></Table>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10" sortable="custom"
@on-sort-change="changeSort"></Table>
<Row type="flex" justify="end" class="mt_10">
<Page
:current="searchForm.pageNumber"
:total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
@on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator
show-sizer></Page>
</Row>
</Card>
</div>
</template>
<script>
import * as API_Order from "@/api/order";
import * as API_Order from "@/api/order";
export default {
export default {
name: "fictitiousOrderList",
data() {
data () {
return {
loading: true, // 表单加载状态
searchForm: {
@ -148,18 +112,18 @@
{
title: "订单状态",
key: "orderStatus",
width:95,
width: 95,
render: (h, params) => {
if (params.row.orderStatus == "UNPAID") {
return h("div", [h("tag", {props: {color: "magenta"}}, "未付款")]);
return h("div", [h("tag", { props: { color: "magenta" } }, "未付款")]);
} else if (params.row.orderStatus == "PAID") {
return h("div", [h("tag", {props: {color: "blue"}}, "已付款")]);
return h("div", [h("tag", { props: { color: "blue" } }, "已付款")]);
} else if (params.row.orderStatus == "COMPLETED") {
return h("div", [h("tag", {props: {color: "green"}}, "已完成")]);
return h("div", [h("tag", { props: { color: "green" } }, "已完成")]);
} else if (params.row.orderStatus == "TAKE") {
return h("div", [h("tag", {props: {color: "volcano"}}, "待核验")]);
return h("div", [h("tag", { props: { color: "volcano" } }, "待核验")]);
} else if (params.row.orderStatus == "CANCELLED") {
return h("div", [h("tag", {props: {color: "red"}}, "已取消")]);
return h("div", [h("tag", { props: { color: "red" } }, "已取消")]);
}
}
},
@ -221,28 +185,28 @@
},
methods: {
// 初始化数据
init() {
init () {
this.getDataList();
},
// 分页 改变页码
changePage(v) {
changePage (v) {
this.searchForm.pageNumber = v;
this.getDataList();
},
// 分页 改变页数
changePageSize(v) {
changePageSize (v) {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = v;
this.getDataList();
},
// 搜索
handleSearch() {
handleSearch () {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
this.getDataList();
},
// 列表排序
changeSort(e) {
changeSort (e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
@ -251,14 +215,14 @@
this.getDataList();
},
// 起止时间从新赋值
selectDateRange(v) {
selectDateRange (v) {
if (v) {
this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1];
}
},
// 获取列表数据
getDataList() {
getDataList () {
this.loading = true;
API_Order.getOrderList(this.searchForm).then((res) => {
this.loading = false;
@ -271,14 +235,14 @@
this.loading = false;
},
//确认收款
confirmPrice(v) {
confirmPrice (v) {
this.$Modal.confirm({
title: "确认收款",
content: "您确定要收款吗？",
loading: true,
onOk: () => {
API_Order.orderPay(v.sn).then(res => {
if(res.success){
if (res.success) {
this.$Message.success("收款成功")
this.getDataList()
}
@ -289,17 +253,18 @@
},
// 订单详情
detail(v) {
detail (v) {
console.log(v.orderType);
let sn = v.sn;
this.$router.push({
name: "order-detail",
query: {sn: sn},
query: { sn: sn, orderType: v.orderType },
});
},
},
mounted() {
mounted () {
this.init();
},
};
};
</script>

335
manager/src/views/order/order/orderDetail.vue
View File

@ -4,24 +4,12 @@
<Card style="height: 60px">
<div style="">
<Button v-if="allowOperation.editPrice" @click="modifyPrice">调整价格</Button>
<Button
v-if="allowOperation.editConsignee"
@click="editAddress"
type="primary"
ghost
>修改收货地址</Button
>
<Button v-if="allowOperation.cancel" @click="orderCancel" type="warning" ghost
>订单取消</Button
>
<Button
v-if="orderInfo.order.orderStatus === 'UNPAID'"
@click="confirmPrice"
type="primary"
>收款</Button
>
<Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary" ghost>修改收货地址</Button>
<Button v-if="allowOperation.cancel" @click="orderCancel" type="warning" ghost>订单取消</Button>
<Button v-if="orderInfo.order.orderStatus === 'UNPAID'" @click="confirmPrice" type="primary">收款</Button>
<Button @click="orderLog" type="info" ghost>订单日志</Button>
<Button @click="printOrder" type="primary" ghost style="float:right;">打印发货单</Button>
<Button @click="printOrder" type="primary" ghost style="float:right;"
v-if="$route.query.orderType != 'VIRTUAL'">打印发货单</Button>
</div>
</Card>
<Card class="mt_10 clearfix">
@ -66,10 +54,8 @@
</div>
</div>
<div
class="div-item"
v-if="orderInfo.order.needReceipt == true && orderInfo.receipt && orderInfo.receipt.taxpayerId"
>
<div class="div-item"
v-if="orderInfo.order.needReceipt == true && orderInfo.receipt && orderInfo.receipt.taxpayerId">
<div class="div-item-left">发票税号：</div>
<div class="div-item-right">
{{ orderInfo.receipt && orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
@ -101,7 +87,7 @@
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
<div class="div-item-left">是否开票：</div>
<div class="div-item-right">
{{ orderInfo.receipt?(orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开"):"空" }}
{{ orderInfo.receipt ? (orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开") : "空" }}
</div>
</div>
</div>
@ -127,12 +113,12 @@
<div class="div-item-right">{{ orderInfo.order.remark }}</div>
</div>
<div class="div-item" v-if="orderInfo.order.needReceipt == false">
<!-- <div class="div-item" v-if="orderInfo.order.needReceipt == false">
<div class="div-item-left">发票信息：</div>
<div class="div-item-right">暂无发票信息</div>
</div>
</div> -->
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
<!-- <div class="div-item" v-if="orderInfo.order.needReceipt == true">
<div class="div-item-left">发票抬头：</div>
<div class="div-item-right">
{{
@ -141,10 +127,8 @@
</div>
</div>
<div
class="div-item"
v-if="orderInfo.order.needReceipt == true && orderInfo.receipt && orderInfo.receipt.taxpayerId"
>
<div class="div-item"
v-if="orderInfo.order.needReceipt == true && orderInfo.receipt && orderInfo.receipt.taxpayerId">
<div class="div-item-left">发票税号：</div>
<div class="div-item-right">
{{ orderInfo.receipt && orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
@ -176,11 +160,11 @@
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
<div class="div-item-left">是否开票：</div>
<div class="div-item-right">
{{ orderInfo.receipt?(orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开"):"空" }}
</div>
{{ orderInfo.receipt ? (orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开") : "空" }}
</div>
</div> -->
<div class="div-item">
<div class="div-item" v-if="$route.query.orderType != 'VIRTUAL'">
<div class="div-item-left">配送方式：</div>
<div class="div-item-right">
{{ orderInfo.deliveryMethodValue }}
@ -189,22 +173,12 @@
</div>
</Card>
<Card class="mt_10">
<Table
:loading="loading"
border
:columns="columns"
:data="data"
ref="table"
sortable="custom"
>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
<!-- 商品栏目格式化 -->
<template slot="goodsSlot" slot-scope="{ row }">
<div style="margin-top: 5px; height: 80px; display: flex">
<div style="">
<img
:src="row.image"
style="height: 60px; margin-top: 1px; width: 60px"
/>
<img :src="row.image" style="height: 60px; margin-top: 1px; width: 60px" />
</div>
<div style="margin-left: 13px">
@ -216,28 +190,12 @@
{{ key }} : {{ item }}
</span>
</span>
<Poptip
trigger="hover"
style="display: block"
title="扫码在手机中查看"
transfer
>
<Poptip trigger="hover" style="display: block" title="扫码在手机中查看" transfer>
<div slot="content">
<vue-qr
:text="wapLinkTo(row.goodsId, row.skuId)"
:margin="0"
colorDark="#000"
colorLight="#fff"
:size="150"
></vue-qr>
<vue-qr :text="wapLinkTo(row.goodsId, row.skuId)" :margin="0" colorDark="#000" colorLight="#fff"
:size="150"></vue-qr>
</div>
<img
src="../../../assets/qrcode.svg"
class="hover-pointer"
width="20"
height="20"
alt=""
/>
<img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="" />
</Poptip>
</div>
</div>
@ -251,33 +209,31 @@
orderInfo.order.priceDetailDTO.goodsPrice | unitPrice("￥")
}}</span>
</li>
<li
v-if="
<li v-if="
orderInfo.order.priceDetailDTO.discountPrice &&
orderInfo.order.priceDetailDTO.discountPrice > 0
"
>
">
<span class="label">优惠金额：</span>
<span class="txt">
{{ orderInfo.order.priceDetailDTO.discountPrice | unitPrice("￥") }}
</span>
</li>
<li
v-if="
<li v-if="
orderInfo.order.priceDetailDTO.couponPrice &&
orderInfo.order.priceDetailDTO.couponPrice > 0
"
>
">
<span class="label">优惠券金额：</span>
<span class="txt">
{{ orderInfo.order.priceDetailDTO.couponPrice | unitPrice("￥") }}
</span>
</li>
<li v-if="orderInfo.order.priceDetailDTO.discountPriceDetail != undefined && orderInfo.order.priceDetailDTO.discountPriceDetail && orderInfo.order.priceDetailDTO.discountPriceDetail != null && orderInfo.order.priceDetailDTO.discountPriceDetail != ''">
<li
v-if="orderInfo.order.priceDetailDTO.discountPriceDetail != undefined && orderInfo.order.priceDetailDTO.discountPriceDetail && orderInfo.order.priceDetailDTO.discountPriceDetail != null && orderInfo.order.priceDetailDTO.discountPriceDetail != ''">
<div class="label">
<Poptip trigger="hover" placement="left" width="200">
<Icon v-if="typeList.length > 0" type="ios-alert-outline" size="17" @click="getOrderPrice" color="#cc0000"/>
<Icon v-if="typeList.length > 0" type="ios-alert-outline" size="17" @click="getOrderPrice"
color="#cc0000" />
<template #content>
<div class="api" style="text-align:left;">
<table>
@ -287,8 +243,8 @@
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in typeList" :key="index">
<td>{{item.promotionName}}：</td>
<tr v-for="(item, index) in typeList" :key="index">
<td>{{ item.promotionName }}：</td>
<td>¥{{ item.discountPrice | unitPrice }}</td>
</tr>
</tbody>
@ -318,9 +274,7 @@
</li>
<li v-if="orderInfo.order.priceDetailDTO.updatePrice">
<span class="label">修改金额：</span>
<span class="txt theme_color"
>¥{{ orderInfo.order.priceDetailDTO.updatePrice | unitPrice }}</span
>
<span class="txt theme_color">¥{{ orderInfo.order.priceDetailDTO.updatePrice | unitPrice }}</span>
</li>
<li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
<span class="label">使用积分：</span>
@ -330,9 +284,7 @@
</li>
<li>
<span class="label">应付金额：</span>
<span class="txt flowPrice"
>¥{{ orderInfo.order.priceDetailDTO.flowPrice | unitPrice }}</span
>
<span class="txt flowPrice">¥{{ orderInfo.order.priceDetailDTO.flowPrice | unitPrice }}</span>
</li>
</ul>
</div>
@ -345,20 +297,10 @@
<span>修改金额</span>
</p>
<div>
<Form
ref="modifyPriceForm"
:model="modifyPriceForm"
label-position="left"
:label-width="70"
:rules="modifyPriceValidate"
>
<Form ref="modifyPriceForm" :model="modifyPriceForm" label-position="left" :label-width="70"
:rules="modifyPriceValidate">
<FormItem label="订单金额" prop="price">
<InputNumber
style="width: 100px"
v-model="modifyPriceForm.price"
:min="0"
:max="999999"
></InputNumber>
<InputNumber style="width: 100px" v-model="modifyPriceForm.price" :min="0" :max="999999"></InputNumber>
<span class="ml_10">元</span>
</FormItem>
</Form>
@ -375,20 +317,11 @@
<span>订单取消</span>
</p>
<div>
<Form
ref="orderCancelForm"
:model="orderCancelForm"
label-position="left"
:label-width="100"
:rules="orderCancelValidate"
>
<Form ref="orderCancelForm" :model="orderCancelForm" label-position="left" :label-width="100"
:rules="orderCancelValidate">
<FormItem label="取消原因" prop="reason">
<Input
v-model="orderCancelForm.reason"
type="textarea"
:autosize="{ minRows: 2, maxRows: 5 }"
placeholder="请输入取消原因"
></Input>
<Input v-model="orderCancelForm.reason" type="textarea" :autosize="{ minRows: 2, maxRows: 5 }"
placeholder="请输入取消原因"></Input>
</FormItem>
</Form>
</div>
@ -404,55 +337,22 @@
<span>修改收件信息</span>
</p>
<div>
<Form
ref="addressForm"
:model="addressForm"
label-position="left"
:label-width="100"
:rules="addressRule"
>
<Form ref="addressForm" :model="addressForm" label-position="left" :label-width="100" :rules="addressRule">
<FormItem label="收件人" prop="consigneeName">
<Input
v-model="addressForm.consigneeName"
size="large"
maxlength="20"
></Input>
<Input v-model="addressForm.consigneeName" size="large" maxlength="20"></Input>
</FormItem>
<FormItem label="联系方式" prop="consigneeMobile">
<Input
v-model="addressForm.consigneeMobile"
size="large"
maxlength="11"
></Input>
<Input v-model="addressForm.consigneeMobile" size="large" maxlength="11"></Input>
</FormItem>
<FormItem label="地址信息" prop="consigneeAddressPath">
<Input
v-model="addr"
disabled
style="width: 305px"
v-if="showRegion == false"
/>
<Button
v-if="showRegion == false"
@click="regionClick"
:loading="submitLoading"
type="primary"
icon="ios-create-outline"
style="margin-left: 8px"
>修改
<Input v-model="addr" disabled style="width: 305px" v-if="showRegion == false" />
<Button v-if="showRegion == false" @click="regionClick" :loading="submitLoading" type="primary"
icon="ios-create-outline" style="margin-left: 8px">修改
</Button>
<region
style="width: 400px"
@selected="selectedRegion"
v-if="showRegion == true"
/>
<region style="width: 400px" @selected="selectedRegion" v-if="showRegion == true" />
</FormItem>
<FormItem label="详细地址" prop="consigneeDetail">
<Input
v-model="addressForm.consigneeDetail"
size="large"
maxlength="50"
></Input>
<Input v-model="addressForm.consigneeDetail" size="large" maxlength="50"></Input>
</FormItem>
</Form>
</div>
@ -467,24 +367,20 @@
<span>订单日志</span>
</p>
<div class="order-log-div">
<Table
:loading="loading"
border
:columns="orderLogColumns"
:data="orderInfo.orderLogs"
ref="table"
sortable="custom"
></Table>
<Table :loading="loading" border :columns="orderLogColumns" :data="orderInfo.orderLogs" ref="table"
sortable="custom"></Table>
</div>
<div slot="footer" style="text-align: right">
<Button @click="handelCancel">取消</Button>
</div>
</Modal>
<Modal v-model="printModal" width="530" @on-cancel="printCancel" >
<Modal v-model="printModal" width="530" @on-cancel="printCancel">
<p slot="header" style="line-height:26px;height:26px;">
<span style="float: left;">打印发货单</span>
<Button size="small" style="margin-right:35px;float: right;padding-bottom: 2px;" @click="printHiddenInfo"><template v-if="printHiddenFlag">显示</template><template v-else>隐藏</template>敏感信息</Button>
<Button size="small" style="margin-right:35px;float: right;padding-bottom: 2px;"
@click="printHiddenInfo"><template v-if="printHiddenFlag">显示</template><template
v-else>隐藏</template>敏感信息</Button>
</p>
<div style="max-height:500px;overflow-y:auto;overflow-x:hidden;">
<div id="printInfo">
@ -498,22 +394,24 @@
<p class="lineH30 f14">收件人：{{ orderInfo.order.consigneeName }}</p>
</Col>
<Col span="12" v-if="orderInfo.order.consigneeMobile">
<p class="lineH30 f14" v-if="printHiddenFlag">手机号：{{ orderInfo.order.consigneeMobile.replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2") }}</p>
<p class="lineH30 f14" v-if="printHiddenFlag">手机号：{{
orderInfo.order.consigneeMobile.replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2") }}</p>
<p class="lineH30 f14" v-else>手机号：{{ orderInfo.order.consigneeMobile }}</p>
</Col>
</Row>
<Row>
<Col span="24">
<p class="lineH30 f14">收货地址：{{ orderInfo.order.consigneeAddressPath }}{{ orderInfo.order.consigneeDetail }}</p>
<p class="lineH30 f14">收货地址：{{ orderInfo.order.consigneeAddressPath }}{{ orderInfo.order.consigneeDetail }}
</p>
</Col>
</Row>
<Row>
<Col span="24">
<p class="printgoodtitle">商品信息</p>
<div class="printgoodinfo">
<div v-for="(item,index) in orderInfo.orderItems" :key="index" class="printgooditem">
<div v-for="(item, index) in orderInfo.orderItems" :key="index" class="printgooditem">
<div class="printgoodname">
<p>{{item.goodsName}}</p>
<p>{{ item.goodsName }}</p>
<div class="printgoodguid">
<span v-for="(itemchild, keychild) in JSON.parse(item.specs)" :key="keychild">
<span class="printgoodguiditem" v-if="keychild != 'images'">
@ -522,7 +420,7 @@
</span>
</div>
</div>
<span class="printgoodnumber">数量：{{item.num}}</span>
<span class="printgoodnumber">数量：{{ item.num }}</span>
</div>
</div>
</Col>
@ -549,15 +447,15 @@ export default {
region,
"vue-qr": vueQr,
},
data() {
data () {
return {
typeList:[],
showPrices:false,
printHiddenFlag:false,//隐藏信息
printInfoObj:{
typeList: [],
showPrices: false,
printHiddenFlag: false,//隐藏信息
printInfoObj: {
id: "printInfo",//要打印的id名 无#号
popTitle:'&nbsp;',//页眉标题 默认浏览器标题 空字符串时显示undefined 使用html语言
extraHead:'',//头部文字 默认空
popTitle: '&nbsp;',//页眉标题 默认浏览器标题 空字符串时显示undefined 使用html语言
extraHead: '',//头部文字 默认空
},
loading: false, //加载表格
submitLoading: false, // 添加或编辑提交状态
@ -612,7 +510,7 @@ export default {
reason: [{ required: true, message: "取消原因不能为空", trigger: "blur" }],
},
addressModal: false, //弹出修改收件信息框
printModal:false,
printModal: false,
//收件地址表单
addressForm: {
consigneeName: "",
@ -732,21 +630,21 @@ export default {
};
},
watch: {
$route(to, from) {
$route (to, from) {
this.$router.go(0);
},
},
methods: {
gotoHomes(){
gotoHomes () {
return false
},
//修改地址
regionClick() {
regionClick () {
this.showRegion = true;
this.regionId = "";
},
//确认收款
confirmPrice() {
confirmPrice () {
this.$Modal.confirm({
title: "提示",
content:
@ -763,14 +661,14 @@ export default {
},
});
},
getOrderPrice(){
if(this.showPrices){
getOrderPrice () {
if (this.showPrices) {
this.showPrices = false
}else if(!this.showPrices){
} else if (!this.showPrices) {
this.showPrices = true
}
},
getContentPrice(){
getContentPrice () {
for (let i = 0; i < this.typeList.length; i++) {
for (let j = i + 1; j < this.typeList.length; j++) {
if (this.typeList[i].promotionId === this.typeList[j].promotionId) {
@ -780,13 +678,13 @@ export default {
}
}
console.log(this.typeList)
if(this.typeList.length >= 3){
if (this.typeList.length >= 3) {
console.log(123123)
this.getContentPrice()
}
},
// 获取订单详情
getDataList() {
getDataList () {
this.loading = true;
API_Order.orderDetail(this.sn).then((res) => {
this.loading = false;
@ -800,13 +698,13 @@ export default {
}
});
},
modifyPrice() {
modifyPrice () {
//默认要修改的金额为订单总金额
this.modifyPriceForm.price = this.orderInfo.order.flowPrice;
this.modal = true;
},
//修改订单金额提交
modifyPriceSubmit() {
modifyPriceSubmit () {
this.$refs.modifyPriceForm.validate((valid) => {
if (valid) {
API_Order.updateOrderPrice(this.sn, this.modifyPriceForm).then((res) => {
@ -820,16 +718,16 @@ export default {
});
},
// 选中的地址
selectedRegion(val) {
selectedRegion (val) {
this.addr = val[1];
this.regionId = val[0];
},
//订单取消
orderCancel() {
orderCancel () {
this.orderCancelModal = true;
},
//订单取消提交
orderCancelSubmit() {
orderCancelSubmit () {
this.$refs.orderCancelForm.validate((valid) => {
if (valid) {
API_Order.orderCancel(this.sn, this.orderCancelForm).then((res) => {
@ -843,25 +741,25 @@ export default {
});
},
//订单日志
orderLog() {
orderLog () {
this.orderLogModal = true;
},
//订单日志取消
handelCancel() {
handelCancel () {
this.orderLogModal = false;
},
//打印发货单
printOrder(){
printOrder () {
this.printModal = true;
},
printHiddenInfo(){
printHiddenInfo () {
this.printHiddenFlag = !this.printHiddenFlag;
},
printCancel(){
printCancel () {
// this.printHiddenFlag = false;
},
//弹出修改收货地址框
editAddress() {
editAddress () {
this.addressModal = true;
this.showRegion = false;
this.addr = this.orderInfo.order.consigneeAddressPath;
@ -873,7 +771,7 @@ export default {
this.addressForm.consigneeAddressIdPath = this.orderInfo.order.consigneeAddressIdPath;
},
//修改收货地址
editAddressSubmit() {
editAddressSubmit () {
if (this.regionId == "") {
this.$Message.error("请选择地址");
return;
@ -893,16 +791,17 @@ export default {
});
},
},
mounted() {
mounted () {
this.sn = this.$route.query.sn;
this.getDataList();
},
};
</script>
<style lang="scss">
.lineH30{
.lineH30 {
line-height: 30px;
}
.order-log-div {
line-height: 30px;
overflow-y: scroll;
@ -939,11 +838,11 @@ export default {
line-height: 35px;
display: flex;
> .div-item-left {
>.div-item-left {
width: 80px;
}
> .div-item-right {
>.div-item-right {
flex: 1;
word-break: break-all;
}
@ -1000,24 +899,28 @@ export default {
}
}
}
.f14{
.f14 {
font-size: 14px;
color: #333;
}
.printgoodtitle{
.printgoodtitle {
font-size: 14px;
line-height: 1.5;
margin-top: 15px;
color: #333;
}
.printgoodinfo{
.printgoodinfo {
// font-size: 14px;
// background: #f2f2f2;
// border-bottom:2px solid #333 ;
padding: 10px;
overflow: hidden;
color: #333;
.printgooditem{
.printgooditem {
border-bottom: 1px solid #e8eaec;
display: flex;
align-items: flex-start;
@ -1025,35 +928,43 @@ export default {
line-height: 30px;
margin-bottom: 10px;
padding-bottom: 10px;
.printgoodname{
.printgoodname {
flex: 1;
overflow: hidden;
.printgoodguid{
.printgoodguid {
font-size: 12px;
color:#999999;
line-height:1.5;
.printgoodguiditem{
color: #999999;
line-height: 1.5;
.printgoodguiditem {
margin-right: 10px;
}
}
}
.printgoodprice{
.printgoodprice {
width: 135px;
margin-left: 15px;
}
.printgoodnumber{
.printgoodnumber {
width: 85px;
margin-left: 15px;
}
}
}
@media print {
@page{
@page {
size: auto;
margin: 3mm;
}
html,body{
height:inherit;
html,
body {
height: inherit;
}
}
</style>

48
seller/src/views/order/order/orderDetail.vue
View File

@ -487,7 +487,7 @@ export default {
liliMap,
region,
},
data() {
data () {
return {
typeList: [],
showPrices: false,
@ -693,27 +693,27 @@ export default {
},
methods: {
//修改地址
regionClick() {
regionClick () {
this.showRegion = true;
this.regionId = "";
},
//弹出订单核销框
orderTake() {
orderTake () {
this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode;
this.orderTakeModal = true;
},
//打印发货单
printOrder() {
printOrder () {
this.printModal = true;
},
printHiddenInfo() {
printHiddenInfo () {
this.printHiddenFlag = !this.printHiddenFlag;
},
printCancel() {
printCancel () {
// this.printHiddenFlag = false;
},
//订单核销提交
orderTakeSubmit() {
orderTakeSubmit () {
this.$refs.orderTakeForm.validate((valid) => {
if (valid) {
API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then(
@ -728,14 +728,14 @@ export default {
}
});
},
getOrderPrice() {
getOrderPrice () {
if (this.showPrices) {
this.showPrices = false
} else if (!this.showPrices) {
this.showPrices = true
}
},
getContentPrice() {
getContentPrice () {
for (let i = 0; i < this.typeList.length; i++) {
for (let j = i + 1; j < this.typeList.length; j++) {
if (this.typeList[i].promotionId === this.typeList[j].promotionId) {
@ -751,7 +751,7 @@ export default {
}
},
//获取订单详细信息
getDataDetail() {
getDataDetail () {
this.loading = true;
API_Order.getOrderDetail(this.sn).then((res) => {
this.loading = false;
@ -766,7 +766,7 @@ export default {
}
});
},
Toprint() {
Toprint () {
this.facesheetFlag = true;
API_Logistics.getCheckedOn().then(res => {
if (res.success) {
@ -776,13 +776,13 @@ export default {
});
},
// 修改订单金额
modifyPrice() {
modifyPrice () {
//默认要修改的金额为订单总金额
this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice;
this.modal = true;
},
//修改订单金额提交
modifyPriceSubmit() {
modifyPriceSubmit () {
this.$refs.modifyPriceForm.validate((valid) => {
if (valid) {
API_Order.modifyOrderPrice(this.sn, this.modifyPriceForm).then(
@ -798,12 +798,12 @@ export default {
});
},
// 选中的地址
selectedRegion(val) {
selectedRegion (val) {
this.region = val[1];
this.regionId = val[0];
},
//查询物流
logistics() {
logistics () {
this.logisticsModal = true;
API_Order.getTraces(this.sn).then((res) => {
if (res.success && res.result != null) {
@ -812,7 +812,7 @@ export default {
});
},
//订单发货
orderDeliver() {
orderDeliver () {
this.facesheetFlag = false
if (this.logisticsType == 'SHUNFENG') {
this.$Modal.confirm({
@ -839,7 +839,7 @@ export default {
}
},
//顺丰打印面单
sfPrint() {
sfPrint () {
API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => {
if (res.success) {
let headers = {
@ -869,13 +869,13 @@ export default {
}
})
},
Toprints() {
Toprints () {
if (this.form.logisticsId != null && this.form.logisticsId != '') {
this.orderDeliverModal = false;
}
},
//订单发货提交
orderDeliverySubmit() {
orderDeliverySubmit () {
if (this.facesheetFlag) {
this.$refs['faceSheetForm'].validate((valid) => {
if (valid) {
@ -904,7 +904,7 @@ export default {
}
},
//弹出修改收货地址框
editAddress() {
editAddress () {
this.addressModal = true;
this.showRegion = false;
this.regionId = this.orderInfo.order.consigneeAddressIdPath;
@ -918,7 +918,7 @@ export default {
this.orderInfo.order.consigneeAddressIdPath;
},
//修改收货地址
editAddressSubmit() {
editAddressSubmit () {
if (this.regionId == "") {
this.$Message.error("请选择地址");
return;
@ -940,7 +940,7 @@ export default {
});
},
getLogisticsSetting() {
getLogisticsSetting () {
API_Logistics.getLogisticsSetting().then(res => {
if (res.success) {
this.logisticsType = res.result;
@ -949,13 +949,13 @@ export default {
},
},
mounted() {
mounted () {
this.sn = this.$route.query.sn;
this.getDataDetail();
this.getLogisticsSetting();
},
// 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
beforeRouteLeave(to, from, next) {
beforeRouteLeave (to, from, next) {
if (to.name === 'orderList' || to.name === 'virtualOrderList') {
to.meta.keepAlive = true
}