Skip to content

S
shop-new
提交 156fe93e authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

云仓-订单-bug修复

上级 22e49199
隐藏空白字符变更
内嵌 并排
正在显示 包含 162 行增加 和 62 行删除
src/views/system/asset/myAsset/index.vue 0 → 100644
浏览文件 @ 156fe93e
<template>
<div class="app-container">
<el-card>
<p class="card-header-title ">
<span class="blue-block-goods blue-block-goods-title"></span>商品信息
<el-button type="primary" size="small">提现说明</el-button>
<el-button type="primary" size="small">提现说明</el-button>
</p>
</el-card>
</div>
</template>
<script>
export default {
name: "Index",
data() {
return {
} // return end
}// data end
}
</script>
<style scoped>
/* el-card title hxz 样式统一 start */
.blue-block-goods-title {
margin: 0 20px 0 0;
}
.card-header-title {
display: flex;
flex-direction: row;
justify-content: start;
align-items: center;
font-size: 18px;
color: #000;
font-weight: bold;
height: 24px;
}
.blue-block-goods {
width: 5px;
height: 24px;
background: #3A84FF;
margin: 0 9px 0 0;
border-radius: 2px;
}
/* el-card title hxz 样式统一 end */
</style>
src/views/system/order/components/orderDetail.vue
浏览文件 @ 156fe93e
...@@ -9,62 +9,11 @@ ...@@ -9,62 +9,11 @@
</el-card> </el-card>
<el-card style="margin-top: 20px;"> <el-card style="margin-top: 20px;">
<div class="orderList"> <div class="orderList">
<div class="orderItem">
<div class="orderTitle">
<img class="icon" src="@/assets/image/order/icon1.png" alt="">
<span>订单信息</span>
</div>
<div>
<el-row class="row-title">
<el-col :span="3" class="text-r">订单编号</el-col>
<el-col :span="6" class="text-l">{{orderDetail ? orderDetail.parent_order_sn : ''}}</el-col>
</el-row>
<el-row class="row-title">
<el-col :span="3" class="text-r">下单时间</el-col>
<el-col :span="6" class="text-l">{{orderDetail ? formatter(orderDetail.created_time) : ''}}</el-col>
</el-row>
<el-row class="row-title">
<el-col :span="3" class="text-r">商品数量</el-col>
<el-col :span="6" class="text-l">{{orderDetail ? orderDetail.goods_total : ''}}</el-col>
</el-row>
<el-row class="row-title">
<el-col :span="3" class="text-r">商品总价</el-col>
<el-col :span="6" class="text-l">{{orderDetail ? orderDetail.goods_price / 100 : ''}}</el-col>
</el-row>
<el-row class="row-title">
<el-col :span="3" class="text-r">运费</el-col>
<el-col :span="6" class="text-l">{{orderDetail ? orderDetail.dispatch_price / 100 : ''}}</el-col>
</el-row>
</div>
</div>
<div class="orderItem">
<div class="orderTitle" style="justify-content: space-between; width: 75%;">
<div style="display: flex; align-items: center;">
<img class="icon" src="@/assets/image/order/icon2.png" alt="">
<span>买家信息</span>
</div>
<el-button size="mini" type="primary" @click="modifyinfo" :disabled="orderDetail && orderDetail.status > 1">修改买家信息</el-button>
</div>
<div>
<el-row class="row-title">
<el-col :span="3" class="text-r">收货人姓名</el-col>
<el-col :span="6" class="text-l">{{ orderDetail ? orderDetail.real_name : ''}}</el-col>
<el-col :span="3" class="text-r">联系电话</el-col>
<el-col :span="6" class="text-l">{{ orderDetail ? orderDetail.mobile : ''}}</el-col>
</el-row>
<el-row class="row-title">
<el-col :span="3" class="text-r">收货地址</el-col>
<el-col :span="6" class="text-l">{{orderDetail ? orderDetail.provice + orderDetail.city + orderDetail.district + orderDetail.street + orderDetail.address : ''}}</el-col>
<el-col :span="3" class="text-r"></el-col>
<el-col :span="6" class="text-l"></el-col>
</el-row>
</div>
</div>
<div class="orderItem"> <div class="orderItem">
<div class="orderTitle" style="justify-content: space-between;"> <div class="orderTitle" style="justify-content: space-between;">
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<img class="icon" src="@/assets/image/order/icon3.png" alt=""> <img class="icon" src="@/assets/image/order/icon3.png" alt="">
<span>商品信息</span> <span>订单信息</span>
</div> </div>
<div> <div>
<el-button size="mini" type="primary" @click="goShipping(1)">去发货</el-button> <el-button size="mini" type="primary" @click="goShipping(1)">去发货</el-button>
...@@ -104,7 +53,7 @@ ...@@ -104,7 +53,7 @@
</el-table-column> </el-table-column>
<el-table-column label="发货时间" prop="send_time" align="center"> <el-table-column label="发货时间" prop="send_time" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.send_time ? scope.row.send_time : '—' }} {{ scope.row.send_time ? formatter(scope.row.send_time) : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" align="center"> <el-table-column label="操作" class-name="small-padding fixed-width" align="center">
...@@ -112,11 +61,63 @@ ...@@ -112,11 +61,63 @@
<span style="font-size:12px;padding: 0 15px 0 0;" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '已补单'">已补单</span> <span style="font-size:12px;padding: 0 15px 0 0;" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '已补单'">已补单</span>
<el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去补单'" @click="goShipping(4,scope.row.id)">去补单</el-button> <el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去补单'" @click="goShipping(4,scope.row.id)">去补单</el-button>
<el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去发货'" @click="goShipping(3,scope.row.id)">去发货</el-button> <el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去发货'" @click="goShipping(3,scope.row.id)">去发货</el-button>
<el-divider direction="vertical"></el-divider>
<el-button size="mini" type="text" @click="getExpressInfoNew(scope.row)">查看物流</el-button> <el-button size="mini" type="text" @click="getExpressInfoNew(scope.row)">查看物流</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- <div class="orderItem">-->
<!-- <div class="orderTitle">-->
<!-- <img class="icon" src="@/assets/image/order/icon1.png" alt="">-->
<!-- <span>订单信息</span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-row class="row-title">-->
<!-- <el-col :span="3" class="text-r">订单编号</el-col>-->
<!-- <el-col :span="6" class="text-l">{{orderDetail ? orderDetail.parent_order_sn : ''}}</el-col>-->
<!-- </el-row>-->
<!-- <el-row class="row-title">-->
<!-- <el-col :span="3" class="text-r">下单时间</el-col>-->
<!-- <el-col :span="6" class="text-l">{{orderDetail ? formatter(orderDetail.created_time) : ''}}</el-col>-->
<!-- </el-row>-->
<!-- <el-row class="row-title">-->
<!-- <el-col :span="3" class="text-r">商品数量</el-col>-->
<!-- <el-col :span="6" class="text-l">{{orderDetail ? orderDetail.goods_total : ''}}</el-col>-->
<!-- </el-row>-->
<!-- <el-row class="row-title">-->
<!-- <el-col :span="3" class="text-r">商品总价</el-col>-->
<!-- <el-col :span="6" class="text-l">{{orderDetail ? orderDetail.goods_price / 100 : ''}}</el-col>-->
<!-- </el-row>-->
<!-- <el-row class="row-title">-->
<!-- <el-col :span="3" class="text-r">运费</el-col>-->
<!-- <el-col :span="6" class="text-l">{{orderDetail ? orderDetail.dispatch_price / 100 : ''}}</el-col>-->
<!-- </el-row>-->
<!-- </div>-->
<!-- </div>-->
<div class="orderItem">
<div class="orderTitle" style="justify-content: space-between; width: 75%;">
<div style="display: flex; align-items: center;">
<img class="icon" src="@/assets/image/order/icon2.png" alt="">
<span>买家信息</span>
</div>
<el-button size="mini" type="primary" @click="modifyinfo" :disabled="orderDetail && orderDetail.status > 1">修改买家信息</el-button>
</div>
<div>
<el-row class="row-title">
<el-col :span="4" class="text-r">收货人姓名</el-col>
<el-col :span="4" class="text-r">联系电话</el-col>
<el-col :span="10" class="text-r">收货地址</el-col>
</el-row>
<el-row class="row-title">
<el-col :span="4" class="text-l">{{ orderDetail ? orderDetail.real_name : ''}}</el-col>
<el-col :span="4" class="text-l">{{ orderDetail ? orderDetail.mobile : ''}}</el-col>
<el-col :span="10" class="text-l">{{orderDetail ? orderDetail.provice + orderDetail.city + orderDetail.district + orderDetail.street + orderDetail.address : ''}}</el-col>
</el-row>
</div>
</div>
<!-- <div class="orderItem"> <!-- <div class="orderItem">
<div class="orderTitle"> <div class="orderTitle">
<img class="icon" src="@/assets/image/order/icon4.png" alt=""> <img class="icon" src="@/assets/image/order/icon4.png" alt="">
...@@ -799,11 +800,13 @@ export default { ...@@ -799,11 +800,13 @@ export default {
} }
.text-r { .text-r {
justify-content: flex-end; justify-content: center;
background: #F7F8FA; background: #F7F8FA;
align-items: center;
} }
.text-l { .text-l {
text-align: left; justify-content: center;
align-items: center;
} }
.orderItem { .orderItem {
margin-bottom: 20px; margin-bottom: 20px;
......
src/views/system/order/index.vue
浏览文件 @ 156fe93e
...@@ -13,10 +13,13 @@ ...@@ -13,10 +13,13 @@
<el-tab-pane label="已完成" name="third"></el-tab-pane> <el-tab-pane label="已完成" name="third"></el-tab-pane>
<el-tab-pane label="全部订单" name="fourth"></el-tab-pane> <el-tab-pane label="全部订单" name="fourth"></el-tab-pane>
</el-tabs> </el-tabs>
<div v-show="this.activeName == 'first' " style="position: absolute; top: -5px; right: 0;"> <div v-show="activeName == 'first' " style="position: absolute; top: -5px; right: 0;">
<el-button size="mini" type="primary" icon="el-icon-download" @click="handleExport">导出订单</el-button> <el-button size="mini" type="primary" icon="el-icon-download" @click="handleExport">导出订单</el-button>
<el-button size="mini" icon="el-icon-position" @click="isDeliveryOpen = true">批量发货</el-button> <el-button size="mini" icon="el-icon-position" @click="isDeliveryOpen = true">批量发货</el-button>
</div> </div>
<div v-show="activeName == 'fourth' " style="position: absolute; top: -5px; right: 0;">
<el-button size="mini" type="primary" icon="el-icon-download" @click="handleExport">导出订单</el-button>
</div>
</div> </div>
<div class="form-box"> <div class="form-box">
<el-form class="form-params" ref="form" :model="form" label-width="85px"> <el-form class="form-params" ref="form" :model="form" label-width="85px">
...@@ -44,7 +47,7 @@ ...@@ -44,7 +47,7 @@
<el-input size="mini" v-model="form.Tel" placeholder="请输入联系电话"/> <el-input size="mini" v-model="form.Tel" placeholder="请输入联系电话"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6" v-show="activeName == 'first' || activeName == 'fourth' ">
<el-form-item label="下单时间："> <el-form-item label="下单时间：">
<el-date-picker <el-date-picker
size="mini" size="mini"
...@@ -58,6 +61,34 @@ ...@@ -58,6 +61,34 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-show="activeName == 'second' ">
<el-form-item label="发货时间：">
<el-date-picker
size="mini"
v-model="form.dateTime"
type="daterange"
align="left"
unaLink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6" v-show="activeName == 'third' ">
<el-form-item label="完成时间：">
<el-date-picker
size="mini"
v-model="form.dateTime"
type="daterange"
align="left"
unaLink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-button size="mini" type="primary" icon="el-icon-search" style="margin-left: 20px;" <el-button size="mini" type="primary" icon="el-icon-search" style="margin-left: 20px;"
@click="getListOrder">搜索 @click="getListOrder">搜索
...@@ -70,7 +101,7 @@ ...@@ -70,7 +101,7 @@
<!-- 表头 --> <!-- 表头 -->
<div class="table-header-spe"> <div class="table-header-spe">
<el-table class="title_table hxz-el-table" align="center"> <el-table class="title_table hxz-el-table" align="center">
<el-table-column align="center" width="55"> <el-table-column align="center" width="55" v-if="activeName == 'fourth' ">
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<el-checkbox v-model="allTablesChecked" ></el-checkbox> <el-checkbox v-model="allTablesChecked" ></el-checkbox>
</template> </template>
...@@ -79,11 +110,12 @@ ...@@ -79,11 +110,12 @@
<el-table-column label="商品名称" align="center" ></el-table-column> <el-table-column label="商品名称" align="center" ></el-table-column>
<el-table-column label="规格/数量/金额" align="center" width="180" ></el-table-column> <el-table-column label="规格/数量/金额" align="center" width="180" ></el-table-column>
<el-table-column label="下单时间" align="center" width="180" ></el-table-column> <el-table-column label="下单时间" align="center" width="180" ></el-table-column>
<el-table-column label="发货时间" align="center" width="180" ></el-table-column>
<el-table-column label="完成时间" align="center" width="180" ></el-table-column>
<el-table-column label="收货人" align="center" width="180" ></el-table-column> <el-table-column label="收货人" align="center" width="180" ></el-table-column>
<el-table-column label="联系电话" align="center" width="180"></el-table-column> <el-table-column label="联系电话" align="center" width="180"></el-table-column>
<el-table-column label="操作" align="center" width="140" ></el-table-column> <el-table-column label="操作" align="center" width="140"></el-table-column>
</el-table> </el-table>
<div class="hxz-el-table-check"></div>
</div> </div>
<div class="table-all-con box-card"> <div class="table-all-con box-card">
...@@ -97,7 +129,7 @@ ...@@ -97,7 +129,7 @@
:show-header="false" :show-header="false"
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
:data="item.order_goods"> :data="item.order_goods">
<el-table-column type="selection" width="55" align="center"></el-table-column> <el-table-column type="selection" width="55" align="center" v-if="activeName == 'fourth' "></el-table-column>
<el-table-column prop="goods_order_sn" label="订单号" width="180" align="center"></el-table-column> <el-table-column prop="goods_order_sn" label="订单号" width="180" align="center"></el-table-column>
<el-table-column prop="goods_option_title" label="商品名称" align="center"> <el-table-column prop="goods_option_title" label="商品名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -120,6 +152,16 @@ ...@@ -120,6 +152,16 @@
{{ formatter(scope.row.created_time) }} {{ formatter(scope.row.created_time) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="send_time" label="发货时间" width="180" align="center">
<template slot-scope="scope">
{{ formatter(scope.row.send_time) }}
</template>
</el-table-column>
<el-table-column prop="updated_time" label="完成时间" width="180" align="center">
<template slot-scope="scope">
{{ formatter(scope.row.updated_time) }}
</template>
</el-table-column>
<el-table-column prop="phone" width="180" label="收货人" align="center"></el-table-column> <el-table-column prop="phone" width="180" label="收货人" align="center"></el-table-column>
<el-table-column prop="real_name" label="联系电话" width="180" align="center"></el-table-column> <el-table-column prop="real_name" label="联系电话" width="180" align="center"></el-table-column>
<el-table-column label="操作" width="140" align="center"> <el-table-column label="操作" width="140" align="center">
...@@ -229,6 +271,8 @@ ...@@ -229,6 +271,8 @@
shipname: '', shipname: '',
Tel: '', Tel: '',
dateTime: [], dateTime: [],
finishTime: [],
sendTime: [],
}, },
goodsStatus: 1, goodsStatus: 1,
tableDataList: [], // 后台返回所有数据 tableDataList: [], // 后台返回所有数据
...@@ -326,6 +370,8 @@ ...@@ -326,6 +370,8 @@
shipname: '', shipname: '',
Tel: '', Tel: '',
dateTime: [], dateTime: [],
finishTime: [],
sendTime: [],
} }
this.currentPage = 1 this.currentPage = 1
this.pageSize = 20 this.pageSize = 20
...@@ -392,6 +438,9 @@ ...@@ -392,6 +438,9 @@
real_name: this.form.shipname, real_name: this.form.shipname,
mobile: this.form.Tel, mobile: this.form.Tel,
} }
console.log(444,this.goodsStatus);
//return
listOrder(params).then(res => { listOrder(params).then(res => {
if (res.code == 1) { if (res.code == 1) {
// 每次订单 查询成功，保存查询参数，供商品导出接口使用（入参） // 每次订单 查询成功，保存查询参数，供商品导出接口使用（入参）
...@@ -649,7 +698,7 @@ ...@@ -649,7 +698,7 @@
.table-all-con { .table-all-con {
height: calc(100% - 250px); height: calc(100% - 250px);
overflow-y: auto; overflow: auto;
padding: 0 20px; padding: 0 20px;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论