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

订单详情重复展示问题

master
程 2023-04-17 11:31:52 +08:00
parent d1a974f6b0
commit e954cf4d92
1 changed files with 187 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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