Hwt vor 2 Jahren
Ursprung
Commit
52483ebf11

+ 4 - 0
smart/src/views/parkingSpaceManagement/parkingSpaceList.vue

@@ -271,6 +271,8 @@ export default {
                 message: '删除成功!'
               });
               this.mixins_search();
+            } else {
+              this.$message.error(msg);
             }
           });
         })
@@ -295,6 +297,8 @@ export default {
                 message: '删除成功!'
               });
               this.mixins_search();
+            } else {
+              this.$message.error(msg);
             }
           });
         })

+ 1 - 1
smart/src/views/rechargeRecord/index.vue

@@ -145,7 +145,7 @@ export default {
         this.$store.dispatch('addPopup', {
           url: '/rechargeRecord/setpPage/details.vue',
           width: '615px',
-          height: '654px',
+          height: '670px',
           props: {
             // id: row.id,
             // callback: resolve

+ 39 - 46
smart/src/views/rechargeRecord/setpPage/details.vue

@@ -59,51 +59,52 @@ export default {
         }
       ],
       rechargeDetails: [
-        // {
-        //   name: '收费类型',
-        //   label: '-'//0
-        // },
         {
-          name: '订单状态',
-          label: '成功'//1
+          name: '收费金额',
+          label: ''//0
         },
         {
           name: '充值数额',
-          label: ''//chargeNumber  2
-        }, {
+          label: ''//1
+        },
+        {
           name: '赠送数额',
-          label: '-'//3
-        }, {
-          name: '充值时段',
-          label: '-'//4
-        }, {
+          label: ''//2
+        },
+        {
+          name: '充值时间段',
+          label: ''//3
+        },
+        {
           name: '订单类型',
-          label: '充值订单'//5
-        }, {
+          label: '充值订单'//4
+        },
+        {
+          name: '订单状态',
+          label: '成功'//5
+        },
+        {
           name: '操作备注',
-          label: '-'//6
-        }, {
+          label: ''//6
+        },
+        {
           name: '订单号码',
-          label: ''//orderNo  7
-        }, {
+          label: ''//7
+        },
+        {
           name: '操作时间',
-          label: '-'//8
-        }, {
-          name: '审核时间',
-          label: '-'//9
-        }, {
+          label: ''//8
+        },
+        {
           name: '操作人员',
-          label: '-'//10
-        }, {
-          name: '审核人员',
-          label: '-'//11
-        }
+          label: ''//9
+        },
+
       ]
     }
   },
   created () {
     this.interiorCar[0].label = this.params.row.userName;
-    // roomNumber
     this.interiorCar[1].label = this.params.row.roomNumber;
     this.interiorCar[2].label = this.params.row.fullCarNoStr;
     this.interiorCar[3].label = this.params.row.carType == 0 ? '临时车'
@@ -118,27 +119,19 @@ export default {
     this.interiorCar[4].label = this.params.row.tel;
 
 
-    // ruleName
-    // this.rechargeDetails[0].label = this.params.row.ruleName;
-    // this.rechargeDetails[0].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[1].label = (this.params.row.chargeNumber + '月');
     this.rechargeDetails[2].label = (this.params.row.credit + '月') || '-';
-    // payTime
     this.rechargeDetails[3].label = this.params.row.payTime;
-    this.rechargeDetails[5].label = this.params.row.remark || '-';
-    this.rechargeDetails[6].label = this.params.row.orderNo;
-    this.rechargeDetails[7].label = this.params.row.payTime;
-    // opreatName
+    this.rechargeDetails[6].label = this.params.row.remark || '-';
+    this.rechargeDetails[7].label = this.params.row.orderNo;
+    this.rechargeDetails[8].label = this.params.row.payTime;
     this.rechargeDetails[9].label = this.params.row.opreatName;
+
   }
 }
 

+ 31 - 18
smart/src/views/vehicleInformation/setpPage/details.vue

@@ -209,12 +209,13 @@
           :cell-style="{'text-align':'center'}"
         >
           <el-table-column
-            label="可停区域"
             class="tableColumn"
             align="center"
           >
+
+            <!-- label="可停区域" -->
             <template slot-scope="scope">
-              <span style="width: 5px;color: #F56C6C; float: left; margin-right: 5px;">*</span>
+
               <el-form-item
                 prop="parkingArea"
                 ref="againValue"
