Commit 963f5a4f0a477dea44806c923764a0b55ce20375
1 parent
0fb08017
车辆功能测试完成
Showing
22 changed files
with
134 additions
and
270 deletions
src/App.vue
src/components/car/SearchParkingSpace.vue
| 1 | 1 | <template> |
| 2 | 2 | <el-dialog :title="$t('searchParkingSpace.title')" :visible.sync="visible" width="80%" @close="handleClose"> |
| 3 | - <el-card> | |
| 3 | + | |
| 4 | 4 | <el-row v-if="showSearchCondition" :gutter="20"> |
| 5 | 5 | <el-col :span="8"> |
| 6 | 6 | <el-select v-model="searchParkingSpaceInfo.areaNum" class="w-full" |
| ... | ... | @@ -44,7 +44,7 @@ |
| 44 | 44 | <el-pagination class="mt-20" :current-page="pagination.currentPage" :page-sizes="[10, 20, 30, 50]" |
| 45 | 45 | :page-size="pagination.pageSize" :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" |
| 46 | 46 | @size-change="handleSizeChange" @current-change="handleCurrentChange" /> |
| 47 | - </el-card> | |
| 47 | + | |
| 48 | 48 | </el-dialog> |
| 49 | 49 | </template> |
| 50 | 50 | ... | ... |
src/components/car/deleteOwnerCar.vue
| ... | ... | @@ -37,7 +37,7 @@ export default { |
| 37 | 37 | |
| 38 | 38 | this.loading = true |
| 39 | 39 | try { |
| 40 | - await deleteOwnerCars({ carId: this.carInfo.carId }) | |
| 40 | + await deleteOwnerCars({ carId: this.carInfo.carId,memberId:this.carInfo.memberId }) | |
| 41 | 41 | this.$message.success(this.$t('listOwnerCar.deleteSuccess')) |
| 42 | 42 | this.$emit('success') |
| 43 | 43 | this.visible = false | ... | ... |
src/components/car/importOwnerCar.vue
| 1 | 1 | <template> |
| 2 | 2 | <el-dialog :title="$t('listOwnerCar.importCarTitle')" :visible.sync="visible" width="600px" @close="resetForm"> |
| 3 | - <el-form :model="form" label-width="120px"> | |
| 3 | + <el-form :model="form" label-width="120px" class="text-left"> | |
| 4 | 4 | <el-form-item :label="$t('listOwnerCar.selectFile')"> |
| 5 | 5 | <el-upload class="upload-demo" action="" :on-change="handleFileChange" :auto-upload="false" |
| 6 | 6 | :show-file-list="false"> | ... | ... |
src/components/fee/addFeeConfig.vue
| ... | ... | @@ -4,12 +4,8 @@ |
| 4 | 4 | <el-row :gutter="20"> |
| 5 | 5 | <el-col :span="12"> |
| 6 | 6 | <el-form-item :label="$t('feeConfigManage.feeType')" prop="feeTypeCd" required> |
| 7 | - <el-select | |
| 8 | - v-model="form.feeTypeCd" | |
| 9 | - @change="changeAddFeeTypeCd" | |
| 10 | - :placeholder="$t('feeConfigManage.selectFeeType')" | |
| 11 | - class="full-width-select" | |
| 12 | - > | |
| 7 | + <el-select v-model="form.feeTypeCd" @change="changeAddFeeTypeCd" | |
| 8 | + :placeholder="$t('feeConfigManage.feeType')" class="full-width-select"> | |
| 13 | 9 | <el-option v-for="item in feeTypeCds" :key="item.statusCd" :label="item.name" :value="item.statusCd" /> |
| 14 | 10 | </el-select> |
| 15 | 11 | </el-form-item> |
| ... | ... | @@ -21,22 +17,16 @@ |
| 21 | 17 | </el-col> |
| 22 | 18 | <el-col :span="12"> |
| 23 | 19 | <el-form-item :label="$t('feeConfigManage.feeFlag')" prop="feeFlag" required> |
| 24 | - <el-select | |
| 25 | - v-model="form.feeFlag" | |
| 26 | - :placeholder="$t('feeConfigManage.selectFeeFlag')" | |
| 27 | - class="full-width-select" | |
| 28 | - > | |
| 20 | + <el-select v-model="form.feeFlag" :placeholder="$t('feeConfigManage.selectFeeFlag')" | |
| 21 | + class="full-width-select"> | |
| 29 | 22 | <el-option v-for="item in feeFlags" :key="item.statusCd" :label="item.name" :value="item.statusCd" /> |
| 30 | 23 | </el-select> |
| 31 | 24 | </el-form-item> |
| 32 | 25 | </el-col> |
| 33 | 26 | <el-col :span="12"> |
| 34 | 27 | <el-form-item :label="$t('feeConfigManage.paymentType')" prop="paymentCd" required> |
| 35 | - <el-select | |
| 36 | - v-model="form.paymentCd" | |
| 37 | - :placeholder="$t('feeConfigManage.selectPaymentType')" | |
| 38 | - class="full-width-select" | |
| 39 | - > | |
| 28 | + <el-select v-model="form.paymentCd" :placeholder="$t('feeConfigManage.selectPaymentType')" | |
| 29 | + class="full-width-select"> | |
| 40 | 30 | <el-option v-for="item in paymentCds" :key="item.statusCd" :label="item.name" :value="item.statusCd" /> |
| 41 | 31 | </el-select> |
| 42 | 32 | </el-form-item> |
| ... | ... | @@ -107,12 +97,10 @@ |
| 107 | 97 | |
| 108 | 98 | <el-col :span="24"> |
| 109 | 99 | <el-form-item :label="$t('feeConfigManage.formula')" prop="computingFormula" required> |
| 110 | - <el-select | |
| 111 | - v-model="form.computingFormula" | |
| 112 | - :placeholder="$t('feeConfigManage.selectFormula')" | |
| 113 | - class="full-width-select" | |
| 114 | - > | |
| 115 | - <el-option v-for="item in computingFormulas" :key="item.statusCd" :label="item.name" :value="item.statusCd" /> | |
| 100 | + <el-select v-model="form.computingFormula" :placeholder="$t('feeConfigManage.selectFormula')" | |
| 101 | + class="full-width-select"> | |
| 102 | + <el-option v-for="item in computingFormulas" :key="item.statusCd" :label="item.name" | |
| 103 | + :value="item.statusCd" /> | |
| 116 | 104 | </el-select> |
| 117 | 105 | </el-form-item> |
| 118 | 106 | </el-col> |
| ... | ... | @@ -136,7 +124,8 @@ |
| 136 | 124 | <template v-if="form.computingFormula == '7007'"> |
| 137 | 125 | <el-col :span="24"> |
| 138 | 126 | <el-form-item :label="$t('feeConfigManage.formula')" prop="computingFormulaText" required> |
| 139 | - <el-input type="textarea" v-model="form.computingFormulaText" :placeholder="$t('feeConfigManage.enterFormula')" :rows="4" /> | |
| 127 | + <el-input type="textarea" v-model="form.computingFormulaText" | |
| 128 | + :placeholder="$t('feeConfigManage.enterFormula')" :rows="4" /> | |
| 140 | 129 | </el-form-item> |
| 141 | 130 | </el-col> |
| 142 | 131 | <el-col :span="24"> |
| ... | ... | @@ -188,9 +177,9 @@ export default { |
| 188 | 177 | decimalPlace: '2', |
| 189 | 178 | state: 'Y', |
| 190 | 179 | computingFormulaText: '', |
| 191 | - startTime:'2025-01-01', | |
| 192 | - endTime:'2050-01-01', | |
| 193 | - billType:'002', | |
| 180 | + startTime: '2025-01-01', | |
| 181 | + endTime: '2050-01-01', | |
| 182 | + billType: '002', | |
| 194 | 183 | communityId: this.getCommunityId() |
| 195 | 184 | }, |
| 196 | 185 | feeTypeCds: [], |
| ... | ... | @@ -228,7 +217,7 @@ export default { |
| 228 | 217 | getDict('pay_fee_config', 'fee_flag'), |
| 229 | 218 | getDict('pay_fee_config', 'payment_cd') |
| 230 | 219 | ]) |
| 231 | - | |
| 220 | + | |
| 232 | 221 | this.feeTypeCds = feeTypeCds |
| 233 | 222 | this.computingFormulas = computingFormulas |
| 234 | 223 | this.feeFlags = feeFlags |
| ... | ... | @@ -339,9 +328,9 @@ export default { |
| 339 | 328 | scale: '1', |
| 340 | 329 | decimalPlace: '2', |
| 341 | 330 | state: 'Y', |
| 342 | - startTime:'2025-01-01', | |
| 343 | - endTime:'2050-01-01', | |
| 344 | - billType:'002', | |
| 331 | + startTime: '2025-01-01', | |
| 332 | + endTime: '2050-01-01', | |
| 333 | + billType: '002', | |
| 345 | 334 | computingFormulaText: '', |
| 346 | 335 | communityId: this.getCommunityId() |
| 347 | 336 | } | ... | ... |
src/components/fee/carCreateFeeAdd.vue
| 1 | 1 | <template> |
| 2 | 2 | <el-dialog :title="$t('carCreateFeeAdd.createFee')" :visible.sync="visible" width="40%" @close="handleClose"> |
| 3 | - <el-form :model="form" label-width="150px" ref="form"> | |
| 3 | + <el-form :model="form" label-width="150px" ref="form" class="text-left"> | |
| 4 | 4 | <el-form-item v-if="isMore" :label="$t('carCreateFeeAdd.chargeScope')" prop="locationTypeCd" |
| 5 | 5 | :rules="[{ required: true, message: $t('carCreateFeeAdd.requiredChargeScope') }]"> |
| 6 | 6 | <el-select v-model="form.locationTypeCd" style="width:100%"> | ... | ... |
src/components/fee/exportCarFeeImportExcel.vue
| 1 | 1 | <template> |
| 2 | 2 | <el-dialog :title="$t('exportCarFeeImportExcel.templateExport')" :visible.sync="visible" width="50%"> |
| 3 | - <el-form label-width="150px"> | |
| 3 | + <el-form label-width="150px" class="text-left"> | |
| 4 | 4 | <el-form-item :label="$t('exportCarFeeImportExcel.parkingLot')"> |
| 5 | 5 | <div> |
| 6 | 6 | <el-checkbox v-model="isParkingAreaAll" @change="changeAllParkingAreas"> | ... | ... |
src/components/fee/simplifyRoomFee.vue
src/components/system/carDetailHis.vue
| ... | ... | @@ -9,12 +9,12 @@ |
| 9 | 9 | <span v-else>{{ scope.row.leaseTypeName }}</span> |
| 10 | 10 | </template> |
| 11 | 11 | </el-table-column> |
| 12 | - <el-table-column :label="$t('carDetailHis.carTypeName')" align="center"> | |
| 12 | + <el-table-column :label="$t('carDetailHis.carType')" align="center"> | |
| 13 | 13 | <template slot-scope="scope"> |
| 14 | 14 | {{ scope.row.carTypeName || '-' }} |
| 15 | 15 | </template> |
| 16 | 16 | </el-table-column> |
| 17 | - <el-table-column :label="$t('carDetailHis.carColor')" align="center"> | |
| 17 | + <el-table-column :label="$t('carDetailHis.color')" align="center"> | |
| 18 | 18 | <template slot-scope="scope"> |
| 19 | 19 | {{ scope.row.carColor || '-' }} |
| 20 | 20 | </template> |
| ... | ... | @@ -32,11 +32,11 @@ |
| 32 | 32 | {{ scope.row.areaNum }}-{{ scope.row.num }} |
| 33 | 33 | </span> |
| 34 | 34 | <span v-else> |
| 35 | - {{ $t('carDetailHis.released') }} | |
| 35 | + {{ $t('carDetailHis.spaceReleased') }} | |
| 36 | 36 | </span> |
| 37 | 37 | </template> |
| 38 | 38 | </el-table-column> |
| 39 | - <el-table-column :label="$t('carDetailHis.validityPeriod')" align="center"> | |
| 39 | + <el-table-column :label="$t('carDetailHis.validPeriod')" align="center"> | |
| 40 | 40 | <template slot-scope="scope"> |
| 41 | 41 | <div v-if="scope.row.leaseType === 'H'"> |
| 42 | 42 | {{ scope.row.startTime }}<br>~{{ scope.row.endTime }} |
| ... | ... | @@ -44,17 +44,17 @@ |
| 44 | 44 | <div v-else>--</div> |
| 45 | 45 | </template> |
| 46 | 46 | </el-table-column> |
| 47 | - <el-table-column :label="$t('carDetailHis.operate')" align="center"> | |
| 47 | + <el-table-column :label="$t('common.operation')" align="center"> | |
| 48 | 48 | <template slot-scope="scope"> |
| 49 | 49 | {{ _getHisOperate(scope.row) }} |
| 50 | 50 | </template> |
| 51 | 51 | </el-table-column> |
| 52 | - <el-table-column :label="$t('carDetailHis.userName')" align="center"> | |
| 52 | + <el-table-column :label="$t('carDetailHis.operator')" align="center"> | |
| 53 | 53 | <template slot-scope="scope"> |
| 54 | 54 | {{ scope.row.userName || '-' }} |
| 55 | 55 | </template> |
| 56 | 56 | </el-table-column> |
| 57 | - <el-table-column :label="$t('carDetailHis.createTime')" align="center"> | |
| 57 | + <el-table-column :label="$t('carDetailHis.operateTime')" align="center"> | |
| 58 | 58 | <template slot-scope="scope"> |
| 59 | 59 | {{ scope.row.createTime }} |
| 60 | 60 | </template> | ... | ... |
src/views/aCommunity/aCarDetailFeeLang.js
| 1 | 1 | export const messages = { |
| 2 | 2 | en: { |
| 3 | - carDetailFee: { | |
| 4 | - feeItem: 'Fee Item', | |
| 5 | - feeFlag: 'Fee Flag', | |
| 6 | - feeType: 'Fee Type', | |
| 7 | - amountOwed: 'Amount Owed', | |
| 8 | - createTime: 'Create Time', | |
| 9 | - duePeriod: 'Due Period', | |
| 10 | - remark: 'Remark', | |
| 11 | - preDegrees: 'Previous Degrees', | |
| 12 | - curDegrees: 'Current Degrees', | |
| 13 | - unitPrice: 'Unit Price', | |
| 14 | - additionalFee: 'Additional Fee', | |
| 15 | - fixedFee: 'Fixed Fee', | |
| 16 | - status: 'Status', | |
| 17 | - operation: 'Operation', | |
| 18 | - paymentNotice: 'Please go to the business acceptance page for payment' | |
| 19 | - } | |
| 3 | + | |
| 20 | 4 | }, |
| 21 | 5 | zh: { |
| 22 | - carDetailFee: { | |
| 23 | - feeItem: '费用项目', | |
| 24 | - feeFlag: '费用标识', | |
| 25 | - feeType: '费用类型', | |
| 26 | - amountOwed: '应收金额', | |
| 27 | - createTime: '建账时间', | |
| 28 | - duePeriod: '应收时间段', | |
| 29 | - remark: '说明', | |
| 30 | - preDegrees: '上期度数', | |
| 31 | - curDegrees: '本期度数', | |
| 32 | - unitPrice: '单价', | |
| 33 | - additionalFee: '附加费', | |
| 34 | - fixedFee: '固定费', | |
| 35 | - status: '状态', | |
| 36 | - operation: '操作', | |
| 37 | - paymentNotice: '缴费请到业务受理页面缴费' | |
| 38 | - } | |
| 6 | + | |
| 39 | 7 | } |
| 40 | 8 | } |
| 41 | 9 | \ No newline at end of file | ... | ... |
src/views/aCommunity/aCarDetailHisLang.js
| 1 | 1 | export const messages = { |
| 2 | 2 | en: { |
| 3 | - carDetailHis: { | |
| 4 | - carNum: 'License Plate', | |
| 5 | - leaseType: 'Plate Type', | |
| 6 | - tempCar: 'Temporary Car', | |
| 7 | - carType: 'Car Type', | |
| 8 | - color: 'Color', | |
| 9 | - owner: 'Owner', | |
| 10 | - parkingSpace: 'Parking Space', | |
| 11 | - spaceReleased: 'Space Released', | |
| 12 | - validPeriod: 'Valid Period', | |
| 13 | - action: 'Action', | |
| 14 | - operator: 'Operator', | |
| 15 | - operateTime: 'Operate Time', | |
| 16 | - add: 'Add', | |
| 17 | - delete: 'Delete', | |
| 18 | - modifyNew: 'Modify(New)', | |
| 19 | - modifyOld: 'Modify(Old)' | |
| 20 | - } | |
| 3 | + | |
| 21 | 4 | }, |
| 22 | 5 | zh: { |
| 23 | - carDetailHis: { | |
| 24 | - carNum: '车牌号', | |
| 25 | - leaseType: '车牌类型', | |
| 26 | - tempCar: '临时车', | |
| 27 | - carType: '车辆类型', | |
| 28 | - color: '颜色', | |
| 29 | - owner: '业主', | |
| 30 | - parkingSpace: '车位', | |
| 31 | - spaceReleased: '车位已释放', | |
| 32 | - validPeriod: '有效期', | |
| 33 | - action: '动作', | |
| 34 | - operator: '操作人', | |
| 35 | - operateTime: '操作时间', | |
| 36 | - add: '添加', | |
| 37 | - delete: '删除', | |
| 38 | - modifyNew: '修改(新)', | |
| 39 | - modifyOld: '修改(旧)' | |
| 40 | - } | |
| 6 | + | |
| 41 | 7 | } |
| 42 | 8 | } |
| 43 | 9 | \ No newline at end of file | ... | ... |
src/views/aCommunity/adminCarDetailLang.js
| ... | ... | @@ -27,23 +27,7 @@ export const messages = { |
| 27 | 27 | status: 'Status:', |
| 28 | 28 | relatedHouse: 'Related House:' |
| 29 | 29 | }, |
| 30 | - carDetailFee: { | |
| 31 | - feeItem: 'Fee Item', | |
| 32 | - feeFlag: 'Fee Flag', | |
| 33 | - feeType: 'Fee Type', | |
| 34 | - amountOwed: 'Amount Owed', | |
| 35 | - createTime: 'Create Time', | |
| 36 | - duePeriod: 'Due Period', | |
| 37 | - remark: 'Remark', | |
| 38 | - preDegrees: 'Previous Degrees', | |
| 39 | - curDegrees: 'Current Degrees', | |
| 40 | - unitPrice: 'Unit Price', | |
| 41 | - additionalFee: 'Additional Fee', | |
| 42 | - fixedFee: 'Fixed Fee', | |
| 43 | - status: 'Status', | |
| 44 | - operation: 'Operation', | |
| 45 | - paymentNotice: 'Please go to the business acceptance page for payment' | |
| 46 | - }, | |
| 30 | + | |
| 47 | 31 | carDetailHis: { |
| 48 | 32 | carNum: 'License Plate', |
| 49 | 33 | leaseType: 'Plate Type', |
| ... | ... | @@ -183,29 +167,14 @@ export const messages = { |
| 183 | 167 | plateType: '车牌类型:', |
| 184 | 168 | leaseStartTime: '起租时间:', |
| 185 | 169 | leaseEndTime: '结租时间:', |
| 170 | + validityPeriod: '有效期:', | |
| 186 | 171 | remark: '备注:', |
| 187 | 172 | parkingLot: '停车场:', |
| 188 | 173 | parkingSpace: '车位:', |
| 189 | 174 | status: '状态:', |
| 190 | 175 | relatedHouse: '关联房屋:' |
| 191 | 176 | }, |
| 192 | - carDetailFee: { | |
| 193 | - feeItem: '费用项目', | |
| 194 | - feeFlag: '费用标识', | |
| 195 | - feeType: '费用类型', | |
| 196 | - amountOwed: '应收金额', | |
| 197 | - createTime: '建账时间', | |
| 198 | - duePeriod: '应收时间段', | |
| 199 | - remark: '说明', | |
| 200 | - preDegrees: '上期度数', | |
| 201 | - curDegrees: '本期度数', | |
| 202 | - unitPrice: '单价', | |
| 203 | - additionalFee: '附加费', | |
| 204 | - fixedFee: '固定费', | |
| 205 | - status: '状态', | |
| 206 | - operation: '操作', | |
| 207 | - paymentNotice: '缴费请到业务受理页面缴费' | |
| 208 | - }, | |
| 177 | + | |
| 209 | 178 | carDetailHis: { |
| 210 | 179 | carNum: '车牌号', |
| 211 | 180 | leaseType: '车牌类型', | ... | ... |
src/views/car/carDetailFeeLang.js
| 1 | 1 | export const messages = { |
| 2 | 2 | en: { |
| 3 | - carDetailFee: { | |
| 4 | - createFee: 'Create Fee', | |
| 5 | - feeItem: 'Fee Item', | |
| 6 | - feeFlag: 'Fee Flag', | |
| 7 | - feeType: 'Fee Type', | |
| 8 | - amountReceivable: 'Amount Receivable', | |
| 9 | - accountingTime: 'Accounting Time', | |
| 10 | - receivablePeriod: 'Receivable Period', | |
| 11 | - remark: 'Remark', | |
| 12 | - status: 'Status', | |
| 13 | - operation: 'Operation', | |
| 14 | - previousReading: 'Previous Reading', | |
| 15 | - currentReading: 'Current Reading', | |
| 16 | - unitPrice: 'Unit Price', | |
| 17 | - additionalFee: 'Additional Fee', | |
| 18 | - fixedFee: 'Fixed Fee', | |
| 19 | - payment: 'Payment', | |
| 20 | - history: 'History', | |
| 21 | - cancel: 'Cancel', | |
| 22 | - change: 'Change', | |
| 23 | - detail: 'Detail', | |
| 24 | - paymentNotice: 'Please go to the business acceptance page for payment' | |
| 25 | - } | |
| 3 | + | |
| 26 | 4 | }, |
| 27 | 5 | zh: { |
| 28 | - carDetailFee: { | |
| 29 | - createFee: '创建费用', | |
| 30 | - feeItem: '费用项目', | |
| 31 | - feeFlag: '费用标识', | |
| 32 | - feeType: '费用类型', | |
| 33 | - amountReceivable: '应收金额', | |
| 34 | - accountingTime: '建账时间', | |
| 35 | - receivablePeriod: '应收时间段', | |
| 36 | - remark: '说明', | |
| 37 | - status: '状态', | |
| 38 | - operation: '操作', | |
| 39 | - previousReading: '上期度数', | |
| 40 | - currentReading: '本期度数', | |
| 41 | - unitPrice: '单价', | |
| 42 | - additionalFee: '附加费', | |
| 43 | - fixedFee: '固定费', | |
| 44 | - payment: '缴费', | |
| 45 | - history: '历史', | |
| 46 | - cancel: '取消', | |
| 47 | - change: '变更', | |
| 48 | - detail: '详情', | |
| 49 | - paymentNotice: '缴费请到业务受理页面缴费' | |
| 50 | - } | |
| 6 | + | |
| 51 | 7 | } |
| 52 | 8 | } |
| 53 | 9 | \ No newline at end of file | ... | ... |
src/views/car/carDetailLang.js
| ... | ... | @@ -133,6 +133,17 @@ export const messages = { |
| 133 | 133 | machine: 'Machine', |
| 134 | 134 | verifyTime: 'Verify Time', |
| 135 | 135 | remark: 'Remark' |
| 136 | + }, | |
| 137 | + ownerDetailOweFee: { | |
| 138 | + paymentObject: 'Payment Object', | |
| 139 | + ownerName: 'Owner Name', | |
| 140 | + phone: 'Owner Phone', | |
| 141 | + startTime: 'Start Time', | |
| 142 | + endTime: 'End Time', | |
| 143 | + totalAmount: 'Total Amount', | |
| 144 | + updateTime: 'Update Time', | |
| 145 | + paymentNotice: 'Payment Notice', | |
| 146 | + batchPayment: 'Batch Payment' | |
| 136 | 147 | } |
| 137 | 148 | }, |
| 138 | 149 | zh: { |
| ... | ... | @@ -268,6 +279,17 @@ export const messages = { |
| 268 | 279 | machine: '道闸', |
| 269 | 280 | verifyTime: '核销时间', |
| 270 | 281 | remark: '说明' |
| 282 | + }, | |
| 283 | + ownerDetailOweFee: { | |
| 284 | + paymentObject: '缴费对象', | |
| 285 | + ownerName: '业主姓名', | |
| 286 | + phone: '业主手机', | |
| 287 | + startTime: '开始时间', | |
| 288 | + endTime: '结束时间', | |
| 289 | + totalAmount: '总金额', | |
| 290 | + updateTime: '更新时间', | |
| 291 | + paymentNotice: '缴费通知', | |
| 292 | + batchPayment: '批量缴费' | |
| 271 | 293 | } |
| 272 | 294 | } |
| 273 | 295 | } | ... | ... |
src/views/car/listOwnerCarList.vue
| ... | ... | @@ -2,14 +2,18 @@ |
| 2 | 2 | <div class="list-owner-car-container"> |
| 3 | 3 | <el-row :gutter="20"> |
| 4 | 4 | <el-col :span="3"> |
| 5 | - <el-card class="tree-card"> | |
| 6 | - <ul class="lease-type-list"> | |
| 7 | - <li v-for="(item, index) in leaseTypes" :key="index" @click="switchLeaseType(item)" | |
| 8 | - :class="{ 'selected': conditions.leaseType === item.statusCd }"> | |
| 9 | - {{ item.name }} | |
| 10 | - </li> | |
| 11 | - </ul> | |
| 12 | - </el-card> | |
| 5 | + | |
| 6 | + <div class="list-group-border-radius"> | |
| 7 | + <div class=" treeview"> | |
| 8 | + <ul class="list-group text-center "> | |
| 9 | + <li v-for="(item, index) in leaseTypes" :key="index" @click="switchLeaseType(item)" | |
| 10 | + :class="{ 'vc-node-selected': conditions.leaseType === item.statusCd }" | |
| 11 | + class="list-group-item node-orgTree"> | |
| 12 | + {{ item.name }} | |
| 13 | + </li> | |
| 14 | + </ul> | |
| 15 | + </div> | |
| 16 | + </div> | |
| 13 | 17 | </el-col> |
| 14 | 18 | <el-col :span="21"> |
| 15 | 19 | <el-card class="search-card"> |
| ... | ... | @@ -17,32 +21,27 @@ |
| 17 | 21 | <span>{{ $t('listOwnerCar.searchCondition') }}</span> |
| 18 | 22 | </div> |
| 19 | 23 | <el-row :gutter="20"> |
| 20 | - <el-col :span="6"> | |
| 24 | + <el-col :span="4"> | |
| 21 | 25 | <el-input v-model.trim="conditions.carNumLike" :placeholder="$t('listOwnerCar.inputCarNum')" clearable /> |
| 22 | 26 | </el-col> |
| 23 | - <el-col :span="6"> | |
| 27 | + <el-col :span="4"> | |
| 24 | 28 | <el-input v-model.trim="conditions.num" :placeholder="$t('listOwnerCar.inputParkingSpaceNum')" clearable /> |
| 25 | 29 | </el-col> |
| 26 | - <el-col :span="6"> | |
| 30 | + <el-col :span="4"> | |
| 27 | 31 | <el-select v-model="conditions.valid" :placeholder="$t('listOwnerCar.selectParkingSpaceStatus')" clearable> |
| 28 | 32 | <el-option value="1" :label="$t('listOwnerCar.normal')"></el-option> |
| 29 | 33 | <el-option value="3" :label="$t('listOwnerCar.expired')"></el-option> |
| 30 | 34 | <el-option value="2" :label="$t('listOwnerCar.noParkingSpace')"></el-option> |
| 31 | 35 | </el-select> |
| 32 | 36 | </el-col> |
| 33 | - <el-col :span="6"> | |
| 37 | + <el-col :span="4"> | |
| 34 | 38 | <el-input v-model.trim="conditions.ownerName" :placeholder="$t('listOwnerCar.inputOwnerName')" clearable /> |
| 35 | 39 | </el-col> |
| 36 | - </el-row> | |
| 37 | - <el-row :gutter="20" class="mt-10"> | |
| 38 | - <el-col :span="6"> | |
| 40 | + | |
| 41 | + <el-col :span="4"> | |
| 39 | 42 | <el-input v-model.trim="conditions.link" :placeholder="$t('listOwnerCar.inputContact')" clearable /> |
| 40 | 43 | </el-col> |
| 41 | - <el-col :span="6"> | |
| 42 | - <el-input v-model.trim="conditions.memberCarNumLike" :placeholder="$t('listOwnerCar.inputMemberCarNum')" | |
| 43 | - clearable /> | |
| 44 | - </el-col> | |
| 45 | - <el-col :span="12" class="text-right"> | |
| 44 | + <el-col :span="4" class="text-left"> | |
| 46 | 45 | <el-button type="primary" @click="queryMethod" icon="el-icon-search"> |
| 47 | 46 | {{ $t('listOwnerCar.query') }} |
| 48 | 47 | </el-button> |
| ... | ... | @@ -50,6 +49,11 @@ |
| 50 | 49 | {{ $t('listOwnerCar.reset') }} |
| 51 | 50 | </el-button> |
| 52 | 51 | </el-col> |
| 52 | + <el-col :span="4" class="margin-top"> | |
| 53 | + <el-input v-model.trim="conditions.memberCarNumLike" :placeholder="$t('listOwnerCar.inputMemberCarNum')" | |
| 54 | + clearable /> | |
| 55 | + </el-col> | |
| 56 | + | |
| 53 | 57 | </el-row> |
| 54 | 58 | </el-card> |
| 55 | 59 | ... | ... |
src/views/car/parkingAreaManageList.vue
| ... | ... | @@ -6,26 +6,26 @@ |
| 6 | 6 | <div slot="header" class="text-left"> |
| 7 | 7 | <span>{{ $t('parkingAreaManage.queryTitle') }}</span> |
| 8 | 8 | </div> |
| 9 | - <el-form :inline="true" :model="parkingAreaManageInfo.conditions" class="text-left"> | |
| 10 | - <el-form-item :label="$t('parkingAreaManage.parkingNum')"> | |
| 9 | + <div class="flex justify-start"> | |
| 10 | + <div class="width-100"> | |
| 11 | 11 | <el-input v-model.trim="parkingAreaManageInfo.conditions.num" |
| 12 | 12 | :placeholder="$t('parkingAreaManage.inputParkingNum')" clearable /> |
| 13 | - </el-form-item> | |
| 14 | - <el-form-item :label="$t('parkingAreaManage.parkingType')"> | |
| 13 | + </div> | |
| 14 | + <div class="width-100"> | |
| 15 | 15 | <el-select v-model="parkingAreaManageInfo.conditions.typeCd" |
| 16 | 16 | :placeholder="$t('parkingAreaManage.selectParkingType')" clearable style="width: 100%"> |
| 17 | 17 | <el-option v-for="item in parkingTypes" :key="item.value" :label="item.label" :value="item.value" /> |
| 18 | 18 | </el-select> |
| 19 | - </el-form-item> | |
| 20 | - <el-form-item> | |
| 19 | + </div> | |
| 20 | + <div class="width-100"> | |
| 21 | 21 | <el-button type="primary" @click="_queryParkingAreaMethod"> |
| 22 | 22 | {{ $t('common.search') }} |
| 23 | 23 | </el-button> |
| 24 | 24 | <el-button @click="_resetParkingAreaMethod"> |
| 25 | 25 | {{ $t('common.reset') }} |
| 26 | 26 | </el-button> |
| 27 | - </el-form-item> | |
| 28 | - </el-form> | |
| 27 | + </div> | |
| 28 | + </div> | |
| 29 | 29 | </el-card> |
| 30 | 30 | </el-col> |
| 31 | 31 | </el-row> |
| ... | ... | @@ -46,7 +46,8 @@ |
| 46 | 46 | <el-table-column prop="num" :label="$t('parkingAreaManage.parkingNum')" align="center" /> |
| 47 | 47 | <el-table-column :label="$t('parkingAreaManage.parkingType')" align="center"> |
| 48 | 48 | <template slot-scope="scope"> |
| 49 | - {{ scope.row.typeCd === '1001' ? $t('parkingAreaManage.aboveGround') : $t('parkingAreaManage.underground') | |
| 49 | + {{ scope.row.typeCd === '1001' ? $t('parkingAreaManage.aboveGround') : | |
| 50 | + $t('parkingAreaManage.underground') | |
| 50 | 51 | }} |
| 51 | 52 | </template> |
| 52 | 53 | </el-table-column> |
| ... | ... | @@ -95,6 +96,7 @@ import AddParkingArea from '@/components/car/addParkingArea' |
| 95 | 96 | import EditParkingArea from '@/components/car/editParkingArea' |
| 96 | 97 | import DeleteParkingArea from '@/components/car/deleteParkingArea' |
| 97 | 98 | import { getCommunityId } from '@/api/community/communityApi' |
| 99 | +import {jumpToIot} from '@/api/user/menuApi.js' | |
| 98 | 100 | |
| 99 | 101 | export default { |
| 100 | 102 | name: 'ParkingAreaManageList', |
| ... | ... | @@ -236,6 +238,7 @@ export default { |
| 236 | 238 | _openParkingAreaTotalControl(parkingArea) { |
| 237 | 239 | // 跳转到控制台逻辑 |
| 238 | 240 | console.log('打开控制台', parkingArea) |
| 241 | + jumpToIot(`/#/pages/car/parkingAreaTotalControl?paId=${parkingArea.paId}`) | |
| 239 | 242 | } |
| 240 | 243 | } |
| 241 | 244 | } |
| ... | ... | @@ -249,4 +252,9 @@ export default { |
| 249 | 252 | .float-right { |
| 250 | 253 | float: right; |
| 251 | 254 | } |
| 255 | + | |
| 256 | +.width-100 { | |
| 257 | + width: 250px; | |
| 258 | + margin-right: 10px; | |
| 259 | +} | |
| 252 | 260 | </style> |
| 253 | 261 | \ No newline at end of file | ... | ... |
src/views/car/tempCarPaymentList.vue
src/views/fee/carCreateFeeList.vue
| ... | ... | @@ -18,7 +18,8 @@ |
| 18 | 18 | @keyup.enter.native="handleQuery" /> |
| 19 | 19 | </el-col> |
| 20 | 20 | <el-col :span="4"> |
| 21 | - <el-select v-model="queryParams.state" :placeholder="$t('carCreateFee.parkingSpaceStatus')" style="width:100%"> | |
| 21 | + <el-select v-model="queryParams.state" :placeholder="$t('carCreateFee.parkingSpaceStatus')" | |
| 22 | + style="width:100%"> | |
| 22 | 23 | <el-option v-for="item in states" :key="item.statusCd" :label="item.name" :value="item.statusCd" /> |
| 23 | 24 | </el-select> |
| 24 | 25 | </el-col> | ... | ... |
src/views/fee/feeConfigDetailList.vue
| ... | ... | @@ -110,7 +110,7 @@ |
| 110 | 110 | </el-row> |
| 111 | 111 | </div> |
| 112 | 112 | |
| 113 | - <el-divider></el-divider> | |
| 113 | + <divider></divider> | |
| 114 | 114 | |
| 115 | 115 | <div class="tab-wrapper"> |
| 116 | 116 | <el-tabs v-model="feeDetailInfo.currentTab" @tab-click="changeTab(feeDetailInfo.currentTab)"> |
| ... | ... | @@ -137,13 +137,15 @@ import { getFeeConfigDetail } from '@/api/fee/feeConfigDetailApi' |
| 137 | 137 | import FeeConfigDetailHis from '@/components/fee/FeeConfigDetailHis' |
| 138 | 138 | import FeeDetailFeeObj from '@/components/fee/FeeDetailFeeObj' |
| 139 | 139 | import FeeConfigDetailDiscount from '@/components/fee/FeeConfigDetailDiscount' |
| 140 | +import divider from '@/components/system/divider' | |
| 140 | 141 | |
| 141 | 142 | export default { |
| 142 | 143 | name: 'FeeConfigDetailList', |
| 143 | 144 | components: { |
| 144 | 145 | FeeConfigDetailHis, |
| 145 | 146 | FeeDetailFeeObj, |
| 146 | - FeeConfigDetailDiscount | |
| 147 | + FeeConfigDetailDiscount, | |
| 148 | + divider | |
| 147 | 149 | }, |
| 148 | 150 | data() { |
| 149 | 151 | return { | ... | ... |
src/views/fee/feeConfigManageList.vue
| ... | ... | @@ -89,9 +89,9 @@ |
| 89 | 89 | <div slot="header" class="flex justify-between"> |
| 90 | 90 | <span>{{ $t('feeConfigManage.feeItems') }}</span> |
| 91 | 91 | <div style="float: right;"> |
| 92 | - <el-button type="primary" size="small" icon="el-icon-document" @click="showMarkdown"> | |
| 92 | + <!-- <el-button type="primary" size="small" icon="el-icon-document" @click="showMarkdown"> | |
| 93 | 93 | {{ $t('common.document') }} |
| 94 | - </el-button> | |
| 94 | + </el-button> --> | |
| 95 | 95 | <el-button v-if="hasPrivilege('502022022571930560')" type="primary" size="small" |
| 96 | 96 | @click="_openAddFeeConfigModal"> |
| 97 | 97 | {{ $t('common.add') }} |
| ... | ... | @@ -148,7 +148,7 @@ |
| 148 | 148 | </el-table> |
| 149 | 149 | |
| 150 | 150 | <el-row :gutter="20" style="margin-top: 15px;"> |
| 151 | - <el-col :span="18" class="text-left"> | |
| 151 | + <el-col :span="18" class="text-left fee-detail-desc"> | |
| 152 | 152 | <div> |
| 153 | 153 | <p>{{ $t('feeConfigManage.feeFlagTip') }}</p> |
| 154 | 154 | <p>{{ $t('feeConfigManage.paymentTypeTip') }}</p> |
| ... | ... | @@ -310,9 +310,6 @@ export default { |
| 310 | 310 | </script> |
| 311 | 311 | |
| 312 | 312 | <style scoped> |
| 313 | - | |
| 314 | - | |
| 315 | - | |
| 316 | 313 | .margin-xs-r { |
| 317 | 314 | margin-right: 5px; |
| 318 | 315 | } |
| ... | ... | @@ -320,4 +317,10 @@ export default { |
| 320 | 317 | .ibox { |
| 321 | 318 | margin-bottom: 20px; |
| 322 | 319 | } |
| 320 | + | |
| 321 | +.fee-detail-desc { | |
| 322 | + text-align: left; | |
| 323 | + font-size: 13px; | |
| 324 | + color: #606266; | |
| 325 | +} | |
| 323 | 326 | </style> |
| 324 | 327 | \ No newline at end of file | ... | ... |
src/views/fee/payFeeConfigDiscountManageList.vue
| ... | ... | @@ -48,7 +48,7 @@ |
| 48 | 48 | </el-table> |
| 49 | 49 | |
| 50 | 50 | <el-row class="margin-top-xs"> |
| 51 | - <el-col :span="21" class="text-left"> | |
| 51 | + <el-col :span="21" class="text-left discount-desc"> | |
| 52 | 52 | <div>{{ $t('payFeeConfigDiscountManage.paymentPeriodTip') }}</div> |
| 53 | 53 | <div>{{ $t('payFeeConfigDiscountManage.discountEndTimeTip') }}</div> |
| 54 | 54 | <div>{{ $t('payFeeConfigDiscountManage.currentYearTip1') }}</div> |
| ... | ... | @@ -148,5 +148,10 @@ export default { |
| 148 | 148 | .text-right { |
| 149 | 149 | text-align: right; |
| 150 | 150 | } |
| 151 | + .discount-desc { | |
| 152 | + text-align: left; | |
| 153 | + font-size: 13px; | |
| 154 | + color: #606266; | |
| 155 | + } | |
| 151 | 156 | } |
| 152 | 157 | </style> |
| 153 | 158 | \ No newline at end of file | ... | ... |
src/views/system/operateDataLogLang.js
| ... | ... | @@ -68,24 +68,7 @@ export const messages = { |
| 68 | 68 | modifyNew: 'modify(new)', |
| 69 | 69 | modifyOld: 'modify(old)' |
| 70 | 70 | }, |
| 71 | - carDetailHis: { | |
| 72 | - carNum: 'car number', | |
| 73 | - leaseType: 'lease type', | |
| 74 | - tempCar: 'temp car', | |
| 75 | - carTypeName: 'car type', | |
| 76 | - carColor: 'color', | |
| 77 | - owner: 'owner', | |
| 78 | - parkingSpace: 'parking space', | |
| 79 | - released: 'released', | |
| 80 | - validityPeriod: 'validity period', | |
| 81 | - operate: 'action', | |
| 82 | - userName: 'operator', | |
| 83 | - createTime: 'create time', | |
| 84 | - add: 'add', | |
| 85 | - delete: 'delete', | |
| 86 | - modifyNew: 'modify(new)', | |
| 87 | - modifyOld: 'modify(old)' | |
| 88 | - }, | |
| 71 | + | |
| 89 | 72 | contractDetailChange: { |
| 90 | 73 | contractName: 'contract name', |
| 91 | 74 | contractCode: 'contract code', |
| ... | ... | @@ -170,24 +153,7 @@ export const messages = { |
| 170 | 153 | modifyNew: '修改(新)', |
| 171 | 154 | modifyOld: '修改(旧)' |
| 172 | 155 | }, |
| 173 | - carDetailHis: { | |
| 174 | - carNum: '车牌号', | |
| 175 | - leaseType: '车牌类型', | |
| 176 | - tempCar: '临时车', | |
| 177 | - carTypeName: '车辆类型', | |
| 178 | - carColor: '颜色', | |
| 179 | - owner: '业主', | |
| 180 | - parkingSpace: '车位', | |
| 181 | - released: '车位已释放', | |
| 182 | - validityPeriod: '有效期', | |
| 183 | - operate: '动作', | |
| 184 | - userName: '操作人', | |
| 185 | - createTime: '操作时间', | |
| 186 | - add: '添加', | |
| 187 | - delete: '删除', | |
| 188 | - modifyNew: '修改(新)', | |
| 189 | - modifyOld: '修改(旧)' | |
| 190 | - }, | |
| 156 | + | |
| 191 | 157 | contractDetailChange: { |
| 192 | 158 | contractName: '合同名称', |
| 193 | 159 | contractCode: '合同编号', | ... | ... |