Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb

public/components/property/contractCreateFeeAdd/contractCreateFeeAdd.js

@@ -106,17 +106,17 @@
                     },
                     function(json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if (res.status == 200) {
+                        let _json = JSON.parse(json);
+                        if (_json.code == 0) {
                             //关闭model
-                            var _json = JSON.parse(json);
                             $('#contractCreateFeeAddModel').modal('hide');
                             $that.clearAddFeeConfigInfo();
-                            vc.toast("创建收费成功，总共[" + _json.totalRoom + "]合同，成功[" + _json.successRoom + "],失败[" + _json.errorRoom + "]", 8000);
+                            vc.toast("创建收费成功，总共[" + _json.data.totalRoom + "]合同，成功[" + _json.data.successRoom + "],失败[" + _json.data.errorRoom + "]", 8000);
                             vc.emit('listContractFee', 'notify', {});
                             vc.emit('simplifyContractFee', 'notify', {});
                             return;
                         }
-                        vc.toast(json);
+                        vc.toast(_json.msg);
                     },
                     function(errInfo, error) {
                         console.log('请求失败处理');

public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.html

@@ -59,7 +59,8 @@
                 <tr v-for="carIn in parkingAreaControlCarInoutsInfo.carIns">
                     <td class="text-center">{{carIn.inoutId}}</td>
                     <td class="text-center">{{carIn.carInout == '3306'?'进场':'出场'}}({{carIn.stateName}})</td>
-                    <td class="text-center">{{carIn.carNum}}</td>
+                    <td class="text-center">{{carIn.carNum}}
+                    </td>
                     <td class="text-center">{{carIn.areaNum}}</td>
                     <td class="text-center" @click="_viewTempFeeConfigInOutCar(carIn.configId)">{{carIn.feeName}}
                         <span class="fa fa-info-circle"></span>
@@ -72,7 +73,9 @@
                     <td class="text-center" v-if="carIn.carType != 'T'">-</td>
                     <!-- <td class="text-center" v-else-if="carIn.carInout != '3307">{{carIn.payCharge}}</td> -->
                     <!-- <td class="text-center" v-else>{{carIn.realCharge}}</td> -->
-                    <td class="text-center" v-else>{{carIn.payCharge}}</td>
+                    <td class="text-center" v-else>{{carIn.payCharge}}(
+                        <a href="javascript:void(0)" @click="_carInoutTempCarPayFee(carIn)">收费出场</a>)
+                    </td>
                     <td class="text-center">{{carIn.remark}}</td>
 
 

public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js

@@ -13,7 +13,8 @@
                 carNum: '',
                 startTime: '',
                 endTime: '',
-                carType: ''
+                carType: '',
+                machineId:''
             }
         },
         _initMethod: function() {
@@ -33,6 +34,9 @@
                 function(_currentPage) {
                     vc.component._loadParkingAreaControlCarInouts(_currentPage, DEFAULT_ROWS);
                 });
+                vc.on('parkingAreaControlCarInouts', 'changeMachine',function(_data){
+                    $that.parkingAreaControlCarInoutsInfo.machineId = _data.machineId;
+                })
         },
         methods: {
 
@@ -104,6 +108,16 @@
                         console.log('请求失败处理');
                     }
                 );
+            },
+            _carInoutTempCarPayFee:function(carIn){
+                vc.emit('parkingAreaControlCustomCarInout', 'open', {
+                    type: "1102", //1101 手动入场 1102 手动出场
+                    carNum: carIn.carNum,
+                    amount: carIn.payCharge,
+                    payCharge: carIn.payCharge,
+                    machineId:$that.parkingAreaControlCarInoutsInfo.machineId,
+                    boxId: $that.parkingAreaControlCarInoutsInfo.boxId,
+                })
             }
 
         }

public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html

@@ -71,7 +71,10 @@
                         <span><vc:i18n name="小时" namespace="parkingAreaControlInCar"></vc:i18n>
                         </span>{{carIn.min}}<span><vc:i18n name="分" namespace="parkingAreaControlInCar"></vc:i18n></span>
                     </td>
-                    <td class="text-center" v-if="carIn.carType == 'T'">{{carIn.payCharge}}<span><vc:i18n name="元" namespace="parkingAreaControlInCar"></vc:i18n></span></td>
+                    <td class="text-center" v-if="carIn.carType == 'T'">
+                        {{carIn.payCharge}}
+                        (<a href="javascript:void(0)" @click="_carInTempCarPayFee(carIn)">收费出场</a>)
+                    </td>
                     <td class="text-center" v-else>-</td>
 
                 </tr>

public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js

@@ -15,7 +15,8 @@
                 endTime: '',
                 updateCarNum: '',
                 updateInoutId: '',
-                carType: ''
+                carType: '',
+                machineId:''
             }
         },
         _initMethod: function() {
@@ -36,6 +37,9 @@
                 function(_currentPage) {
                     vc.component._loadParkingAreaControlInCarData(_currentPage, DEFAULT_ROWS);
                 });
+                vc.on('parkingAreaControlInCar', 'changeMachine',function(_data){
+                    $that.parkingAreaControlInCarInfo.machineId = _data.machineId;
+                })
         },
         methods: {
             _loadParkingAreaControlInCarData: function(_page, _row) {
@@ -143,6 +147,16 @@
 
                         vc.toast(errInfo);
                     });
+            },
+            _carInTempCarPayFee:function(car){
+                vc.emit('parkingAreaControlCustomCarInout', 'open', {
+                    type: "1102", //1101 手动入场 1102 手动出场
+                    carNum: carIn.carNum,
+                    amount: carIn.payCharge,
+                    payCharge: carIn.payCharge,
+                    machineId: $that.parkingAreaControlInCarInfo.machineId,
+                    boxId: $that.parkingAreaControlInCarInfo.boxId,
+                })
             }
         }
     });

public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js

@@ -122,6 +122,18 @@
                     boxId: $that.parkingAreaControlVideoInfo.boxId
                 });
 
+                vc.emit('parkingAreaControlInCar', 'changeMachine', {
+                    machineId: _outMachineId,
+                    boxId: $that.parkingAreaControlVideoInfo.boxId
+                });
+
+                vc.emit('parkingAreaControlCarInouts', 'changeMachine', {
+                    machineId: _outMachineId,
+                    boxId: $that.parkingAreaControlVideoInfo.boxId
+                });
+
+                
+
                 let paId = "";
                 $that.parkingAreaControlVideoInfo.outMachines.forEach((item) => {
                     if (item.machineId == _outMachineId) {