8888

smart/src/views/onSiteVehicles/index.vue

@@ -70,7 +70,7 @@
             @click="lookDetailsDetails(scope.row)"
           ></i>
         </el-tooltip>
-        <el-tooltip
+        <!-- <el-tooltip
           class="item itemtooltip"
           effect="light"
           placement="bottom"
@@ -82,7 +82,7 @@
             alt=""
             @click="img"
           >
-        </el-tooltip>
+        </el-tooltip> -->
       </template>
 
     </zz-table>
@@ -99,10 +99,28 @@ export default {
     return {
       mixins_post: 'post',
       nameParkingLot: [],
-      nameParkingLotName: ''
+      nameParkingLotName: '',
+      mixins_pageset: {
+        total: 0,
+        pageIndex: 1,
+        pageSize: 15,
+        sortColumn: null, // 当前列的字段
+        sortOrder: null // 排序方式 顺序：ASC  倒序：DESC
+      },
     }
   },
   methods: {
+    pageChange (obj) {
+      if (obj.pageSize) {
+        debugger;
+        this.mixins_pageset.pageSize = obj.pageSize;
+      }
+      if (obj.page) {
+        debugger;
+        this.mixins_pageset.pageIndex = obj.page;
+      }
+      this.getList();
+    },
     lookDetailsDetails (row) {
       // 详情
       new Promise((resolve) => {
@@ -148,7 +166,6 @@ export default {
       console.log(e);
       let start = '00:00:00',
         end = '23:59:59';
-      debugger
       if (!!e) {
         this.mixins_query.startDate = `${e[0]} ${start}`;
         this.mixins_query.endDate = `${e[1]} ${end}`;
@@ -158,12 +175,12 @@ export default {
       }
     },
     lookDetails () {
-      debugger
       if (this.nameParkingLotName.length == 0) {
         this.$message.error('请选择停车场');
       } else {
         this.mixins_dataUrl = '/sc-community-web/parkingCar/queryPresenceVehicles';
-        this.mixins_query = { parkId: this.mixins_query.parkId, pageIndex: this.mixins_page.pageNum, pageSize: this.mixins_page.pageSize, parkName: this.nameParkingLotName };
+        debugger
+        this.mixins_query = { parkId: this.mixins_query.parkId, pageNum: this.mixins_pageset.pageIndex, pageSize: this.mixins_pageset.pageSize, parkName: this.nameParkingLotName };
         // console.log('mixins_list', this.mixins_query);
         this.mixins_search();
       }

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

@@ -78,8 +78,8 @@
             <div v-if="index+1 ==5">
               <el-col :span="8">车辆类型</el-col>
               <div v-if="flags">
-                <!-- <el-col :span="12">{{vehicleType == 0 ? '小型车' : vehicleType == 1 ? '大型车' :vehicleType == 2 ? '货车' : vehicleType == 3  ? '摩托车' :'其他'}}</el-col> -->
-                <el-col :span="12"> {{vehicleType }}</el-col>
+                <el-col :span="12">{{vehicleType == 0 ? '小型车' : vehicleType == 1 ? '大型车' :vehicleType == 2 ? '货车' : vehicleType == 3  ? '摩托车' : vehicleType == 4 ? '其他' : vehicleType}}</el-col>
+                <!-- <el-col :span="12"> {{vehicleType }}</el-col> -->
                 <el-tooltip
                   class="item"
                   effect="light"

smart/src/views/parkingSpaceManagement/pageJump/parkingLotSaveEdits.vue

@@ -244,9 +244,10 @@ export default {
       let onOption = '';
       this.$http.post('/sc-community/assets/garage/list', { communityId: this.ruleForm.communityId }).then((res) => {
         res.data.map((res) => {
+          debugger
           onOption = {
             label: res.garageName,
-            id: res.id
+            id: res.parkId
           };
           this.garageList.push(onOption);
         });
@@ -261,7 +262,15 @@ export default {
     garageAreaListQuery () {
       this.garageAreaList = [];
       let onOption = '';
-      this.$http.post('/sc-community-web/parkingCar/findParkInfo', { parkid: this.ruleForm.garageId, areaCode: this.ruleForm.communityId }).then((res) => {
+      debugger
+
+
+
+
+
+
+      console.log(this.ruleForm.garageId);
+      this.$http.post('/sc-community-web/parkingCar/findParkInfo', { parkid: this.ruleForm.garageId }).then((res) => {
         res.data.map((res) => {
           onOption = {
             label: res.garageName,

smart/src/views/rechargeRecord/index.js

@@ -49,7 +49,10 @@ export default {
                 // },
                 {
                     label: '充值数额',
-                    prop: 'amount'
+                    prop: 'amount',
+                    format(val) {
+                        return val + '月';
+                    }
                 },
                 {
                     label: '充值时段',
@@ -61,7 +64,7 @@ export default {
                 // },
                 {
                     label: '支付方式',
-                    prop: 'payType',
+                    prop: 'payStatus',
                     format(val) {
                         if (val == 1) {
                             return '微信';

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

@@ -76,7 +76,7 @@ export default {
           label: '-'//4
         }, {
           name: '订单类型',
-          label: '-'//5
+          label: '充值订单'//5
         }, {
           name: '操作备注',
           label: '-'//6
@@ -123,8 +123,8 @@ export default {
                 : 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[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/temporaryStopCharge/setpPage/details.vue

@@ -49,86 +49,75 @@ export default {
     return {
       cols: [
         {
-          name: '应收金额（元）',  //amount
+          name: '应收金额（元）',  //totalAmout  0
           label: ''
         }, {
-          name: '实收金额（元）',//amount
+          name: '实收金额（元）',//amount  1
           label: ''
         }, {
-          name: '免费金额（元）',//freeMoney
+          name: '免费金额（元）',//freeMoney  2
           label: ''
         }, {
-          name: '抵扣金额（元）',//  deductionAmount
+          name: '抵扣金额（元）',//  deductionAmount  3
           label: ''
         }, {
-          name: '抵扣时长',//freeTime
+          name: '抵扣时长',//freeTime  4
           label: ''
-        }, {
-          name: '实际抵扣额（元）',//deductionAmount + freeMoney
-          label: ''
-        }, {
-          name: '支付方式',//payMethod
-          label: ''
-        }, {
-          name: '支付渠道',//payType
+        },
+        {
+          name: '支付方式',//payMethod  5
           label: ''
         },
-        //  {
-        //   name: '支付来源',
-        //   label: '沧海城建E支付'
-        // },
-        // {
-        //   name: '订单类型',
-        //   label: '普通订单'
-        // }, 
-        // {
-        //   name: '收费人员',
-        //   label: '-'
-        // }, 
-        // {
-        //   name: '终端位置',
-        //   label: '-'
-        // }, 
         {
-          name: '创建时间',//createTime
+          name: '支付渠道',//payType  6
+          label: '其他'
+        },
+        {
+          name: '订单类型',
+          label: '普通订单'  //  7
+        },
+        {
+          name: '收费人员',
+          label: ''//chargePeople  8
+        },
+        {
+          name: '创建时间',//createTime  9
           label: ''
         }, {
-          name: '支付时间',//payTime  
+          name: '支付时间',//payTime    10
           label: ''
         },
-        //  {
-        //   name: '支付同步时间',
-        //   label: ''
-        // }, 
         {
-          name: '车场订单号',//orderNo
+          name: '车场订单号',//orderNo  11
           label: ''
         }
-        // , {
-        //   name: '商户订单号',
-        //   label: '-'
-        // }, {
-        //   name: '订单备注',
-        //   label: '- '
-        // }
+        , {
+          name: '商户订单号',
+          label: ''//wxOrderNo  12
+        }
       ],
       licenseNumber: '',
       mobilizationTime: ''
     }
   },
   created () {
+
     console.log(this.params.row);
-    this.cols[0].label = this.params.row.amount || '--';
+    this.cols[0].label = this.params.row.totalAmout || '--';
     this.cols[1].label = this.params.row.amount || '--';
+
     this.cols[2].label = this.params.row.freeMoney || '--';
     this.cols[3].label = this.params.row.deductionAmount || '--';
     this.cols[4].label = this.params.row.freeTime || '--';
-    this.cols[5].label = (this.params.row.deductionAmount + this.params.row.freeMoney) || '--';
-    this.cols[6].label = this.params.row.payMethod || '--';
-    this.cols[7].label = this.params.row.payType || '--';
-    this.cols[8].label = this.params.row.createTime || '--';
-    this.cols[9].label = this.params.row.payTime || '--';
-    this.cols[10].label = this.params.row.orderNo || '--';
+    this.cols[5].label = this.params.row.payMethod || '--';
+
+    this.cols[8].label = this.params.row.chargePeople || '--';
+    this.cols[9].label = this.params.row.createTime || '--';
+    this.cols[10].label = this.params.row.payTime || '--';
+    this.cols[11].label = this.params.row.orderNo || '--';
+    this.cols[12].label = this.params.row.wxOrderNo || '--';
+
+
     this.licenseNumber = this.params.row.platNo || '--';
     this.mobilizationTime = this.params.row.carInTime || '--';
   }

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

@@ -440,7 +440,8 @@ export default {
         parkId: '',
         id: '',
         sort: '',
-        areaName: ''
+        areaName: '',
+        idName: ''
       },
       tableData: [
         {
@@ -631,7 +632,9 @@ export default {
   },
   methods: {
     resDate (val) {
+      debugger
       this.formDate.id = val.residentId;
+      this.formDate.idName = val.name
     },
 
 
@@ -706,6 +709,7 @@ export default {
 
             this.formDate.resDate = data.houseInfos[0].id;
             this.formDate.id = data.houseInfos[0].residentId;
+            this.formDate.idName = data.houseInfos[i].roomNumber
 
           })
           .catch(() => { });
@@ -828,12 +832,14 @@ export default {
       }
     },
     region () {
+
       this.$http.post('/sc-community-web/parkingCar/findAreaInfo', { parkId: this.formDate.parkId }).then(({ data, status, msg }) => {
         this.eloption = [];
         for (let i = 0; i < data.length; i++) {
+          debugger
           this.eloption.push({
             label: data[i].areaName,
-            value: data[i].id,
+            value: data[i].areaCode,
             startDate: data[i].sort,
           })
         }
@@ -926,6 +932,7 @@ export default {
             parkId: this.formDate.parkId,
             areaName: this.formDate.areaName,
             ruleId: this.formDate.ruleId,
+            idName: this.formDate.idName,
 
 
             carLotList: table,
@@ -990,6 +997,7 @@ export default {
           this.tableData[i].parkingId = carLotStr[i].parkingId
           this.formDate.ruleId = carLotStr.ruleId
           this.formDate.sort = carLotStr.sequence
+          this
         }
         for (let k = 0; k < data.parkCarDetails.length; k++) {
           this.parkingSpaceSetting[k].licensePlate = (data.fullCarNoStr).substr(0, 1)
@@ -1003,6 +1011,7 @@ export default {
         this.rechargeRules();
         this.nameParking();
         this.region();
+        this.personnel();
 
         for (let i = 0; i < carLotStr.length; i++) {
           this.tableData[i].parkingArea = Number(carLotStr[i].areaId)

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

@@ -186,11 +186,14 @@ export default {
       rechargeDate: [],
       fullCarNoStr: '',
       residentId: '',
-      ruleId: ''
+      ruleId: '',
+      ruleNamed: '',
+      credit: ''
     }
   },
   methods: {
     rechargeDates (item) {
+      debugger
       this.rechargeDays = '';
       this.valueselect = '';
       this.valueselectName = '';
@@ -213,8 +216,9 @@ export default {
         idType: this.rechargeDate[item.nameId].rechargeType,
         name: 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)),
         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
+        chargeAmount: this.rechargeDate[item.nameId].basicMoney,
       })
+
     },
     datePicker () {
 
@@ -270,6 +274,7 @@ export default {
         .catch(() => { });
     },
     recharges (item) {
+      debugger
       this.id = item.id;
       this.valueselect = this.complimentaryDays[0].label;
       this.valueselectName = this.complimentaryDays[0].name;
@@ -279,7 +284,7 @@ export default {
     },
     submit () {
       this.$http.post('/sc-community-web/parkingCar/carCharge', {
-        amount: this.chargeAmount,
+        amount: this.chargeAmount * 100,
         carType: this.cardType,
         cardId: this.cardId,
         chargeMethod: this.idType,
@@ -288,13 +293,19 @@ export default {
         // orderNo: '',
         parkId: this.parkId,
         payChannel: this.paymentMethod,
-        payType: this.paymentMethod,
+        payMethod: this.paymentMethod,
         remark: this.inputText,
         validFrom: this.timeValue1,
         validTo: this.timeValue2,
         platNo: this.fullCarNoStr,
         userId: this.residentId,
+        ruleName: '',
+        credit: this.valueselectName,//充值月份
+        payStatus: this.paymentMethod
       }).then(({ data, status, msg }) => {
+        if (status == 0) {
+          this.$message.success('成功');
+        }
       })
       this.$emit('close');
     },