diff --git a/.env.development b/.env.development index 8f703d4..99ac41a 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # 共享电动车管理系统/开发环境 # VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api' -VUE_APP_BASE_API = 'http://192.168.2.46:8088' +VUE_APP_BASE_API = 'http://192.168.2.75:8088' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 28c1c4b..2fd714d 100644 --- a/.env.production +++ b/.env.production @@ -5,7 +5,7 @@ VUE_APP_TITLE = 共享电动车管理系统 ENV = 'production' # 共享电动车管理系统/生产环境 -VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api' +VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api' # 小程序外链跳转设备 VUE_APP_WX_DEVICE_URL = 'weixin://dl/business/?appid=wx4d178f8c80348214&env_version=release' diff --git a/.env.staging b/.env.staging index a80081b..c82e110 100644 --- a/.env.staging +++ b/.env.staging @@ -5,6 +5,6 @@ NODE_ENV = production # 测试环境配置 ENV = 'staging' -VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api' +VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api' # 共享电动车管理系统/测试环境 # VUE_APP_BASE_API = 'https://dianche.chuantewulian.cn/stage-api' diff --git a/src/views/system/audit/index.vue b/src/views/system/audit/index.vue index 470f6da..e95735c 100644 --- a/src/views/system/audit/index.vue +++ b/src/views/system/audit/index.vue @@ -468,12 +468,7 @@ export default { created() { console.log("当前用户信息:",this.$store.state.user.name) this.userName = this.$store.state.user.name; - if(this.userName === 'admin'){ - this.queryParams.statusList = '5,6,7'; - }else{ - this.queryParams.statusList = '5,6'; - } - // statusList: '5,6,7',// 如果 + this.queryParams.statusList = '7'; this.reset(); this.reset2(); this.getList(); diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index 5f37ef6..f63633b 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -414,7 +414,7 @@ - + 改价 + 审核 + 去沟通 取 消 + + + + + +

暂无视频

+
+ +
+ + + + + + + + + + + + + + + + + + + @@ -371,7 +422,7 @@ changePrice, refund, returnVehicle, - deduction + deduction, passAudit } from '@/api/system/order' import TrajectoryMap from '@/components/Map/TrajectoryMap' import { getArea, optionselect as getAreaOptionselect } from '@/api/system/area' @@ -398,6 +449,7 @@ export default { areaOptions: [], // 总条数 total: 0, + view: false, // 订单表格数据 orderList: [], area: null, @@ -408,6 +460,8 @@ export default { // 是否显示弹出层 open: false, open2: false, + open3: false, + open4: false, vehicleNum: null, // 查询参数 queryParams: { @@ -454,6 +508,20 @@ export default { reason: null, createTime: null }, + form3: { + orderNo: null, + appointmentFee: null, + ridingFee: null, + dispatchFee: null, + manageFee: null, + reason: null, + createTime: null + }, + form4: { + orderNo: null, + deductionAmount: null, + audioFiles: [] + }, // 表单校验 rules: { orderNo: [ @@ -492,6 +560,76 @@ export default { } }, methods: { + confirmDeduction(){ + // 扣款金额 1. 退剩余押金 + this.$refs["form4"].validate(valid => { + if (valid) { + console.log("------44444---") + if (this.form4.orderId != null) { + this.form4.status = "7"; + updateOrder({ + orderId:this.form4.orderId, + status:this.form4.status, + deductionAmount:this.form4.deductionAmount, + audioFiles: this.form4.audioFiles + }).then(response => { + this.$modal.msgSuccess("操作成功"); + this.open4 = false; + this.getList(); + }); + } + } + }); + }, + /** 通过 */ + pass(){ + this.$refs["form3"].validate(valid => { + if (valid) { + if (this.form3.orderNo != null) { + console.log("---------"+JSON.stringify(this.form3)) + passAudit(this.form3.orderNo).then(response => { + this.$modal.msgSuccess("操作成功"); + this.open3 = false; + this.getList(); + }); + } + } + }); + }, + /** 拒绝 拒绝 提供押金抵扣*/ + reject(){ + console.log("---------") + this.$refs["form3"].validate(valid => { + if (valid) { + console.log("------222---") + if (this.form3.orderId != null) { + this.form3.status = "6"; + updateOrder({orderId:this.form3.orderId,status:this.form3.status}).then(response => { + this.$modal.msgSuccess("操作成功"); + this.open3 = false; + this.getList(); + }); + } + } + }); + }, + // 去沟通 + toCommunicate: function(row) { + this.$modal.confirm2('请确保与客户进行沟通并通过用户同意后方可扣款,并做好录音上传审核通过后方可扣押金,客户电话:'+row.userName,"车损押金扣款","去沟通").then(function() { + console.log("-----去沟通----") + // 打开上传录音弹窗,输入扣款金额 + }).then(() => { + this.form4 = row; + this.open4 = true; + }).catch(() => { + }) + }, + handleAudit(row){ + this.open3 = true; + this.form3 = row; + console.log("this.form3============="+JSON.stringify(this.form3)) + this.view = false; + }, toLog(row){ this.$router.push(`/system/commandLog/orderNo/index/${row.orderNo}`); },