Merge branch 'new_web2.0' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new_web2.0

smart/src/views/onSiteVehicles/index.js

@@ -63,9 +63,9 @@ export default {
                         if (val == 0) {
                             return '小轿车';
                         } else if (val == 1) {
-                            return '大轿车';
+                            return '大型车';
                         } else if (val == 2) {
-                            return '货车（中型）';
+                            return '货车';
                         } else if (val == 3) {
                             return '摩托车';
                         } else if (val == 4) {

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"
@@ -198,7 +198,8 @@ export default {
         this.$message.error('请输入车牌号')
       } else {
         this.$http.post('/sc-community-web/parkingCar/modifyPlateNumber', { oldplateNo: (this.params.row.plateNo == "" ? this.licensePlate : this.params.row.plateNo), plateNo: this.licensePlate, parkId: this.params.parkId }).then(({ data, status, msg }) => {
-          console.log(data);
+          // console.log(data);
+          this.$message.success('成功');
         });
       }
 
@@ -208,8 +209,12 @@ export default {
     },
     vehicle () {
       this.flags = !this.flags
+      // console.log(this.vehicleType);
+      this.$http.post('/sc-community-web/parkingCar/modifyType', { carStyle: this.vehicleType, parkId: this.params.parkId, plateNo: this.licensePlate }).then(({ data, status, msg }) => {
+        // console.log(data);
+        this.$message.success('成功');
+      });
 
-      console.log(this.vehicleType);
     },
     // OnSiteVehicleDetails () {
     // debugger

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

@@ -43,25 +43,31 @@ export default {
                     label: '车场名称',
                     prop: 'parkingName'
                 },
-                // {
-                //     label: '充值规则',
-                //     prop: '11'
-                // },
+                {
+                    label: '充值规则',
+                    prop: 'ruleName'
+                },
                 {
                     label: '充值数额',
-                    prop: 'amount'
+                    prop: 'amount',
+                    format(val) {
+                        return val + '月';
+                    }
                 },
                 {
                     label: '充值时段',
                     prop: 'payTime'
                 },
-                // {
-                //     label: '收费金额',
-                //     prop: '11'
-                // },
+                {
+                    label: '收费金额',
+                    prop: 'amount',
+                    format(val) {
+                        return val / 100 + '元';
+                    }
+                },
                 {
                     label: '支付方式',
-                    prop: 'payType',
+                    prop: 'payMethod',
                     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
@@ -114,6 +114,8 @@ export default {
     this.interiorCar[4].label = this.params.row.tel;
 
     debugger
+    // ruleName
+    this.rechargeDetails[0].label = this.params.row.ruleName;
     this.rechargeDetails[1].label = this.params.row.carType == 0 ? '临时车'
       : this.params.row.carType == 1 ? 'VIP车'
         : this.params.row.carType == 2 ? '月租车'
@@ -123,9 +125,11 @@ 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[6].label = this.params.row.remark
+    this.rechargeDetails[2].label = (this.params.row.chargeNumber + '月');
+    this.rechargeDetails[3].label = (this.params.row.credit + '月') || '--';
+    // payTime
+    this.rechargeDetails[4].label = this.params.row.payTime;
+    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/index.vue

@@ -25,6 +25,7 @@
       <el-select
         placeholder="状态"
         clearable
+        v-model="mixins_query.carStatus"
       >
         <el-option
           label="正常"
@@ -264,12 +265,14 @@ export default {
             fullCarNoStr: row.fullCarNoStr,
             residentId: row.residentId,
             ruleId: row.ruleId,
+            carStatus: row.carStatus,
             callback: resolve,
           },
           hideStar: true,
           title: '充值操作'
         });
       }).then(() => {
+        debugger
         this.mixins_search();
       });
     },

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

@@ -45,13 +45,14 @@
               placeholder="请选择房间"
               clearable
               v-model="formDate.resDate"
+              @change='formDateResDate'
             >
               <el-option
-                v-for="(item,index) in room"
-                :key="index"
-                :label='item.name'
-                :value='item.label'
-                @click.native="resDate(item)"
+                v-for="(itemse,ix) in room"
+                :key="ix"
+                :label='itemse.name'
+                :value='itemse.label'
+                @click.native="resDate(itemse)"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -146,7 +147,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="9">
-          <el-form-item label="充值规则">
+          <el-form-item
+            label="充值规则"
+            prop="ruleId"
+          >
             <el-select
               placeholder="请选择充值规则"
               clearable
@@ -179,64 +183,62 @@
           </el-form-item>
         </el-col> -->
       </el-row>
-      <div class="formContent-item_title">
-        <el-row>
-          <el-col :span="2">车位设置</el-col>
-          <el-col
-            :span="8"
-            style="margin-top: -5px;"
-          >
-            <!-- <el-select
-              placeholder="请选择停车场"
-              clearable
-              v-model="formDate.parkId"
-            >
-
-              <el-option
-                v-for="(item,index) in nameParkingLot"
-                :key="index"
-                :value="item.label"
-                :label="item.name"
-                @click.native="parkingLot(item.name)"
-              ></el-option>
-            </el-select> -->
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col-2>
-            <el-button
-              type="primary"
-              @click="addTime"
-            >新增</el-button>
-          </el-col-2>
-        </el-row>
+    </el-form>
 