@@ -308,12 +309,11 @@
         >
 
           <el-table-column
-            label="车牌号码"
             align="center"
             width="230"
           >
             <template slot-scope="scope">
-              <span style="color: #F56C6C;float: left; margin-right: 5px;">*</span>
+
               <el-col
                 :span="10"
                 style="float: left;"
@@ -471,6 +471,7 @@ export default {
         // tel: '17688920088',
         tel: '',
         residentId: '',
+        resDate: '',
         remark: '',
         carType: '',
         carTypes: '',
@@ -722,12 +723,12 @@ export default {
     clearValidate (formName) {
       this.$refs[formName].clearValidate();
     },
+
     resDate (val) {
       debugger
       this.formDate.resDate = val.label;
       this.formDate.id = val.residentId;
       this.formDate.idName = val.name;
-      // console.log(this.formDate)
     },
 
 
@@ -744,7 +745,6 @@ export default {
       }
 
 
-      // this.formDate.parkingArea = '验证' this.formDate.againInput = '验证'
 
     },
 
@@ -764,7 +764,6 @@ export default {
     },
     // 充值规则
     rechargeRules () {
-      // /sc-community-web/parkingCar/queryRechargeRules
       this.recharge = []
       this.$http
         .get('/sc-community-web/parkingCar/queryRechargeRules', {
@@ -824,17 +823,24 @@ export default {
             }
 
 
-            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
+            this.formDate.resDate = data.houseInfos[0].id;
+            this.formDate.id = data.houseInfos[0].residentId;
+            this.formDate.idName = data.houseInfos[0].roomNumber
+            // 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(() => { });
       }
     },
 
+    DOMInput () {
+      document.querySelectorAll('.is-center')[0].children[0].innerHTML = "<span style='width: 5px;color: #F56C6C; margin-right: 5px;'>*</span><span>可停区域</span>"
+      document.querySelectorAll('.is-center')[8].children[0].innerHTML = "<span style='width: 5px;color: #F56C6C; margin-right: 5px;'>*</span><span>车牌号码</span>"
+    },
 
     // 事件处理函数
     getMsgFormSon (data) {
@@ -842,6 +848,7 @@ export default {
     },
 
 
+
     addTime () {
       debugger
       this.tableData.push({
@@ -988,7 +995,7 @@ export default {
           this.plateNoInfo = []
           console.log('333333', this.tableData);
           for (let i = 0; i < this.tableData.length; i++) {
-
+            debugger
             this.tableData[i].areaName = (Array.from(new Set(this.areaNamed))).join(',');
             console.log(this.tableData[i]);
             table.push({
@@ -1029,12 +1036,10 @@ export default {
 
             for (let j = 0; j < table.length; j++) {
               table[j].carType = this.formDate.carType;
-
             }
 
           }
           debugger
-          console.log('111', this.formDate)
           this.$http.post(this.url, {
             cardId: this.params.cardId != undefined ? this.params.cardId : '',
             cardName: this.formDate.userName,
@@ -1087,18 +1092,26 @@ export default {
 
     },
   },
+  mounted: function () {
+    this.$nextTick(function () {
+
+      this.DOMInput()
+    })
+  },
   created () {
+    // <span style="width: 5px;color: #F56C6C; float: left; margin-right: 5px;">*</span>
+
     this.nameParking();
 
     if (this.params.cardId != undefined) {
       this.formDate.parkingArea = '验证';
       this.formDate.againInput = '验证';
       this.formDate.againLicense = '验证'
-      debugger
+
       this.params.cardId;
       this.$http.get('/sc-community-web/parkingCar/getVehicleInfor', { id: this.params.cardId }).then(({ data, msg, status }) => {
         console.log(data);
-        debugger
+
         this.formDate.userName = data.userName
         this.formDate.tel = data.tel
         // this.personnel();
@@ -1125,7 +1138,7 @@ export default {
         this.formDate.beginTime = data.beginTime
         this.formDate.parkId = data.parkId
         var carLotStr = JSON.parse(data.carLotStr)
-        debugger
+
         for (let i = 0; i < carLotStr.length; i++) {
           debugger
           this.formDate.areaName = carLotStr[i].areaName;