caoliancun
/
dispacth_zhongpin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'it_s' (#7) from it_s into master

Browse Source 
Reviewed-on: #7
it_s
gitea_admin 2 years ago
parent 11a63070f1 d56fec340b
commit 8631597526
4 changed files with 34 additions and 148 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/api/order/orderInfo.js
  2. 169
      src/views/finance/order/OrderInfoInfo.vue
  3. 2
      src/views/finance/order/OrderPersonalInfoList.vue
  4. 2
      vue.config.js

9
src/api/order/orderInfo.js
Unescape View File

@ -1,5 +1,5 @@
import request from '@/utils/request'
var service_name = 'xkhl-finance'
var service_name = 'xkhl-site'
var group_name = 'oilOrderInfo'
var New_Name = 'oilOrderInfoExcel'
export default {
@ -156,6 +156,13 @@ export default {
data: orderInfo
})
},
updateC(orderInfo) { // 更新
return request({
url: `/${service_name}/saasCOrderInfo/update`,
method: 'put',
data: orderInfo
})
},
exportExcel(page) { // 导出
return request({
url: `/${service_name}/${group_name}/export`,

169
src/views/finance/order/OrderInfoInfo.vue
Unescape View File

@ -14,8 +14,8 @@
<svg-icon style="color: #8cb4fd" icon-class="icongongsi-" />
</div>
<div class="item-text" style="display: flex; align-items: center">
<span>{{ orderInfo.userName }}-{{ orderInfo.customerCode }} {{ orderInfo.phone }} </span>
<span v-if="!dataEditor">{{ orderInfo.platNumber }}</span>
<span>{{ orderInfo.createName }} - {{ orderInfo.phone }} </span>
<span v-if="!dataEditor">{{ orderInfo.plateNumber }}</span>
<svg-icon v-if="!dataEditor" style="width: 20px;height:20px;cursor:pointer" icon-class="iconxiugai" @click="changeEditor" />
<el-input v-else ref="inputVal" v-model="orderInfo.plateNumber" style="width: 140px; margin-left: 10px" size="mini" clearable @blur="updateData" />
</div>
@ -27,7 +27,7 @@
<svg-icon style="color: #80de80" icon-class="iconweixinxiaochengxu1" />
</div>
<div class="item-text">
<span> ' markData.ORDER_SOURCE[orderInfo.orderSource]' 创建时间：{{ orderInfo.createTime }}</span>
<span> {{markData.ORDER_SOURCE[orderInfo.orderSource]}} 创建时间：{{ orderInfo.createTime }}</span>
</div>
</div>
</el-col>
@ -49,10 +49,10 @@
<svg-icon style="color: #219cdd" icon-class="iconyouka" />
</div>
<div class="item-text">
<span>{{ orderInfo.name?orderInfo.name:'个人油卡' }} 卡号：{{ orderInfo.accountCardCode }}</span>
<span>{{ orderInfo.name?orderInfo.name:'个人油卡' }}</span>
</div>
</div>
<el-button @click="qrcodefn">{{ orderInfo.orderWfStatus===0?'未核销':'已核销' }}</el-button>
<!-- <el-button @click="qrcodefn">{{ orderInfo.orderWfStatus===0?'未核销':'已核销' }}</el-button> -->
<!-- <div ref="qrCodeUrl" class="qrcode" /> -->
</el-col>
</el-row>
@ -69,37 +69,30 @@
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">订单id</span>
<span class="color-999 test-tst">订单编号</span>
<br>
<span class="inner-data">{{ orderInfo.orderSerialNumber }}</span>
<span class="inner-data">{{ orderInfo.id }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">订单支付方式</span>
<span class="color-999 test-tst">三方渠道订单编号</span>
<br>
<span class="inner-data">{{ markData.ORDER_METHOD[orderInfo.orderMethod] }}</span>
<span class="inner-data">{{ orderInfo.otherOrderId }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">订单类型</span>
<span class="color-999 test-tst">订单支付方式</span>
<br>
<span class="inner-data">{{ markData.ORDER_TYPE[orderInfo.orderType] }}</span>
<span class="inner-data">{{ markData.ORDER_METHOD[orderInfo.orderMethod] }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">是否补录订单</span>
<br>
<span class="inner-data">{{ orderInfo.suppleMark == 0 ? '实时订单' : '补录订单' }}</span>
</div>
</el-col>
<el-col :span="4">
<div class="cell-item">
<span class="color-999 test-tst">创建设备唯一标识码</span>
<span class="color-999 test-tst">订单类型</span>
<br>
<span class="inner-data">{{ orderInfo.deviceImei }}</span>
<span class="inner-data">{{ markData.ORDER_TYPE[orderInfo.orderType] }}</span>
</div>
</el-col>
</el-row>
@ -132,15 +125,15 @@
<span class="inner-data">{{ orderInfo.failRemak }}</span>
</div>
</el-col>
<el-col :span="4">
</el-row>
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">创建人</span>
<br>
<span class="inner-data">{{ orderInfo.createUser }}</span>
<span class="inner-data">{{ orderInfo.createName + " - "}}{{ orderInfo.createUser }}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">创建时间</span>
@ -148,18 +141,11 @@
<span class="inner-data">{{ orderInfo.createTime }}</span>
</div>
</el-col>
<!-- <el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">创建来源</span>
<br>
<span class="inner-data">'markData.CLIENT_GROUP[orderInfo.createSource]'</span>
</div>
</el-col> -->
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">修改人</span>
<br>
<span class="inner-data">{{ orderInfo.updateUser }}</span>
<span class="inner-data">{{ orderInfo.updateName + " - "}}{{ orderInfo.updateUser }}</span>
</div>
</el-col>
<el-col :span="5">
@ -169,45 +155,16 @@
<span class="inner-data">{{ orderInfo.updateTime }}</span>
</div>
</el-col>
<!-- <el-col :span="4">
<div class="cell-item">
<span class="color-999 test-tst">修改来源</span>
<br>
<span class="inner-data">{{ markData.CLIENT_GROUP[orderInfo.updateSource] }}</span>
</div>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">三方渠道订单编号</span>
<br>
<span class="inner-data">{{ orderInfo.otherOrderId }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">支付位置</span>
<br>
<span class="inner-data">坐标：{{ orderInfo.longitude }}，{{ orderInfo.latitude }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">ip地址</span>
<br>
<span class="inner-data">{{ orderInfo.networkIp }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">优惠券使用标识</span>
<br>
<span class="inner-data">{{ orderInfo.couponMark == 0 ? '未使用' : '使用' }}</span>
<span class="inner-data">{{ orderInfo.longitude }} - {{ orderInfo.latitude }}</span>
</div>
</el-col>
</el-row>
</div>
</el-card>
<el-card shadow="never" class="box-card no-wrap">
@ -254,13 +211,6 @@
<span class="inner-data">{{ orderInfo.oilsBar }}号枪</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">加油员</span>
<br>
<span class="inner-data">{{ orderInfo.siteUser }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">油站所属品牌</span>
@ -268,7 +218,6 @@
<span class="inner-data">{{ orderInfo.siteBrand | formatBrand }}</span>
</div>
</el-col>
</el-row>
</div>
</el-card>
@ -378,7 +327,7 @@
<div class="cell-item">
<span class="color-999 test-tst">星油优惠金额</span>
<br>
<span class="inner-data">{{ orderInfo.xoilDiscountAmount }}￥</span>
<span class="inner-data">{{ orderInfo.oilDiscountAmount }}￥</span>
</div>
</el-col>
<el-col :span="4">
@ -392,9 +341,9 @@
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">加价策略/策略比例</span>
<span class="color-999 test-tst">加价策略</span>
<br>
<span class="inner-data">{{ orderInfo.oilsPriceStrategy }}/{{ orderInfo.oilsPriceScale }}</span>
<span class="inner-data">{{ orderInfo.oilsPriceStrategy }}</span>
</div>
</el-col>
<el-col :span="5">
@ -437,77 +386,6 @@
</el-row>
</div>
</el-card>
<el-card shadow="never" class="box-card no-wrap">
<div slot="header">
<span class="card-header-icon"><svg-icon style="color: #118dde" icon-class="iconjichuziliao" /></span>
<span class="card-header-text">订单账户信息</span>
</div>
<div class="card-content">
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">支付类型</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType ? orderInfo.payAccountType == 0 ? '个人账户' : '企业账户' : '' }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">是否共享企业额度</span>
<br>
<span class="inner-data">{{ orderInfo.shareCompanyQuota ? orderInfo.shareCompanyQuota == 0 ? '否' : '是' : '' }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">支付方式</span>
<br>
<span class="inner-data">{{ orderInfo.payChannel ? orderInfo.payChannel == 'BALANCE_PAYMENT' ? '余额支付' : '微信支付' : '' }}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">发生金额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.occurAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.occurAmount : '' }}￥</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">当然账户余额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.currentBalance : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.currentBalance : '' }}￥</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">上次账户余额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.lastBalance : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.lastBalance : '' }}￥</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">当前累计消费金额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.currentTotalConsumeAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.currentTotalConsumeAmount : '' }}￥</span>
</div>
</el-col>
<el-col :span="4">
<div class="cell-item">
<span class="color-999 test-tst">上一次累计消费金额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.lastTotalConsumeAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.lastTotalConsumeAmount : '' }}￥</span>
</div>
</el-col>
</el-row>
</div>
</el-card>
</section>
<el-dialog
title="请扫描二维码核销"
@ -581,6 +459,7 @@ export default {
},
computed: {
...mapGetters(['sysUserList', 'markData'])
},
created() {
console.log(this.orderInfo.orderSerialNumber, '666')
@ -637,7 +516,7 @@ export default {
},
updateData() {
this.dataEditor = false
orderInfoApi.update(this.orderInfo).then(res => {
orderInfoApi.updateC(this.orderInfo).then(res => {
this.$message.success(res.msg)
})
},

2
src/views/finance/order/OrderPersonalInfoList.vue
Unescape View File

@ -877,7 +877,7 @@ export default {
changeRowPlate(row) {
// 修改车牌号
row.accountCardCode = null;
orderInfoApi.update(row).then((res) => {
orderInfoApi.updateC(row).then((res) => {
this.$message.success(res.msg);
this.$set(row, "editor", false);
});

2
vue.config.js
Unescape View File

@ -26,7 +26,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: {
// target: "http://uat.xingoil.com/adminapi",
// target: 'https://www.xingoil.com/adminapi',
target: `http://192.168.0.27:38080`,
target: `http://192.168.0.22:38080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''

Write Preview
Loading…
Cancel
Save