+    <div class="formContent-item_title">
+      <el-row>
+        <el-col :span="2">车位设置</el-col>
+        <el-col
+          :span="8"
+          style="margin-top: -5px;"
+        >
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col-2>
+          <el-button
+            type="primary"
+            @click="addTime"
+          >新增</el-button>
+        </el-col-2>
+      </el-row>
+      <el-form
+        ref="tableData"
+        :rules="ruled"
+        :model="tableData"
+      >
         <el-table
           :data="tableData"
           border
           style="width: 100%"
           :cell-style="{'text-align':'center'}"
         >
-          <el-table-column
-            label="可停区域"
-            align="center"
-          >
-            <template slot-scope="scope">
-              <el-select
-                placeholder="请选择"
-                v-model="tableData[scope.$index].parkingArea"
-                @click.native="parking"
-              >
-                <el-option
-                  v-for="(item,index) in eloption"
-                  :key="index"
-                  :value='item.value'
-                  :label="item.label"
-                  @click.native="parked(item)"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
+          <el-form-item prop="parkingArea">
+            <el-table-column
+              label="可停区域"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <el-form-item prop="parkingArea">
+                  <el-select
+                    placeholder="请选择"
+                    v-model="tableData[scope.$index].parkingArea"
+                    @click.native="parking"
+                  >
+                    <el-option
+                      v-for="(item,index) in eloption"
+                      :key="index"
+                      :value='item.value'
+                      :label="item.label"
+                      @click.native="parked(item)"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+          </el-form-item>
+
           <el-table-column
             label="占用车位"
             align="center"
@@ -281,9 +283,11 @@
 
           </el-table-column>
         </el-table>
+      </el-form>
 
-      </div>
+    </div>
 
+    <el-form>
       <div class="formContent-item_title">
         <el-row>
           <el-col :span="2">车位设置</el-col>
@@ -412,6 +416,8 @@
         </el-table>
       </div>
     </el-form>
+
+    <!-- </el-form> -->
   </div>
 </template>
 
