diff --git a/src/api/order/orderInfo.js b/src/api/order/orderInfo.js index ab05c1e..9829f06 100644 --- a/src/api/order/orderInfo.js +++ b/src/api/order/orderInfo.js @@ -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`, diff --git a/src/views/finance/order/OrderInfoInfo.vue b/src/views/finance/order/OrderInfoInfo.vue index dce9f51..8f0ff95 100644 --- a/src/views/finance/order/OrderInfoInfo.vue +++ b/src/views/finance/order/OrderInfoInfo.vue @@ -14,8 +14,8 @@
- {{ orderInfo.userName }}-{{ orderInfo.customerCode }} {{ orderInfo.phone }} - {{ orderInfo.platNumber }} + {{ orderInfo.createName }} - {{ orderInfo.phone }} + {{ orderInfo.plateNumber }}
@@ -27,7 +27,7 @@
- ' markData.ORDER_SOURCE[orderInfo.orderSource]' 创建时间:{{ orderInfo.createTime }} + {{markData.ORDER_SOURCE[orderInfo.orderSource]}} 创建时间:{{ orderInfo.createTime }}
@@ -49,10 +49,10 @@
- {{ orderInfo.name?orderInfo.name:'个人油卡' }} 卡号:{{ orderInfo.accountCardCode }} + {{ orderInfo.name?orderInfo.name:'个人油卡' }}
- {{ orderInfo.orderWfStatus===0?'未核销':'已核销' }} + @@ -69,37 +69,30 @@
- 订单id + 订单编号
- {{ orderInfo.orderSerialNumber }} + {{ orderInfo.id }}
- 订单支付方式 + 三方渠道订单编号
- {{ markData.ORDER_METHOD[orderInfo.orderMethod] }} + {{ orderInfo.otherOrderId }}
- 订单类型 + 订单支付方式
- {{ markData.ORDER_TYPE[orderInfo.orderType] }} + {{ markData.ORDER_METHOD[orderInfo.orderMethod] }}
- 是否补录订单 -
- {{ orderInfo.suppleMark == 0 ? '实时订单' : '补录订单' }} -
-
- -
- 创建设备唯一标识码 + 订单类型
- {{ orderInfo.deviceImei }} + {{ markData.ORDER_TYPE[orderInfo.orderType] }}
@@ -132,15 +125,15 @@ {{ orderInfo.failRemak }} - + + +
创建人
- {{ orderInfo.createUser }} + {{ orderInfo.createName + " - "}}{{ orderInfo.createUser }}
-
-
创建时间 @@ -148,18 +141,11 @@ {{ orderInfo.createTime }}
-
修改人
- {{ orderInfo.updateUser }} + {{ orderInfo.updateName + " - "}}{{ orderInfo.updateUser }}
@@ -169,45 +155,16 @@ {{ orderInfo.updateTime }} -
- -
- 三方渠道订单编号 -
- {{ orderInfo.otherOrderId }} -
-
支付位置
- 坐标:{{ orderInfo.longitude }},{{ orderInfo.latitude }} -
-
- -
- ip地址 -
- {{ orderInfo.networkIp }} -
-
- -
- 优惠券使用标识 -
- {{ orderInfo.couponMark == 0 ? '未使用' : '使用' }} + {{ orderInfo.longitude }} - {{ orderInfo.latitude }}
- @@ -254,13 +211,6 @@ {{ orderInfo.oilsBar }}号枪
- -
- 加油员 -
- {{ orderInfo.siteUser }} -
-
油站所属品牌 @@ -268,7 +218,6 @@ {{ orderInfo.siteBrand | formatBrand }}
- @@ -378,7 +327,7 @@
星油优惠金额
- {{ orderInfo.xoilDiscountAmount }}¥ + {{ orderInfo.oilDiscountAmount }}¥
@@ -392,9 +341,9 @@
- 加价策略/策略比例 + 加价策略
- {{ orderInfo.oilsPriceStrategy }}/{{ orderInfo.oilsPriceScale }} + {{ orderInfo.oilsPriceStrategy }}
@@ -437,77 +386,6 @@
- - -
- - 订单账户信息 -
-
- - -
- 支付类型 -
- {{ orderInfo.payAccountType ? orderInfo.payAccountType == 0 ? '个人账户' : '企业账户' : '' }} -
-
- -
- 是否共享企业额度 -
- {{ orderInfo.shareCompanyQuota ? orderInfo.shareCompanyQuota == 0 ? '否' : '是' : '' }} -
-
- -
- 支付方式 -
- {{ orderInfo.payChannel ? orderInfo.payChannel == 'BALANCE_PAYMENT' ? '余额支付' : '微信支付' : '' }} -
-
-
- - - -
- 发生金额 -
- {{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.occurAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.occurAmount : '' }}¥ -
-
- -
- 当然账户余额 -
- {{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.currentBalance : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.currentBalance : '' }}¥ -
-
- -
- 上次账户余额 -
- {{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.lastBalance : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.lastBalance : '' }}¥ -
-
- -
- 当前累计消费金额 -
- {{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.currentTotalConsumeAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.currentTotalConsumeAmount : '' }}¥ -
-
- -
- 上一次累计消费金额 -
- {{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.lastTotalConsumeAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.lastTotalConsumeAmount : '' }}¥ -
-
-
-
-
- { + orderInfoApi.updateC(this.orderInfo).then(res => { this.$message.success(res.msg) }) }, diff --git a/src/views/finance/order/OrderPersonalInfoList.vue b/src/views/finance/order/OrderPersonalInfoList.vue index 0037cc9..7dcc4ab 100644 --- a/src/views/finance/order/OrderPersonalInfoList.vue +++ b/src/views/finance/order/OrderPersonalInfoList.vue @@ -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); }); diff --git a/vue.config.js b/vue.config.js index 7485924..02e5a21 100644 --- a/vue.config.js +++ b/vue.config.js @@ -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]: ''