Skip to content

R
rs-cloud-platform-ui
Commit 265c63b3 authored by lixy's avatar lixy
Browse files
Options

订单-回退版本

parent 69c4e885
Hide whitespace changes
Inline Side-by-side
Showing with 314 additions and 757 deletions
src/views/orderManagement/orderList/index.vue
View file @ 265c63b3
...@@ -20,56 +20,34 @@ ...@@ -20,56 +20,34 @@
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>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单状态"> <el-form-item label="订单状态">
<el-select <el-select filterable v-model="listQuery.status" placeholder="请选择">
filterable <el-option :key="undefined" label="全部" :value="undefined"></el-option>
v-model="listQuery.status" <el-option v-for="item in orderStatusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
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-row> </el-row>
<el-row> <el-row>
<!-- <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>-->
<!-- </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 <el-select filterable v-model="listQuery.sendType" placeholder="请选择">
filterable <el-option :key="undefined" label="全部" :value="undefined"></el-option>
v-model="listQuery.sendType"
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>
...@@ -78,11 +56,7 @@ ...@@ -78,11 +56,7 @@
<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 <el-option :key="undefined" label="全部" :value="undefined"></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>
...@@ -90,16 +64,8 @@ ...@@ -90,16 +64,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否开发票"> <el-form-item label="是否开发票">
<el-select <el-select filterable v-model="listQuery.invoiceStatus" placeholder="请选择">
filterable <el-option :key="undefined" label="全部" :value="undefined"></el-option>
v-model="listQuery.invoiceStatus"
placeholder="请选择"
>
<el-option
:key="undefined"
label="全部"
:value="undefined"
></el-option>
<el-option :key="1" label="是" :value="2"></el-option> <el-option :key="1" label="是" :value="2"></el-option>
<el-option :key="2" label="否" :value="1"></el-option> <el-option :key="2" label="否" :value="1"></el-option>
</el-select> </el-select>
...@@ -108,16 +74,8 @@ ...@@ -108,16 +74,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-button <el-button type="primary" @click="handleFilter">筛选</el-button>
type="primary" <el-button type="primary" plain @click="clear_search">清空筛选条件</el-button>
plain
@click="handleFilter"
icon="el-icon-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>
...@@ -135,272 +93,70 @@ ...@@ -135,272 +93,70 @@
</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" <span class="order-no">订单号：{{item.orderNo}}
>订单号：{{ item.orderNo }} <span class="tag-invoice" v-if="item.invoiceStatus>=2">已开票</span>
<span class="tag-invoice" v-if="item.invoiceStatus >= 2">已开票</span>
<span class="tag-no" v-else-if="item.invoiceId">开发票</span> <span class="tag-no" v-else-if="item.invoiceId">开发票</span>
<span class="tag-no" style="color: #d9001b" v-if="item.type == 2" <span class="tag-no" style="color: #d9001b;" v-if="item.type == 2">定制</span>
>定制</span
>
</span> </span>
<span class="order-time" <span class="order-time"><span class="tag-invoice-no" @click="handleInvoice(item)" v-if="item.invoiceId && item.invoiceStatus == 1">开发票</span>下单时间：{{item.crtTime}}</span>
><span
class="tag-invoice-no"
@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 <div v-for="iitem in item.orderItemList" :key="iitem.itemId" class="flex-aic goods-ii">
v-for="iitem in item.orderItemList" <div class="flex-aic-jcb" style="width: 100%;">
:key="iitem.itemId"
class="flex-aic goods-ii"
>
<div class="flex-aic-jcb" style="width: 100%">
<div class="flex-aic"> <div class="flex-aic">
<img <img style="width: 84px;height: 62px;border-radius: 8px;object-fit: cover;margin-right: 6px;" :src="iitem.itemPic">
style="
width: 84px;
height: 62px;
border-radius: 8px;
object-fit: cover;
margin-right: 6px;
"
:src="iitem.itemPic"
/>
<div v-if="iitem.type != 1"> <div v-if="iitem.type != 1">
<p>{{ iitem.name }}</p> <p>{{iitem.name}}</p>
<p v-if="iitem.type == 2">尺寸：{{ iitem.fileWidth }}</p> <p v-if="iitem.type==2">尺寸：{{iitem.fileWidth}}</p>
<p v-if="iitem.type == 3">类别：{{ iitem.firstTitle }}</p> <p v-if="iitem.type==3">类别：{{iitem.firstTitle}}</p>
</div> </div>
<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>
<p style="padding-right: 10px"> <p style="padding-right: 10px;">{{iitem.type==1?'标准数据':iitem.type==3?'行业应用':iitem.type==2?'影像图库':iitem.type}}</p>
{{
iitem.type == 1
? "标准数据"
: iitem.type == 3
? "行业应用"
: iitem.type == 2
? "影像图库"
: iitem.type
}}
</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">
<div class="flex-aic-jcb"> <div class="flex-aic-jcb">
<div> <div>
<p> <p>区域范围：{{item.customerJson.provinceName + item.customerJson.cityName + item.customerJson.areaName}}</p>
区域范围：{{ <p>采集时间：{{ item.customerJson.startTimeStr }}至{{ item.customerJson.endTimeStr }}</p>
item.customerJson.provinceName + <p v-if="item.customerJson.type == 1">分辨率：{{ item.customerJson.resolution }}</p>
item.customerJson.cityName + <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.areaName <p v-if="item.customerJson.type==3">定制类型：{{ item.customerJson.dataType }}</p>
}} <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>
</div> </div>
<p style="padding-right: 10px"> <p style="padding-right: 10px;">{{item.customerJson.type==1?'编程需求':item.customerJson.type==2?'专题应用需求':item.customerJson.type==3?'影像图需求':item.customerJson.type}}</p>
{{
item.customerJson.type == 1
? "编程需求"
: item.customerJson.type == 2
? "专题应用需求"
: item.customerJson.type == 3
? "影像图需求"
: item.customerJson.type
}}
</p>
</div> </div>
</td> </td>
<td class="goods-remark"> <td class="goods-remark">{{item.remark?item.remark:item.customerJson?item.customerJson.descr:''}}</td>
{{ <td class="send-way-item">{{item.sendType==1?'线上':item.sendType==2?'线下':'线上'}}</td>
item.remark <td class="pay-way-item" :style="item.payType==3?'color:#f6b725;':item.payType==2?'color:#13a8ff;':'color:#73d721;'">{{item.payType==1?'微信支付':item.payType==2?'支付宝':item.payType==3?'对公支付':item.payType}}</td>
? item.remark <td class="amount-item">￥{{item.totalAmount}}</td>
: item.customerJson <td class="order-status-item" v-if="item.payType==3" :style="item.status==4?'color:#f6b725;':item.status==5?'color:#0493fe;':item.status==6?'color:#2fd96f;':item.status==2&& !item.payImg?'color:#e83328;':item.status==2&& item.payImg?'color:#13a8ff;':''">{{item.status==2 && !item.payImg?'待付款':item.status==2 && item.payImg && !item.auditStatus?'待审核':item.status==2 && item.payImg && item.auditStatus==2?'已拒绝':item.status==4?'待发货':item.status==5?'待收货':item.status==6?'已完成':item.status==-2?'已取消':item.status==-1?'已删除':item.status}}</td>
? item.customerJson.descr <td class="order-status-item" v-else :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>
</td> <span class="normal-btn" v-if="item.status==4 && item.shippingStatus == 0 && item.type == 1" @click="handleSend(item)">发货</span>
<td class="send-way-item"> <span class="normal-btn" v-if="item.status==4 && item.type == 2" @click="handleData(item)">选择数据</span>
{{ <span class="normal-btn" style="border: 1px solid #13a8ff;color: #13a8ff;" v-if="item.status==2 && item.payType == 3" @click="handleAudit(item)">{{item.auditStatus?'查看':'待审核'}}</span>
item.sendType == 1 ? "线上" : item.sendType == 2 ? "线下" : "线上"
}}
</td>
<td
class="pay-way-item"
:style="
item.payType == 3
? 'color:#f6b725;'
: item.payType == 2
? 'color:#13a8ff;'
: 'color:#73d721;'
"
>
{{
item.payType == 1
? "微信支付"
: item.payType == 2
? "支付宝"
: item.payType == 3
? "对公支付"
: item.payType
}}
</td>
<td class="amount-item">￥{{ item.totalAmount }}</td>
<td
class="order-status-item"
v-if="item.payType == 3"
:style="
item.status == 4
? 'color:#f6b725;'
: item.status == 5
? 'color:#0493fe;'
: item.status == 6
? 'color:#2fd96f;'
: item.status == 2 && !item.payImg
? 'color:#e83328;'
: item.status == 2 && item.payImg
? 'color:#13a8ff;'
: ''
"
>
{{
item.status == 2 && !item.payImg
? "待付款"
: item.status == 2 && item.payImg && !item.auditStatus
? "待审核"
: item.status == 2 && item.payImg && item.auditStatus == 2
? "已拒绝"
: item.status == 4
? "待发货"
: item.status == 5
? "待收货"
: item.status == 6
? "已完成"
: item.status == -2
? "已取消"
: item.status == -1
? "已删除"
: item.status
}}
</td>
<td
class="order-status-item"
v-else
: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 && item.type == 1
"
@click="handleSend(item)"
>发货</span
>
<span
class="normal-btn"
v-if="item.status == 4 && item.type == 2"
@click="handleData(item)"
>选择数据</span
>
<span
class="normal-btn"
style="border: 1px solid #13a8ff; color: #13a8ff"
v-if="item.status == 2 && item.payType == 3"
@click="handleAudit(item)"
>{{ item.auditStatus ? "查看" : "待审核" }}</span
>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div v-if="list.length <= 0"> <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>
<table class="order-table-1"> <div style="width：100%;dispaly:flex;justify-content: center;margin-top:20px" v-show="!listLoading">
<tr style="text-align: center">
<td style="padding: 20px; border-right: none">暂无数据</td>
</tr>
</table>
</div>
<div
style="width：100%;dispaly:flex;justify-content: center;margin-top:20px"
v-show="!listLoading"
>
<el-pagination <el-pagination
style="text-align: center" style="margin-top: 20px"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="listQuery.page" :current-page="listQuery.page"
...@@ -410,107 +166,51 @@ ...@@ -410,107 +166,51 @@
:total="total" :total="total"
></el-pagination> ></el-pagination>
<!--查看发货信息--> <!--查看发货信息-->
<order-send-detail <order-send-detail :oneRow="oneRow" v-if="orderSendDetailVisible" v-on:detailEvent="detailEvent"></order-send-detail>
:oneRow="oneRow"
v-if="orderSendDetailVisible"
v-on:detailEvent="detailEvent"
></order-send-detail>
<!--发货弹窗--> <!--发货弹窗-->
<send <send v-if="sendVisible" :one-row="oneRow" v-on:sendEvent="sendEvent" :title="title"></send>
v-if="sendVisible"
:one-row="oneRow"
v-on:sendEvent="sendEvent"
:title="title"
></send>
<!--定制数据-选择数据--> <!--定制数据-选择数据-->
<select-data-dialog <select-data-dialog v-if="selectDataVisible" :one-row="oneRow" v-on:selectDataEvent="selectDataEvent"></select-data-dialog>
v-if="selectDataVisible"
:one-row="oneRow"
v-on:selectDataEvent="selectDataEvent"
></select-data-dialog>
<!--对公支付审核--> <!--对公支付审核-->
<el-dialog :visible="auditVisible" title="对公支付审核" @close="cancel"> <el-dialog :visible="auditVisible" title="对公支付审核" @close="cancel">
<label style="color: red">转账信息</label> <label style="color: red">转账信息</label>
<div <div v-if="companyAccountInfo.detail" style="border: 1px solid #eee;padding: 16px;margin: 20px 0;">
v-if="companyAccountInfo.detail" <div style="margin-bottom: 20px;">户名：{{companyAccountInfo.detail.accountName}}</div>
style="border: 1px solid #eee; padding: 16px; margin: 20px 0" <div style="margin-bottom: 20px;">账号：{{companyAccountInfo.detail.account}}</div>
> <div>开户行：{{companyAccountInfo.detail.openBank}}</div>
<div style="margin-bottom: 20px">
户名：{{ companyAccountInfo.detail.accountName }}
</div>
<div style="margin-bottom: 20px">
账号：{{ companyAccountInfo.detail.account }}
</div>
<div>开户行：{{ companyAccountInfo.detail.openBank }}</div>
</div> </div>
<label style="color: red">上传信息</label> <label style="color: red">上传信息</label>
<div style="border: 1px solid #eee; padding: 16px; margin-top: 20px"> <div style="border: 1px solid #eee;padding: 16px;margin-top: 20px;">
<div class="flex-aic"> <div class="flex-aic">
<label>支付凭证：</label> <label>支付凭证：</label>
<el-image <el-image
style="width: 100px; height: 100px" style="width: 100px; height: 100px;"
:src="oneRow.payImg" :src="oneRow.payImg"
:preview-src-list="[oneRow.payImg]" :preview-src-list="[oneRow.payImg]">
>
</el-image> </el-image>
</div> </div>
</div> </div>
<el-form <el-form label-width="80px" style="margin-top: 20px;" ref="form" :rules="rules" :model="form" v-if="!oneRow.auditStatus">
label-width="80px"
style="margin-top: 20px"
ref="form"
:rules="rules"
:model="form"
v-if="!oneRow.auditStatus"
>
<el-row> <el-row>
<el-form-item label="审核结果" prop="auditStatus"> <el-form-item label="审核结果" prop="auditStatus">
<el-radio <el-radio v-model="form.auditStatus" :label="1" @change="checkValid">通过</el-radio>
v-model="form.auditStatus" <el-radio v-model="form.auditStatus" :label="2" @change="checkValid">拒绝</el-radio>
:label="1"
@change="checkValid"
>通过</el-radio
>
<el-radio
v-model="form.auditStatus"
:label="2"
@change="checkValid"
>拒绝</el-radio
>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item <el-form-item label="拒绝原因" prop="auditReason" v-if="form.auditStatus == 2">
label="拒绝原因" <el-input type="textarea" v-model="form.auditReason" placeholder="请输入拒绝原因" :maxlength="400" :row="4"></el-input>
prop="auditReason"
v-if="form.auditStatus == 2"
>
<el-input
type="textarea"
v-model="form.auditReason"
placeholder="请输入拒绝原因"
:maxlength="400"
:row="4"
></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<div v-else> <div v-else>
<div style="margin-bottom: 20px; margin-top: 20px"> <div style="margin-bottom: 20px;margin-top: 20px;">审核状态：{{ oneRow.auditStatus == 1?'已通过':'已拒绝' }}</div>
审核状态：{{ oneRow.auditStatus == 1 ? "已通过" : "已拒绝" }} <div style="margin-bottom: 20px;">拒绝原因：{{ oneRow.auditReason }}</div>
</div>
<div style="margin-bottom: 20px">
拒绝原因：{{ oneRow.auditReason }}
</div>
</div> </div>
<div slot="footer" class="dialog-footer" v-if="!oneRow.auditStatus"> <div slot="footer" class="dialog-footer" v-if="!oneRow.auditStatus">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" v-if="!isClick" @click="okSend('form')" <el-button type="primary" v-if="!isClick" @click="okSend('form')">确 定</el-button>
>确 定</el-button <el-button type="primary" v-else style="opacity: 0.6;" disabled>确 定</el-button>
>
<el-button type="primary" v-else style="opacity: 0.6" disabled
>确 定</el-button
>
</div> </div>
<div slot="footer" class="dialog-footer" v-else> <div slot="footer" class="dialog-footer" v-else>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
...@@ -520,63 +220,52 @@ ...@@ -520,63 +220,52 @@
</div> </div>
</template> </template>
<script type="javascript"> <script type="javascript">
import { import {getOrderList, updatePayStatus, getCompanyInfoByType} from "api/website/order/index";
getOrderList, import orderSendDetail from "./orderSendDetail";
updatePayStatus, import selectDataDialog from './selectDataDialog'
getCompanyInfoByType, import send from './send'
} from "api/website/order/index"; import {timestamp2DateAuto} from "../../../utils/dateUtils";
import orderSendDetail from "./orderSendDetail"; export default {
import selectDataDialog from "./selectDataDialog"; components:{orderSendDetail, send, selectDataDialog},
import send from "./send"; data() {
import { timestamp2DateAuto } from "../../../utils/dateUtils"; return {
export default { title: '订单发货',
components: { orderSendDetail, send, selectDataDialog }, activeName: '1',
data() { orderStatusList: [
return { // {id: 0, name: '定制订单无价格'},
title: "订单发货", // {id: 1, name: '创建订单'},
activeName: "1", {id: 2, name: '待付款'},
orderStatusList: [ // {id: 3, name: '已支付'},
// {id: 0, name: '定制订单无价格'}, {id: 4, name: '待发货'},
// {id: 1, name: '创建订单'}, {id: 5, name: '已收货'},
{ id: 2, name: "待付款" }, {id: 6, name: '已完成'},
// {id: 3, name: '已支付'}, // {id: -1, name: '删除'},
{ id: 4, name: "待发货" }, {id: -2, name: '已取消'},
{ id: 5, name: "已收货" }, // {id: -3, name: '退款'}
{ id: 6, name: "已完成" }, ],
// {id: -1, name: '删除'}, isClick: false, // 是否已点击审核
{ id: -2, name: "已取消" }, auditVisible: false, // 对公支付审核
// {id: -3, name: '退款'} listQuery: {
], name: undefined, // 商品名称
isClick: false, // 是否已点击审核 page: 1,
auditVisible: false, // 对公支付审核 limit: 10,
listQuery: { startTime: undefined, // 下单时间
name: undefined, // 商品名称 endTime: undefined, // 下单时间
page: 1, payStatus: undefined, // 支付状态: 1、已支付，2、未支付
limit: 10, keywords: undefined, // 订单搜索
startTime: undefined, // 下单时间 status: undefined, // 订单状态：0、定制订单无价格 1--创建订单，2--待付款，3--已支付，4--已发货, 5--已收货, 6、已完成 -1、删除，-2、取消, -3 退款
endTime: undefined, // 下单时间 invoiceStatus: undefined, // 发票状态： 1、未开发票，2、已开发票, 3、已发货， 4、已收货、5、退回， 6、已完成
payStatus: undefined, // 支付状态: 1、已支付，2、未支付 type: undefined, // 1、普通订单，2、定制订单
keywords: undefined, // 订单搜索 sendType: undefined, // 配送方式:1、线上配送，2、快递配送
status: undefined, // 订单状态：0、定制订单无价格 1--创建订单，2--待付款，3--已支付，4--已发货, 5--已收货, 6、已完成 -1、删除，-2、取消, -3 退款 },
invoiceStatus: undefined, // 发票状态： 1、未开发票，2、已开发票, 3、已发货， 4、已收货、5、退回， 6、已完成 form:{
type: undefined, // 1、普通订单，2、定制订单 auditStatus: undefined, // 审核状态： 1、审核通过，2、审核拒绝
sendType: undefined, // 配送方式:1、线上配送，2、快递配送 auditReason: undefined, // 审核理由
}, orderNo: undefined // 订单号
form: {
auditStatus: undefined, // 审核状态： 1、审核通过，2、审核拒绝
auditReason: undefined, // 审核理由
orderNo: undefined, // 订单号
},
rules: {
auditReason: {
required: true,
message: "请输入拒绝原因",
trigger: "blur",
}, },
auditStatus: { rules: {
required: true, auditReason: { required: true, message: '请输入拒绝原因', trigger: 'blur' },
message: "请选择审核结果", auditStatus: {required: true, message: '请选择审核结果', trigger: 'change' }
trigger: "change",
}, },
listLoading: false, listLoading: false,
times: [], // 时间 times: [], // 时间
...@@ -589,187 +278,115 @@ export default { ...@@ -589,187 +278,115 @@ export default {
selectDataVisible: false, // 选择数据 selectDataVisible: false, // 选择数据
companyAccountInfo: {}, // 对公信息 companyAccountInfo: {}, // 对公信息
}; };
this.auditVisible = true;
}, },
/** created() {
* 检测填写状态 this.listQuery.keywords = this.$route.query.orderNo;
*/ this.getList()
checkValid() { this.companyInfoByType() // 获取对公信息
this.$refs["form"].validateField("auditStatus", (picError) => {
//审核结果
if (!picError) {
console.log("审核结果-已选择");
} else {
return false;
}
});
}, },
/** methods: {
* 提交审核 handleFilter() {
*/ this.listQuery.page = 1
okSend(formName) { this.getList();
let _this = this; },
if (this.isClick) { handleSizeChange(val) {
return; this.listQuery.limit = val;
} this.getList();
this.isClick = true; },
setTimeout(function () { handleCurrentChange(val) {
_this.isClick = false; this.listQuery.page = val;
}, 2000); this.getList();
const set = this.$refs; },
set[formName].validate((valid) => { /**
if (valid) { * 取消审核
updatePayStatus(this.form).then((response) => { */
if (response.status == 200) { cancel(){
this.$notify({ this.auditVisible = false
title: "成功", },
message: "操作成功", /**
type: "success", * 对公支付-待审核
duration: 2000, */
}); handleAudit(row){
this.auditVisible = false; this.oneRow = row
this.getList(); this.form = {
} else { auditStatus: undefined, // 审核状态： 1、审核通过，2、审核拒绝
this.$notify({ auditReason: undefined, // 审核理由
title: "失败", orderNo: row.orderNo // 订单号
message: response.message,
type: "error",
duration: 2000,
});
}
});
} }
}); this.auditVisible = true;
}, },
/** /**
* 查看弹窗关闭 * 检测填写状态
*/ */
detailEvent() { checkValid(){
this.orderSendDetailVisible = false; this.$refs['form'].validateField('auditStatus', picError => { //审核结果
}, if (!picError) {
/** console.log('审核结果-已选择')
* 获取对公信息 } else {
*/ return false;
companyInfoByType() {
getCompanyInfoByType({ type: 2 }).then((res) => {
if (res.status == 200) {
if (res.data.length > 0) {
res.data[0].detail = res.data[0].detail
? JSON.parse(res.data[0].detail)
: {};
this.companyAccountInfo = res.data[0];
} }
} else { });
this.$notify({ },
title: "失败", /**
message: res.message, * 提交审核
type: "error", */
duration: 2000, okSend(formName){
}); let _this = this
if(this.isClick){
return
} }
}); this.isClick = true
}, setTimeout(function(){
/** _this.isClick = false
* 选择数据-关闭弹窗 }, 2000)
*/ const set = this.$refs;
selectDataEvent(e) { set[formName].validate((valid) => {
if (e) { if (valid) {
this.getList(); updatePayStatus(this.form).then((response) => {
} if(response.status == 200){
this.selectDataVisible = false; this.$notify({
}, title: "成功",
/** message: "操作成功",
* 查看 type: "success",
*/ duration: 2000
handleSee(row) { });
this.oneRow = row; this.auditVisible = false
this.orderSendDetailVisible = true; this.getList()
}, } else {
/** this.$notify({
* 发货弹窗关闭 title: '失败',
*/ message: response.message,
sendEvent(e) { type: 'error',
if (e) { duration: 2000
this.getList(); })
}
this.sendVisible = false;
},
/**
* 开票发货
*/
handleInvoice(row) {
this.oneRow = row;
this.title = "发票发货";
this.sendVisible = true;
},
/**
* 发货
*/
handleSend(row) {
this.oneRow = row;
this.title = "订单发货";
this.sendVisible = true;
},
/**
* 选择数据
*/
handleData(row) {
this.oneRow = row;
this.selectDataVisible = true;
},
/**
* 商品品牌列表
*/
getList() {
let _this = this;
this.listLoading = true;
if (this.times.length > 0) {
this.listQuery.startTime = this.times[0];
this.listQuery.endTime = this.times[1];
}
getOrderList(this.listQuery).then((response) => {
let a = response.data.data;
a.map(function (item) {
if (item.orderItemList) {
item.orderItemList.map(function (iitem) {
iitem.detailJson = iitem.detailJson
? JSON.parse(iitem.detailJson)
: {};
if (iitem.type == 2) {
// 影像图库-尺寸
iitem.fileWidth =
iitem.detailJson.imageInfoRelationList &&
iitem.detailJson.imageInfoRelationList.length > 0
? iitem.detailJson.imageInfoRelationList[0].fileWidth
: "";
}
if (iitem.type == 3) {
// 行业应用-类别
iitem.firstTitle = iitem.detailJson.firstTitle
? iitem.detailJson.firstTitle
: "";
}
if (iitem.type == 1) {
// 标准数据
iitem.imageResolutionStr = iitem.detailJson.imageResolution
? iitem.detailJson.imageResolution.replace(/{/g, "")
: "";
iitem.imageResolutionStr = iitem.imageResolutionStr
? iitem.imageResolutionStr.replace(/}/g, "")
: "";
} }
}); });
} }
if (item.customerJson) { })
item.customerJson = JSON.parse(item.customerJson); },
item.customerJson.startTimeStr = timestamp2DateAuto( /**
item.customerJson.startTime, * 查看弹窗关闭
"yyyy-MM-dd" */
); detailEvent(){
item.customerJson.endTimeStr = timestamp2DateAuto( this.orderSendDetailVisible = false
item.customerJson.endTime, },
"yyyy-MM-dd" /**
); * 获取对公信息
*/
companyInfoByType(){
getCompanyInfoByType({type: 2}).then((res) => {
if(res.status == 200){
if(res.data.length>0){
res.data[0].detail = res.data[0].detail?JSON.parse(res.data[0].detail):{}
this.companyAccountInfo = res.data[0]
}
} else {
this.$notify({
title: "失败",
message: res.message,
type: "error",
duration: 2000,
});
} }
}); });
}, },
...@@ -885,161 +502,101 @@ export default { ...@@ -885,161 +502,101 @@ export default {
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 {
color: #f6211d;
}
.order-table {
background: #f5f6fa;
border: 1px solid #e6e6e6;
display: flex;
align-items: center;
height: 45px;
label {
color: #444444;
font-size: 15px;
font-weight: 600;
display: flex;
} }
} .el-tabs__item.is-active, .el-tabs__item:hover{
.normal-btn { color: #F6211D;
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 {
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 {
width: 10%;
justify-content: center;
align-items: center;
text-align: center;
}
.goods-item {
width: 30%;
height: 100%;
padding-left: 10px;
align-items: center;
.goods-ii {
border-bottom: 1px solid #e6e6e6;
padding: 16px;
} }
.goods-ii:last-child { .order-table{
border-bottom: none; background: #F5F6FA;border: 1px solid #E6E6E6;display: flex;align-items: center;height: 45px;
label{
color: #A3A6B4;
font-size: 12px;
display: flex;
}
} }
.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;
}
.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;
}
.goods-name, .goods-phone, .goods-remark{
width: 10%;
justify-content: center;
align-items: center;
text-align: center;
}
.goods-item{
width: 30%;
height: 100%;
padding-left: 10px;
align-items: center;
.goods-ii{
border-bottom: 1px solid #E6E6E6;
padding: 16px;
}
.goods-ii:last-child{
border-bottom: none;
}
}
.pay-way-item, .send-way-item{
width: 8%;
height: 100%;
text-align: center;
justify-content: center;
align-items: center;
}
img{object-fit: cover;}
.amount-item{
width: 10%;
height: 100%;
text-align: center;
justify-content: center;
align-items: center;
}
.order-status-item{
width: 8%;
height: 100%;
text-align: center;
justify-content: center;
align-items: center;
}
.option-item{
width: 8%;
height: 100%;
text-align: center;
align-items: center;
justify-content: center;
flex-direction: column;
}
.order-no{
color: #43425D;
font-size: 13px;
}
.order-time{
color: #919299;
font-size: 12px;
}
.order-no-top{
background: #F5F6FA;border: 1px solid #E6E6E6;padding: 14px 16px;display: flex;justify-content: space-between;align-items: center;margin-top: 16px;
}
.tag-invoice{background: #f8ddbb;color: #F59A23;font-size: 12px;padding: 2px 10px;border-radius: 10px;margin-left:10px;}
.tag-invoice-no{background: #1890FF;color: #fff;font-size: 12px;padding: 2px 10px;border-radius: 4px;margin-right:10px;cursor: pointer;}
.tag-no{border:1px solid #eee;color: #1890FF;font-size: 12px;padding: 2px 10px;border-radius: 10px;margin-left:10px;}
} }
.pay-way-item,
.send-way-item {
width: 8%;
height: 100%;
text-align: center;
justify-content: center;
align-items: center;
}
img {
object-fit: cover;
}
.amount-item {
width: 10%;
height: 100%;
text-align: center;
justify-content: center;
align-items: center;
}
.order-status-item {
width: 8%;
height: 100%;
text-align: center;
justify-content: center;
align-items: center;
}
.option-item {
width: 8%;
height: 100%;
text-align: center;
align-items: center;
justify-content: center;
flex-direction: column;
}
.order-no {
color: #43425d;
font-size: 13px;
}
.order-time {
color: #919299;
font-size: 12px;
}
.order-no-top {
background: #f5f6fa;
border: 1px solid #e6e6e6;
padding: 14px 16px;
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 16px;
}
.tag-invoice {
background: #f8ddbb;
color: #f59a23;
font-size: 12px;
padding: 2px 10px;
border-radius: 10px;
margin-left: 10px;
}
.tag-invoice-no {
background: #1890ff;
color: #fff;
font-size: 12px;
padding: 2px 10px;
border-radius: 4px;
margin-right: 10px;
cursor: pointer;
}
.tag-no {
border: 1px solid #eee;
color: #1890ff;
font-size: 12px;
padding: 2px 10px;
border-radius: 10px;
margin-left: 10px;
}
}
</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