@@ -440,7 +446,9 @@ export default {
         parkId: '',
         id: '',
         sort: '',
-        areaName: ''
+        areaName: '',
+        idName: '',
+        res: '',
       },
       tableData: [
         {
@@ -607,6 +615,9 @@ export default {
         carTypes: [
           { required: true, message: '请选择车牌类型', trigger: 'change' }
         ],
+        ruleId: [
+          { required: true, message: '请选择充值规则', trigger: 'change' }
+        ]
 
       },
 
@@ -631,7 +642,11 @@ export default {
   },
   methods: {
     resDate (val) {
+      // debugger
+      this.formDate.resDate = val.label;
       this.formDate.id = val.residentId;
+      this.formDate.idName = val.name;
+      // console.log(this.formDate)
     },
 
 
@@ -697,6 +712,7 @@ export default {
           .get('/sc-community/parkingCar/getUserInfo', { phone: this.formDate.tel })
           .then(({ data, msg, status }) => {
             for (let i = 0; i < data.houseInfos.length; i++) {
+
               this.room.push({
                 name: data.houseInfos[i].roomNumber,
                 label: data.houseInfos[i].id,
@@ -704,9 +720,12 @@ export default {
               })
             }
 
-            this.formDate.resDate = data.houseInfos[0].id;
-            this.formDate.id = data.houseInfos[0].residentId;
 
+            if (this.room.length == 1) {
+              this.formDate.resDate = data.houseInfos[0].id;
+              this.formDate.id = data.houseInfos[0].residentId;
+              this.formDate.idName = data.houseInfos[0].roomNumber
+            }
           })
           .catch(() => { });
       }
@@ -828,12 +847,13 @@ 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++) {
           this.eloption.push({
             label: data[i].areaName,
-            value: data[i].id,
+            value: data[i].areaCode,
             startDate: data[i].sort,
           })
         }
@@ -845,7 +865,6 @@ export default {
       })
     },
     submit () {
-      debugger
       if (this.params.comm == 'add') {
         // this.url = '/sc-community-web/parkingCar/addVehicleInfor'
         this.url = '/sc-community-web/parkingCar/updateVehicleInfor'
@@ -861,7 +880,6 @@ export default {
             // this.tableData[i].areaName = (Array.from(new Set(this.areaNamed))).join(',');
             this.tableData[i].areaName = (Array.from(new Set(this.areaNamed))).join(',');
             console.log(this.tableData[i]);
-            debugger
             table.push({
               areaId: [this.tableData[i].parkingArea],
               areaName: this.tableData[i].areaName,
@@ -903,7 +921,6 @@ export default {
             }
 
           }
-          debugger
           this.$http.post(this.url, {
             cardId: this.params.cardId != undefined ? this.params.cardId : '',
             cardName: this.formDate.userName,
@@ -926,6 +943,7 @@ export default {
             parkId: this.formDate.parkId,
             areaName: this.formDate.areaName,
             ruleId: this.formDate.ruleId,
+            idName: this.formDate.idName,
 
 
             carLotList: table,
@@ -937,7 +955,6 @@ export default {
 
 
           }).then(({ data, status, msg }) => {
-            debugger
             if (status != 0) {
               this.$message.error(msg);
             } else if (status == 0) {
@@ -990,6 +1007,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,12 +1021,12 @@ 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)
           this.formDate.ruleId = carLotStr[i].ruleId
         }
-        debugger
         for (let k = 0; k < data.parkCarDetails.length; k++) {
           this.formDate.carType = data.cardType;
           this.form[k].vehicleType = data.parkCarDetails[k].carType;

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

@@ -82,21 +82,23 @@ export default {
     /** 控制树形单选 */
     checkChange (data, checked) {
       this.checkedData = {}
-      debugger
-      if (checked) {
-        if (!!data.children && data.children.length > 0) {
-          console.log("有子节点不可选")
-        } else {
-          this.checkedData = data;
-          // 注意！！！
-          //1、下方的id和属性中 node-key="id"必须是同一个字段  
-          //2、$refs.tree 也需要和上方的属性匹配 ref="tree"
-          this.$refs.tenantstree.setCheckedKeys([data.value]);
-        }
+      // if (checked) {
+      if (!!data.children && data.children.length > 0) {
+        console.log("有子节点不可选")
+      } else {
+        this.checkedData = data;
+        // 注意！！！
+        //1、下方的id和属性中 node-key="id"必须是同一个字段  
+        //2、$refs.tree 也需要和上方的属性匹配 ref="tree"
+        this.$refs.tenantstree.setCheckedKeys([data.value]);
+        this.value = data.value;
+        this.Information = data.name;
       }
-      this.value = this.checkedData.value;
-      console.log("checked data", data, this.checkedData)
-      this.Information = this.checkedData.name
+      // }
+      // this.value = this.checkedData.value;
+      // console.log("checked data", data, this.checkedData)
+      // this.Information = this.checkedData.name
+
 
     },
     submit () {

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

@@ -78,7 +78,10 @@
             >
             </el-date-picker>
           </el-col>
-          <el-col :span="24">
+          <el-col
+            :span="24"
+            v-show="this.carStatus == 2 ? true : false"
+          >
             <span>车辆未过期，已绑定充值规则，充值开始时间：过期时间+1</span>
           </el-col>
         </el-col>
@@ -186,11 +189,20 @@ export default {
       rechargeDate: [],
       fullCarNoStr: '',
       residentId: '',
-      ruleId: ''
+      ruleId: '',
+      ruleNamed: '',
+      credit: '',
+      rechargeDatesName: '',
+      carStatus: ''
     }
   },
   methods: {
     rechargeDates (item) {
+      debugger
+      if (item.name != undefined) {
+        this.rechargeDatesName = item.name;
+      }
+      debugger
       this.rechargeDays = '';
       this.valueselect = '';
       this.valueselectName = '';
@@ -213,8 +225,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 () {
 
@@ -254,14 +267,21 @@ export default {
           var daraRes = {
             nameId: ''
           }
-          daraRes.nameId = this.params.ruleId;
-          this.rechargeDates(daraRes);
+          // daraRes.nameId = this.params.ruleId;
+          // this.rechargeDates(daraRes);
           for (let i = 0; i < data.length; i++) {
+            if (data[i].ruleId == this.params.ruleId) {
+              daraRes.nameId = i;
+              this.rechargeDates(daraRes);
+            }
             this.recharge.push({
               name: data[i].ruleName,
               label: data[i].ruleId,
               nameId: i
             })
+            if (data[i].ruleId == this.params.ruleId) {
+              this.rechargeDatesName = data[i].ruleName
+            }
 
           }
 
@@ -270,6 +290,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 +300,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,14 +309,22 @@ 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: '',
+        ruleName: this.rechargeDatesName,
+        credit: this.valueselectName,//充值月份
+        payStatus: this.paymentMethod
       }).then(({ data, status, msg }) => {
+        if (status == 0) {
+          this.$message.success('成功');
+        }
       })
+      this.params.callback();
       this.$emit('close');
     },
   },
@@ -307,7 +336,7 @@ export default {
     this.fullCarNoStr = this.params.fullCarNoStr;
     this.residentId = this.params.residentId;
     this.ruleId = this.params.ruleId;
-
+    this.carStatus = this.params.carStatus;
     this.valueselected = this.params.ruleId;
 
     this.rechargeRules();
@@ -322,6 +351,8 @@ export default {
 <style scoped>
 h3 {
     margin-bottom: 15px;
+    /* text-align: center !important; */
+    font-size: 16px !important;
 }
 .el-col {
     margin-top: 10px !important;