1.调整

.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

.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'

.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'

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 = '7';
-      this.queryParams.statusList = '5,6,7';
-    }else{
-      this.queryParams.statusList = '5,6';
-    }
-    // statusList: '5,6,7',// 如果
     this.reset();
     this.reset2();
     this.getList();

src/views/system/device/index.vue

@@ -414,7 +414,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="硬件版本" prop="deviceName" v-if="hardwareVersionOptions.length > 0">
+          <el-form-item label="硬件版本" prop="deviceName" v-if="hardwareVersionOptions.length > 0" disabled="username != 'admin'" >
             <el-select v-model="form.hardwareVersionId" clearable placeholder="请选择硬件版本">
               <el-option
                 v-for="item in hardwareVersionOptions"

src/views/system/order/index.vue

@@ -154,6 +154,22 @@
             @click="changePrice(scope.row)"
             v-hasPermi="['system:order:edit']"
           >改价</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-check"
+            v-if="scope.row.status == '5'"
+            @click="handleAudit(scope.row)"
+            v-hasPermi="['system:order:edit']"
+          >审核</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status == '6'"
+            icon="el-icon-money"
+            @click="toCommunicate(scope.row)"
+            v-hasPermi="['system:order:edit']"
+          >去沟通</el-button>
           <el-button
             size="mini"
             type="text"
@@ -358,6 +374,41 @@
         <el-button @click="cancel2">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 审核对话框 -->
+    <el-dialog title="审核" :visible.sync="open3" width="700px" append-to-body>
+      <el-form :model="form3" ref="form3" label-width="100px" size="mini">
+        <video v-if="form3.videoUrl" :src="form3.videoUrl" controls width="70%" height="auto"></video>
+        <p v-else>暂无视频</p>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-show="view == true" @click="open3 = false">关 闭</el-button>
+        <el-button v-show="view == false" type="success" @click="pass">通 过</el-button>
+        <el-button v-show="view == false" type="danger" @click="reject">车辆有损坏</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 沟通录音弹窗 -->
+    <el-dialog style="margin-top: 10vh !important;" title="沟通" :visible.sync="open4" width="700px" append-to-body>
+      <el-form :model="form4" :rules="rules" ref="form4" label-width="100px" size="mini">
+        <!--    录音文件    soundRecording -->
+        <el-col :span="24">
+          <el-form-item label="上传录音" prop="soundRecording" >
+            <audio-upload v-model="form4.audioFiles" :limit="5" :file-size="10" :file-type="['mp3', 'wav', 'ogg', 'aac','m4a']" />
+          </el-form-item>
+        </el-col>
+        <!--    扣款金额    确定扣款  deduction -->
+        <el-col :span="24">
+          <el-form-item label="扣款金额" prop="deductionAmount">
+            <el-input v-model="form4.deductionAmount" placeholder="请输入扣款金额" />
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open4 = false">关 闭</el-button>
+        <el-button type="success" @click="confirmDeduction">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -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}`);
     },