Skip to content

R
rs-cloud-platform-ui
Commit 798e7b8b authored by rencs's avatar rencs
Browse files
Options

12.24 跳转订单

parent 063612f8
Show whitespace changes
Inline Side-by-side
Showing with 486 additions and 269 deletions
src/views/orderManagement/demandList/index.vue
View file @ 798e7b8b
...@@ -249,7 +249,10 @@ export default { ...@@ -249,7 +249,10 @@ export default {
}); });
}, },
toItemOrder(item) { toItemOrder(item) {
console.log(item); this.$router.push({
path: "/orderManagement/orderList",
query: { orderNo: item.orderNo },
});
}, },
delItemOrder(item) { delItemOrder(item) {
this.$confirm("确认删除", "提示", { this.$confirm("确认删除", "提示", {
......
src/views/orderManagement/orderList/index.vue
View file @ 798e7b8b
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
type="datetimerange" type="datetimerange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -29,7 +30,11 @@ ...@@ -29,7 +30,11 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="商品类型"> <el-form-item label="商品类型">
<el-select filterable v-model="listQuery.type" placeholder="请选择"> <el-select filterable v-model="listQuery.type" placeholder="请选择">
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <el-option
:key="undefined"
label="全部"
:value="undefined"
></el-option>
<el-option :key="1" label="标准数据" :value="1"></el-option> <el-option :key="1" label="标准数据" :value="1"></el-option>
<el-option :key="2" label="全部" :value="2"></el-option> <el-option :key="2" label="全部" :value="2"></el-option>
<el-option :key="3" label="全部" :value="3"></el-option> <el-option :key="3" label="全部" :value="3"></el-option>
...@@ -38,16 +43,37 @@ ...@@ -38,16 +43,37 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单状态"> <el-form-item label="订单状态">
<el-select filterable v-model="listQuery.status" placeholder="请选择"> <el-select
<el-option :key="undefined" label="全部" :value="undefined"></el-option> filterable
<el-option v-for="item in orderStatusList" :key="item.id" :label="item.name" :value="item.id"></el-option> v-model="listQuery.status"
placeholder="请选择"
>
<el-option
:key="undefined"
label="全部"
:value="undefined"
></el-option>
<el-option
v-for="item in orderStatusList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="付款状态"> <el-form-item label="付款状态">
<el-select filterable v-model="listQuery.payStatus" placeholder="请选择"> <el-select
<el-option :key="undefined" label="全部" :value="undefined"></el-option> filterable
v-model="listQuery.payStatus"
placeholder="请选择"
>
<el-option
:key="undefined"
label="全部"
:value="undefined"
></el-option>
<el-option :key="1" label="已支付" :value="1"></el-option> <el-option :key="1" label="已支付" :value="1"></el-option>
<el-option :key="2" label="未支付" :value="2"></el-option> <el-option :key="2" label="未支付" :value="2"></el-option>
</el-select> </el-select>
...@@ -57,7 +83,9 @@ ...@@ -57,7 +83,9 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-button type="primary" @click="handleFilter">筛选</el-button> <el-button type="primary" @click="handleFilter">筛选</el-button>
<el-button type="primary" plain @click="clear_search">清空筛选条件</el-button> <el-button type="primary" plain @click="clear_search"
>清空筛选条件</el-button
>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -75,47 +103,189 @@ ...@@ -75,47 +103,189 @@
</div> </div>
<div v-for="item in list" :key="item.orderId"> <div v-for="item in list" :key="item.orderId">
<div class="order-no-top"> <div class="order-no-top">
<span class="order-no">订单号：{{item.orderNo}}<span style="background: #f8ddbb;color: #F59A23;font-size: 12px;padding: 2px 10px;border-radius: 10px;margin-left:10px;" v-if="item.invoiceStatus>=2">已开票</span><span style="border:1px solid #eee;color: #1890FF;font-size: 12px;padding: 2px 10px;border-radius: 10px;margin-left:10px;" v-else-if="item.invoiceId">开发票</span></span> <span class="order-no"
<span class="order-time"><span style="background: #1890FF;color: #fff;font-size: 12px;padding: 2px 10px;border-radius: 4px;margin-right:10px;cursor: pointer;" @click="handleInvoice(item)" v-if="item.invoiceId && item.invoiceStatus == 1">开发票</span>下单时间：{{item.crtTime}}</span> >订单号：{{ item.orderNo
}}<span
style="
background: #f8ddbb;
color: #f59a23;
font-size: 12px;
padding: 2px 10px;
border-radius: 10px;
margin-left: 10px;
"
v-if="item.invoiceStatus >= 2"
>已开票</span
><span
style="
border: 1px solid #eee;
color: #1890ff;
font-size: 12px;
padding: 2px 10px;
border-radius: 10px;
margin-left: 10px;
"
v-else-if="item.invoiceId"
>开发票</span
></span
>
<span class="order-time"
><span
style="
background: #1890ff;
color: #fff;
font-size: 12px;
padding: 2px 10px;
border-radius: 4px;
margin-right: 10px;
cursor: pointer;
"
@click="handleInvoice(item)"
v-if="item.invoiceId && item.invoiceStatus == 1"
>开发票</span
>下单时间：{{ item.crtTime }}</span
>
</div> </div>
<table class="order-table-1"> <table class="order-table-1">
<tr> <tr>
<td class="goods-name">{{item.nickname}}</td> <td class="goods-name">{{ item.nickname }}</td>
<td class="goods-phone">{{item.phone}}</td> <td class="goods-phone">{{ item.phone }}</td>
<td class="goods-item" v-if="item.type == 1"> <td class="goods-item" v-if="item.type == 1">
<div v-for="iitem in item.orderItemList" :key="iitem.itemId" class="flex-aic goods-ii"> <div
<img style="width: 84px;height: 62px;border-radius: 8px;object-fit: cover;" :src="iitem.itemPic"> v-for="iitem in item.orderItemList"
<span v-if="iitem.type != 1">{{iitem.name}}</span> :key="iitem.itemId"
class="flex-aic goods-ii"
>
<img
style="
width: 84px;
height: 62px;
border-radius: 8px;
object-fit: cover;
"
:src="iitem.itemPic"
/>
<span v-if="iitem.type != 1">{{ iitem.name }}</span>
<div v-else> <div v-else>
<p>卫星：{{iitem.detailJson.imageSatelliteType}}</p> <p>卫星：{{ iitem.detailJson.imageSatelliteType }}</p>
<p>传感器：{{iitem.detailJson.imageSensorType}}</p> <p>传感器：{{ iitem.detailJson.imageSensorType }}</p>
<p>分辨率：{{iitem.imageResolutionStr}}</p> <p>分辨率：{{ iitem.imageResolutionStr }}</p>
<p>云量：{{iitem.detailJson.imageCloudage}}</p> <p>云量：{{ iitem.detailJson.imageCloudage }}</p>
</div> </div>
</div> </div>
</td> </td>
<td class="goods-item" v-if="item.type == 2"> <td class="goods-item" v-if="item.type == 2">
<p>区域范围：{{item.customerJson.provinceName + item.customerJson.cityName + item.customerJson.areaName}}</p> <p>
<p>采集时间：{{ item.customerJson.startTimeStr }}至{{ item.customerJson.endTimeStr }}</p> 区域范围：{{
<p v-if="item.customerJson.type == 1">分辨率：{{ item.customerJson.resolution }}</p> item.customerJson.provinceName +
<p v-if="item.customerJson.type != 3">获取类型：{{ item.customerJson.gainType==101?'数据API': item.customerJson.gainType==102?'实体数据':item.customerJson.gainType==201?'报告':item.customerJson.gainType==202?'web平台':item.customerJson.gainType==203?'其他':item.customerJson.gainType}}</p> item.customerJson.cityName +
<p v-if="item.customerJson.type==3">定制类型：{{ item.customerJson.dataType }}</p> item.customerJson.areaName
<p v-if="item.customerJson.type==3">数据格式：{{ item.customerJson.dataFormat }}</p> }}
</p>
<p>
采集时间：{{ item.customerJson.startTimeStr }}至{{
item.customerJson.endTimeStr
}}
</p>
<p v-if="item.customerJson.type == 1">
分辨率：{{ item.customerJson.resolution }}
</p>
<p v-if="item.customerJson.type != 3">
获取类型：{{
item.customerJson.gainType == 101
? "数据API"
: item.customerJson.gainType == 102
? "实体数据"
: item.customerJson.gainType == 201
? "报告"
: item.customerJson.gainType == 202
? "web平台"
: item.customerJson.gainType == 203
? "其他"
: item.customerJson.gainType
}}
</p>
<p v-if="item.customerJson.type == 3">
定制类型：{{ item.customerJson.dataType }}
</p>
<p v-if="item.customerJson.type == 3">
数据格式：{{ item.customerJson.dataFormat }}
</p>
</td> </td>
<td class="goods-remark">{{item.remark?item.remark:item.customerJson?item.customerJson.descr:''}}</td> <td class="goods-remark">
<td class="send-way-item">{{item.sendType==1?'线上':item.sendType==2?'线下':'线上'}}</td> {{
<td class="pay-way-item">{{item.payType}}</td> item.remark
<td class="amount-item">￥{{item.totalAmount}}</td> ? item.remark
<td class="order-status-item" :style="item.status==4?'color:#f6b725;':item.status==5?'color:#0493fe;':item.status==6?'color:#2fd96f;':item.status==2?'color:#e83328;':''">{{item.status==2?'待付款':item.status==4?'待发货':item.status==5?'待收货':item.status==6?'已完成':item.status==-2?'已取消':item.status==-1?'已删除':item.status}}</td> : item.customerJson
<td style="padding: 20px;border-right: none;"> ? item.customerJson.descr
<span class="normal-btn" v-if="item.status==5 || item.status == 6" @click="handleSee(item)">查看</span> : ""
<span class="normal-btn" v-if="item.status==4 && item.shippingStatus == 0" @click="handleSend(item)">发货</span> }}
</td> </td>
<td class="send-way-item">
{{
item.sendType == 1 ? "线上" : item.sendType == 2 ? "线下" : "线上"
}}
</td>
<td class="pay-way-item">{{ item.payType }}</td>
<td class="amount-item">￥{{ item.totalAmount }}</td>
<td
class="order-status-item"
:style="
item.status == 4
? 'color:#f6b725;'
: item.status == 5
? 'color:#0493fe;'
: item.status == 6
? 'color:#2fd96f;'
: item.status == 2
? 'color:#e83328;'
: ''
"
>
{{
item.status == 2
? "待付款"
: item.status == 4
? "待发货"
: item.status == 5
? "待收货"
: item.status == 6
? "已完成"
: item.status == -2
? "已取消"
: item.status == -1
? "已删除"
: item.status
}}
</td>
<td style="padding: 20px; border-right: none">
<span
class="normal-btn"
v-if="item.status == 5 || item.status == 6"
@click="handleSee(item)"
>查看</span
>
<span
class="normal-btn"
v-if="item.status == 4 && item.shippingStatus == 0"
@click="handleSend(item)"
>发货</span
>
</td>
</tr>
</table>
</div>
<div v-if="list.length <= 0">
<table class="order-table-1">
<tr style="text-align: center">
<td style="padding: 20px; border-right: none">暂无数据</td>
</tr> </tr>
</table> </table>
</div> </div>
<div v-if="list.length<=0"><table class="order-table-1"><tr style="text-align: center;"><td style="padding: 20px;border-right: none;">暂无数据</td></tr></table></div> <div
<div style="width：100%;dispaly:flex;justify-content: center;margin-top:20px" v-show="!listLoading"> style="width：100%;dispaly:flex;justify-content: center;margin-top:20px"
v-show="!listLoading"
>
<el-pagination <el-pagination
style="margin-top: 20px" style="margin-top: 20px"
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -127,18 +297,27 @@ ...@@ -127,18 +297,27 @@
:total="total" :total="total"
></el-pagination> ></el-pagination>
<!--查看发货信息--> <!--查看发货信息-->
<order-send-detail :oneRow="oneRow" v-if="orderSendDetailVisible" v-on:detailEvent="detailEvent"></order-send-detail> <order-send-detail
:oneRow="oneRow"
v-if="orderSendDetailVisible"
v-on:detailEvent="detailEvent"
></order-send-detail>
<!--发货弹窗--> <!--发货弹窗-->
<send v-if="sendVisible" :one-row="oneRow" v-on:sendEvent="sendEvent" :title="title"></send> <send
v-if="sendVisible"
:one-row="oneRow"
v-on:sendEvent="sendEvent"
:title="title"
></send>
</div> </div>
</div> </div>
</template> </template>
<script type="javascript"> <script type="javascript">
import {getOrderList} from "api/website/order/index"; import {getOrderList} from "api/website/order/index";
import orderSendDetail from "./orderSendDetail"; import orderSendDetail from "./orderSendDetail";
import send from './send' import send from './send'
import {timestamp2DateAuto} from "../../../utils/dateUtils"; import {timestamp2DateAuto} from "../../../utils/dateUtils";
export default { export default {
components:{orderSendDetail, send}, components:{orderSendDetail, send},
data() { data() {
return { return {
...@@ -176,6 +355,7 @@ ...@@ -176,6 +355,7 @@
}; };
}, },
created() { created() {
this.listQuery.keywords = this.$route.query.orderNo;
this.getList() this.getList()
}, },
methods: { methods: {
...@@ -281,80 +461,108 @@ ...@@ -281,80 +461,108 @@
this.getList(); this.getList();
}, },
}, },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.order-manage{ .order-manage {
padding: 20px; padding: 20px;
.order-table-1{ .order-table-1 {
width: 100%; width: 100%;
border: 1px solid #eee; border: 1px solid #eee;
border-top: none; border-top: none;
td{ td {
border-right: 1px solid #E6E6E6; border-right: 1px solid #e6e6e6;
} }
} }
.order-filter{ .order-filter {
padding: 24px; padding: 24px;
} }
.el-tabs__item.is-active, .el-tabs__item:hover{ .el-tabs__item.is-active,
color: #F6211D; .el-tabs__item:hover {
color: #f6211d;
} }
.order-table{ .order-table {
background: #F5F6FA;border: 1px solid #E6E6E6;display: flex;align-items: center;height: 45px; background: #f5f6fa;
label{ border: 1px solid #e6e6e6;
color: #A3A6B4; display: flex;
align-items: center;
height: 45px;
label {
color: #a3a6b4;
font-size: 12px; font-size: 12px;
display: flex; display: flex;
} }
} }
.normal-btn{ .normal-btn {
border:1px solid #707070;border-radius: 2px;height: 24px;width: 60px;margin-top: 16px;font-size: 12px;color: #919299;display: block;text-align: center;line-height: 24px;cursor: pointer; border: 1px solid #707070;
border-radius: 2px;
height: 24px;
width: 60px;
margin-top: 16px;
font-size: 12px;
color: #919299;
display: block;
text-align: center;
line-height: 24px;
cursor: pointer;
} }
.pay-btn{ .pay-btn {
background: linear-gradient(90deg,#f6211d, #f9531f);color: #fff;border-radius: 2px;height: 24px;width: 60px;font-size: 12px;color: #fff;display: block;text-align: center;line-height: 24px;cursor: pointer; background: linear-gradient(90deg, #f6211d, #f9531f);
color: #fff;
border-radius: 2px;
height: 24px;
width: 60px;
font-size: 12px;
color: #fff;
display: block;
text-align: center;
line-height: 24px;
cursor: pointer;
} }
.goods-name, .goods-phone, .goods-remark{ .goods-name,
.goods-phone,
.goods-remark {
width: 10%; width: 10%;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
text-align: center; text-align: center;
} }
.goods-item{ .goods-item {
width: 20%; width: 20%;
height: 100%; height: 100%;
padding-left: 10px; padding-left: 10px;
align-items: center; align-items: center;
.goods-ii{ .goods-ii {
border-bottom: 1px solid #E6E6E6; border-bottom: 1px solid #e6e6e6;
padding: 16px; padding: 16px;
} }
.goods-ii:last-child{ .goods-ii:last-child {
border-bottom: none; border-bottom: none;
} }
} }
.pay-way-item, .send-way-item{ .pay-way-item,
.send-way-item {
width: 10%; width: 10%;
height: 100%; height: 100%;
text-align: center; text-align: center;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.amount-item{ .amount-item {
width: 10%; width: 10%;
height: 100%; height: 100%;
text-align: center; text-align: center;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.order-status-item{ .order-status-item {
width: 10%; width: 10%;
height: 100%; height: 100%;
text-align: center; text-align: center;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.option-item{ .option-item {
width: 10%; width: 10%;
height: 100%; height: 100%;
text-align: center; text-align: center;
...@@ -362,16 +570,22 @@ ...@@ -362,16 +570,22 @@
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
} }
.order-no{ .order-no {
color: #43425D; color: #43425d;
font-size: 13px; font-size: 13px;
} }
.order-time{ .order-time {
color: #919299; color: #919299;
font-size: 12px; font-size: 12px;
} }
.order-no-top{ .order-no-top {
background: #F5F6FA;border: 1px solid #E6E6E6;padding: 14px 16px;display: flex;justify-content: space-between;align-items: center;margin-top: 16px; background: #f5f6fa;
} border: 1px solid #e6e6e6;
padding: 14px 16px;
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 16px;
} }
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment