444

smart/src/views/accessRecord/setpPage/details.vue

@@ -100,7 +100,7 @@ export default {
         : this.params.row.carType == 2 ? '月租车'
           : this.params.row.carType == 3 ? '充时车'
             : this.params.row.carType == 4 ? '时租车'
-              : this.params.row.carType == 5 ? '产全车'
+              : this.params.row.carType == 5 ? '产权车'
                 : this.params.row.carType == 6 ? '计次车'
                   : this.params.row.carType == 7 ? '贵宾卡'
                     : this.params.row.carType == 8 ? '员工卡' : '--';

smart/src/views/channelManagement/index.vue

@@ -6,7 +6,7 @@
         placeholder="输入通道名称查询"
         class="search-input"
         clearable
-        v-model="mixins_query.nodeName"
+        v-model="nodeName"
       ></el-input>
 
       <el-select
@@ -108,6 +108,7 @@ export default {
       mixins_post: 'post',
       nameParkingLot: [],
       nameParkingLotName: '',
+      nodeName: ''
     }
   },
   methods: {
@@ -133,7 +134,7 @@ export default {
         this.$message.error('请选择停车场名称');
       } else {
         this.mixins_dataUrl = '/sc-community-web/parkingCar/findChannelInfo';
-        this.mixins_query = { parkId: this.mixins_query.parkId, pageIndex: this.mixins_page.pageNum, pageSize: this.mixins_page.pageSize, parkName: this.nameParkingLotName };
+        this.mixins_query = { parkId: this.mixins_query.parkId, pageIndex: this.mixins_page.pageNum, pageSize: this.mixins_page.pageSize, parkName: this.nameParkingLotName, nodeName: this.nodeName };
         this.mixins_search();
       }
 

smart/src/views/onSiteVehicles/setpPage/details.vue

@@ -229,7 +229,7 @@ export default {
         : this.params.row.carType == 2 ? '月租车'
           : this.params.row.carType == 3 ? '充时车'
             : this.params.row.carType == 4 ? '时租车'
-              : this.params.row.carType == 5 ? '产全车'
+              : this.params.row.carType == 5 ? '产权车'
                 : this.params.row.carType == 6 ? '计次车'
                   : this.params.row.carType == 7 ? '贵宾卡'
                     : this.params.row.carType == 8 ? '员工卡' : '--';

smart/src/views/rechargeRecord/index.vue

@@ -3,7 +3,7 @@
   <div class="main">
     <div class="search">
       <el-input
-        placeholder="输入车牌号"
+        placeholder="输入车牌号/车主名称/手机号"
         class="search-input"
         clearable
         v-model="mixins_query.plateNo"
@@ -29,6 +29,7 @@
         end-placeholder="充值时间"
         @change="timeToggle"
         :editable="false"
+        v-model="parkingTime"
       ></el-date-picker>
       <!--  -->
       <el-button
@@ -90,6 +91,7 @@ export default {
       nameParkingLot: [],
       mixins_post: 'post',
       parkName: '',
+      parkingTime: ''
     }
   },
   methods: {
@@ -101,11 +103,11 @@ export default {
       let start = '00:00:00',
         end = '23:59:59';
       if (!!e) {
-        this.mixins_query.startDate = `${e[0]} ${start}`;
-        this.mixins_query.endDate = `${e[1]} ${end}`;
+        this.mixins_query.startTime = `${e[0]} ${start}`;
+        this.mixins_query.endTime = `${e[1]} ${end}`;
       } else {
-        this.mixins_query.startDate = ``;
-        this.mixins_query.endDate = ``;
+        this.mixins_query.startTime = ``;
+        this.mixins_query.endTime = ``;
       }
     },
     parkingLot (name) {
@@ -114,7 +116,7 @@ export default {
     lookDetails () {
       console.log(this.mixins_query)
       this.mixins_dataUrl = '/sc-community-web/parkingCar/queryChargeRecord';
-      this.mixins_query = { parkId: this.mixins_query.parkId, parkName: this.parkName, plateNo: this.mixins_query.plateNo };
+      this.mixins_query = { parkId: this.mixins_query.parkId, parkName: this.parkName, plateNo: this.mixins_query.plateNo, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime };
       console.log(this.mixins_query)
       this.mixins_search();
     },

smart/src/views/rechargeRecord/setpPage/details.vue

@@ -42,7 +42,8 @@ export default {
       interiorCar: [
         {
           name: '车主名称',
-          label: '--'
+          label: ''
+
         }, {
           name: '门牌号码',
           label: '-'
@@ -51,66 +52,82 @@ export default {
           label: ''//platNo
         }, {
           name: '车牌类型',
-          label: ''//carType
+          label: '',//carType
         }, {
           name: '手机号',
-          label: '-'//
+          label: ''//
         }
       ],
       rechargeDetails: [
         {
           name: '收费类型',
-          label: '-'//
+          label: '-'//0
         }, {
           name: '收费类型',
-          label: '-'
+          label: '-'//1
         }, {
           name: '充值数额',
           label: ''//chargeNumber  2
         }, {
           name: '赠送数额',
-          label: '-'
+          label: '-'//3
         }, {
           name: '充值时段',
-          label: '-'
+          label: '-'//4
         }, {
           name: '订单类型',
-          label: '-'
+          label: '-'//5
         }, {
           name: '操作备注',
-          label: '-'
+          label: '-'//6
         }, {
           name: '订单号码',
           label: ''//orderNo  7
         }, {
           name: '操作时间',
-          label: '-'
+          label: '-'//8
         }, {
           name: '审核时间',
-          label: '-'
+          label: '-'//9
         }, {
           name: '操作人员',
-          label: '-'
+          label: '-'//10
         }, {
           name: '审核人员',
-          label: '-'
+          label: '-'//11
         }
       ]
     }
   },
   created () {
-    this.interiorCar[2].label = this.params.row.platNo;
+    this.interiorCar[0].label = this.params.row.userName;
+    this.interiorCar[2].label = this.params.row.fullCarNoStr;
     this.interiorCar[3].label = this.params.row.carType == 0 ? '临时车'
       : this.params.row.carType == 1 ? 'VIP车'
         : this.params.row.carType == 2 ? '月租车'
           : this.params.row.carType == 3 ? '充时车'
             : this.params.row.carType == 4 ? '时租车'
-              : this.params.row.carType == 5 ? '产全车'
+              : this.params.row.carType == 5 ? '产权车'
+                : this.params.row.carType == 6 ? '计次车'
+                  : this.params.row.carType == 7 ? '贵宾卡'
+                    : this.params.row.carType == 8 ? '员工卡' : '--';
+    this.interiorCar[4].label = this.params.row.tel;
+
+    debugger
+    this.rechargeDetails[1].label = this.params.row.carType == 0 ? '临时车'
+      : this.params.row.carType == 1 ? 'VIP车'
+        : this.params.row.carType == 2 ? '月租车'
+          : this.params.row.carType == 3 ? '充时车'
+            : this.params.row.carType == 4 ? '时租车'
+              : this.params.row.carType == 5 ? '产权车'
                 : this.params.row.carType == 6 ? '计次车'
                   : this.params.row.carType == 7 ? '贵宾卡'
                     : this.params.row.carType == 8 ? '员工卡' : '--';
     this.rechargeDetails[2].label = this.params.row.chargeNumber;
+    this.rechargeDetails[3].label = this.params.row.credit || '--';
+    this.rechargeDetails[6].label = this.params.row.remark
     this.rechargeDetails[7].label = this.params.row.orderNo;
+    this.rechargeDetails[8].label = this.params.row.payTime;
   }
 }
 

smart/src/views/vehicleInformation/index.vue

@@ -4,7 +4,7 @@
   <div class="main">
     <div class="search">
       <el-input
-        placeholder="输入车牌号"
+        placeholder="输入车牌号/车主名称/手机号"
         class="search-input"
         clearable
         v-model="mixins_query.plateNo"
@@ -197,7 +197,7 @@ export default {
       }
       if (command === 'template') {
         // this.__exportExcel('/sc-community/excel/download/template', { importType: 'FACILITY' });
-        this.__exportExcel('/sc-community-web/parkingCar/getCarInfoExcel');
+        this.__exportExcel('/sc-community-web/excel/download/template', { importType: 'CAR' });
         return;
       }
     },
@@ -263,6 +263,7 @@ export default {
             cardId: row.cardId,
             fullCarNoStr: row.fullCarNoStr,
             residentId: row.residentId,
+            ruleId: row.ruleId,
             callback: resolve,
           },
           hideStar: true,

smart/src/views/vehicleInformation/setpPage/details.vue

@@ -655,7 +655,7 @@ export default {
               this.formDate.carTypes == '月租车' ? '2' :
                 this.formDate.carTypes == '充时车' ? '3' :
                   this.formDate.carTypes == '时租车' ? '4' :
-                    this.formDate.carTypes == '产全车' ? '5' :
+                    this.formDate.carTypes == '产权车' ? '5' :
                       this.formDate.carTypes == '计次车' ? '6' :
                         this.formDate.carTypes == '贵宾车' ? '7' :
                           this.formDate.carTypes == '员工卡' ? '8' : this.formDate.carTypes
@@ -913,19 +913,21 @@ export default {
             tel: this.formDate.tel,
             houseId: this.formDate.residentId,
             residentId: this.formDate.id,
+            // residentId: this.formDate.ruleId,
             remark: this.formDate.remark,
             cardType: this.formDate.carTypes == '临时车' ? '0' :
               this.formDate.carTypes == 'VIP车' ? '1' :
                 this.formDate.carTypes == '月租车' ? '2' :
                   this.formDate.carTypes == '充时车' ? '3' :
                     this.formDate.carTypes == '时租车' ? '4' :
-                      this.formDate.carTypes == '产全车' ? '5' :
+                      this.formDate.carTypes == '产权车' ? '5' :
                         this.formDate.carTypes == '计次车' ? '6' :
                           this.formDate.carTypes == '贵宾车' ? '7' :
                             this.formDate.carTypes == '员工卡' ? '8' : this.formDate.carTypes,
             beginTime: this.formDate.beginTime,
             parkId: this.formDate.parkId,
             areaName: this.formDate.areaName,
+            ruleId: this.formDate.ruleId,
 
 
             carLotList: table,
@@ -962,7 +964,7 @@ export default {
             : data.cardType == 2 ? '月租车'
               : data.cardType == 3 ? '充时车'
                 : data.cardType == 4 ? '时租车'
-                  : data.cardType == 5 ? '产全车'
+                  : data.cardType == 5 ? '产权车'
                     : data.cardType == 6 ? '计次车'
                       : data.cardType == 7 ? '贵宾卡'
                         : '员工卡'
@@ -975,13 +977,12 @@ export default {
         this.formDate.parkId = data.parkId
         var carLotStr = JSON.parse(data.carLotStr)
         for (let i = 0; i < carLotStr.length; i++) {
-          // this.tableData[i].parkingArea = carLotStr[i].areaId
           this.tableData[i].areaName = carLotStr[i].areaName
           this.tableData[i].carType = data.cardType
           this.tableData[i].lotCount = carLotStr[i].lotCount
           this.tableData[i].positionInformation = carLotStr[i].lotName
           this.tableData[i].parkingId = carLotStr[i].parkingId
-          // this.formDate.ruleId = carLotStr.ruleId
+          this.formDate.ruleId = carLotStr.ruleId
           this.formDate.sort = carLotStr.sequence
         }
         for (let k = 0; k < data.parkCarDetails.length; k++) {
@@ -990,10 +991,6 @@ export default {
           this.parkingSpaceSetting[k].state = data.parkCarDetails[k].enable == 1 ? '启用' : '禁用'
           this.parkingSpaceSetting[k].remarks = data.parkCarDetails[k].remark
 
-          // this.formDate.carType = data.cardType
-          // this.form[k].vehicleColor = data.parkCarDetails[k].carNoColor
-          // this.form[k].vehicleColors = data.parkCarDetails[k].carColor
-          // this.form[k].vehicleBrand = data.parkCarDetails[k].carBrand
         }
 
 

smart/src/views/vehicleInformation/setpPage/recharge.vue

@@ -177,15 +177,12 @@ export default {
       timeValue2: '',
       rechargeDate: [],
       fullCarNoStr: '',
-      residentId: ''
+      residentId: '',
+      ruleId: ''
     }
   },
   methods: {
     rechargeDates (item) {
-      debugger
-      // item.nameId
-      // this.rechargeDate[item.nameId]
-      // this.valueselected = '';
       this.rechargeDays = '';
       this.valueselect = '';
       this.valueselectName = '';
@@ -196,6 +193,7 @@ export default {
       this.RechargeDaysed = [];
       this.complimentaryDays = [];
 
+
       this.RechargeDaysed.push({
         label: this.rechargeDate[item.nameId].rechargeAmount * (this.rechargeDate[item.nameId].rechargeType == 0 ? (1 * 1 / 100) : this.rechargeDate[item.nameId].rechargeType == 1 ? (1 * 1) : this.rechargeDate[item.nameId].rechargeType == 2 ? (1 * 1) : this.rechargeDate[item.nameId].rechargeType == 3 ? (1 * 1) : (1 * 1)) + (this.rechargeDate[item.nameId].rechargeType == 0 ? '元' : this.rechargeDate[item.nameId].rechargeType == 1 ? '月' : this.rechargeDate[item.nameId].rechargeType == 2 ? '天' : this.rechargeDate[item.nameId].rechargeType == 3 ? '小时' : '次'),
         name: this.rechargeDate[item.nameId].rechargeAmount * (this.rechargeDate[item.nameId].rechargeType == 0 ? (1 * 1 / 100) : this.rechargeDate[item.nameId].rechargeType == 1 ? (1 * 1) : this.rechargeDate[item.nameId].rechargeType == 2 ? (1 * 1) : this.rechargeDate[item.nameId].rechargeType == 3 ? (1 * 1) : (1 * 1)),
@@ -209,7 +207,6 @@ export default {
         label: this.rechargeDate[item.nameId].sentAmount * (this.rechargeDate[item.nameId].sentType == 0 ? (1 * 1 / 100) : this.rechargeDate[item.nameId].sentType == 1 ? (1 * 1) : this.rechargeDate[item.nameId].sentType == 2 ? (1 * 1) : this.rechargeDate[item.nameId].sentType == 3 ? (1 * 1) : (1 * 1)) + (this.rechargeDate[item.nameId].sentType == 0 ? '元' : this.rechargeDate[item.nameId].sentType == 1 ? '月' : this.rechargeDate[item.nameId].sentType == 2 ? '天' : this.rechargeDate[item.nameId].sentType == 3 ? '小时' : '次'),
         chargeAmount: this.rechargeDate[item.nameId].basicMoney
       })
-      debugger
     },
     datePicker () {
 
@@ -218,7 +215,6 @@ export default {
       if (this.idType == 0) {
         var time = this.value1;
       } else if (this.idType == 1) {
-        debugger
         var time = ((parseInt(this.valueselectName) + parseInt(this.rechargeDays * 30)) * 86400000) + this.value1;
       } else if (this.idType == 2) {
         var time = ((parseInt(this.valueselectName) + parseInt(this.rechargeDays)) * 86400000) + this.value1;
@@ -243,12 +239,15 @@ export default {
     },
     // 充值规则
     rechargeRules () {
-      // /sc-community-web/parkingCar/queryRechargeRules
       this.$http
         .get('/sc-community-web/parkingCar/queryRechargeRules', { carType: this.cardType, parkingId: this.parkId })
         .then(({ data, msg, status }) => {
-          console.log('data', data);
           this.rechargeDate = data;
+          var daraRes = {
+            nameId: ''
+          }
+          daraRes.nameId = this.params.ruleId;
+          this.rechargeDates(daraRes);
           for (let i = 0; i < data.length; i++) {
             this.recharge.push({
               name: data[i].ruleName,
@@ -263,7 +262,6 @@ export default {
         .catch(() => { });
     },
     recharges (item) {
-      debugger
       this.id = item.id;
       this.valueselect = this.complimentaryDays[0].label;
       this.valueselectName = this.complimentaryDays[0].name;
@@ -282,6 +280,7 @@ export default {
         // orderNo: '',
         parkId: this.parkId,
         payChannel: this.paymentMethod,
+        payType: this.paymentMethod,
         remark: this.inputText,
         validFrom: this.timeValue1,
         validTo: this.timeValue2,
@@ -293,18 +292,19 @@ export default {
     },
   },
   created () {
-    console.log('11111')
-    this.params;
     this.userName = this.params.userName;
     this.cardType = this.params.cardType;
     this.parkId = this.params.parkId;
     this.cardId = this.params.cardId;
-    this.fullCarNoStr = fullCarNoStr;
-    this.residentId = residentId;
+    this.fullCarNoStr = this.params.fullCarNoStr;
+    this.residentId = this.params.residentId;
+    this.ruleId = this.params.ruleId;
 
+    this.valueselected = this.params.ruleId;
 
     this.rechargeRules();
 
+
   }
 }