Commit 257e836f565379ac7c7865f479d65e80402ebf91
1 parent
63ef3e7f
v1.9 优化排版英文bug
Showing
15 changed files
with
86 additions
and
119 deletions
src/components/fee/deleteOweFeeCallable.vue
src/components/fee/simplifyCallable.vue
| ... | ... | @@ -2,58 +2,41 @@ |
| 2 | 2 | <div> |
| 3 | 3 | <el-row class="margin-top"> |
| 4 | 4 | <el-col :span="24" class="text-right"> |
| 5 | - <el-button | |
| 6 | - type="primary" | |
| 7 | - size="small" | |
| 8 | - v-if="simplifyCallableInfo.roomId" | |
| 9 | - @click="_openWritePrintOweFeeCallableModal" | |
| 10 | - > | |
| 5 | + <el-button type="primary" size="small" v-if="simplifyCallableInfo.roomId" | |
| 6 | + @click="_openWritePrintOweFeeCallableModal"> | |
| 11 | 7 | <i class="el-icon-plus"></i> |
| 12 | 8 | {{ $t('simplifyCallable.register') }} |
| 13 | 9 | </el-button> |
| 14 | - <el-button | |
| 15 | - type="primary" | |
| 16 | - size="small" | |
| 17 | - v-if="simplifyCallableInfo.roomId" | |
| 18 | - @click="_openAddOweFeeCallableModal" | |
| 19 | - > | |
| 10 | + <el-button type="primary" size="small" v-if="simplifyCallableInfo.roomId" @click="_openAddOweFeeCallableModal"> | |
| 20 | 11 | <i class="el-icon-plus"></i> |
| 21 | 12 | {{ $t('simplifyCallable.callable') }} |
| 22 | 13 | </el-button> |
| 23 | - <el-button | |
| 24 | - type="primary" | |
| 25 | - size="small" | |
| 26 | - v-if="simplifyCallableInfo.roomId" | |
| 27 | - @click="_printOwnOrder" | |
| 28 | - > | |
| 14 | + <el-button type="primary" size="small" v-if="simplifyCallableInfo.roomId" @click="_printOwnOrder"> | |
| 29 | 15 | <i class="el-icon-plus"></i> |
| 30 | 16 | {{ $t('simplifyCallable.callableOrder') }} |
| 31 | 17 | </el-button> |
| 32 | 18 | </el-col> |
| 33 | 19 | </el-row> |
| 34 | 20 | <div> |
| 35 | - <el-table | |
| 36 | - :data="simplifyCallableInfo.callables" | |
| 37 | - style="margin-top:10px" | |
| 38 | - border | |
| 39 | - stripe | |
| 40 | - > | |
| 21 | + <el-table :data="simplifyCallableInfo.callables" style="margin-top:10px" border stripe> | |
| 41 | 22 | <el-table-column prop="ofcId" :label="$t('simplifyCallable.id')" align="center"></el-table-column> |
| 42 | 23 | <el-table-column prop="ownerName" :label="$t('simplifyCallable.ownerName')" align="center"></el-table-column> |
| 43 | - <el-table-column prop="payerObjName" :label="$t('simplifyCallable.payerObjName')" align="center"></el-table-column> | |
| 24 | + <el-table-column prop="payerObjName" :label="$t('simplifyCallable.payerObjName')" | |
| 25 | + align="center"></el-table-column> | |
| 44 | 26 | <el-table-column prop="feeName" :label="$t('simplifyCallable.feeName')" align="center"></el-table-column> |
| 45 | 27 | <el-table-column prop="amountdOwed" :label="$t('simplifyCallable.amount')" align="center"></el-table-column> |
| 46 | 28 | <el-table-column :label="$t('simplifyCallable.timePeriod')" align="center"> |
| 47 | 29 | <template slot-scope="scope"> |
| 48 | - {{scope.row.startTime}}<br>~{{scope.row.endTime}} | |
| 30 | + {{ scope.row.startTime }}<br>~{{ scope.row.endTime }} | |
| 49 | 31 | </template> |
| 50 | 32 | </el-table-column> |
| 51 | - <el-table-column prop="callableWayName" :label="$t('simplifyCallable.callableWay')" align="center"></el-table-column> | |
| 33 | + <el-table-column prop="callableWayName" :label="$t('simplifyCallable.callableWay')" | |
| 34 | + align="center"></el-table-column> | |
| 52 | 35 | <el-table-column prop="staffName" :label="$t('simplifyCallable.staffName')" align="center"></el-table-column> |
| 53 | 36 | <el-table-column prop="stateName" :label="$t('simplifyCallable.status')" align="center"></el-table-column> |
| 54 | 37 | <el-table-column prop="remark" :label="$t('simplifyCallable.remark')" align="center"> |
| 55 | 38 | <template slot-scope="scope"> |
| 56 | - <div class="textAuto" style="max-width: 200px;">{{scope.row.remark}}</div> | |
| 39 | + <div class="textAuto" style="max-width: 200px;">{{ scope.row.remark }}</div> | |
| 57 | 40 | </template> |
| 58 | 41 | </el-table-column> |
| 59 | 42 | <el-table-column prop="createTime" :label="$t('simplifyCallable.createTime')" align="center"></el-table-column> |
| ... | ... | @@ -67,16 +50,12 @@ |
| 67 | 50 | </template> |
| 68 | 51 | </el-table-column> |
| 69 | 52 | </el-table> |
| 70 | - <el-pagination | |
| 71 | - @current-change="handleCurrentChange" | |
| 72 | - :current-page="currentPage" | |
| 73 | - :page-size="pageSize" | |
| 74 | - layout="total, prev, pager, next" | |
| 75 | - :total="total"> | |
| 53 | + <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize" | |
| 54 | + layout="total, prev, pager, next" :total="total"> | |
| 76 | 55 | </el-pagination> |
| 77 | 56 | </div> |
| 78 | - <write-owe-fee-callable ref="writeOweFeeCallable"></write-owe-fee-callable> | |
| 79 | - <delete-owe-fee-callable ref="deleteOweFeeCallable"></delete-owe-fee-callable> | |
| 57 | + <write-owe-fee-callable ref="writeOweFeeCallable" @success="handleSuccess" ></write-owe-fee-callable> | |
| 58 | + <delete-owe-fee-callable ref="deleteOweFeeCallable" @success="handleSuccess"></delete-owe-fee-callable> | |
| 80 | 59 | </div> |
| 81 | 60 | </template> |
| 82 | 61 | |
| ... | ... | @@ -171,6 +150,9 @@ export default { |
| 171 | 150 | _openDeleteOweFeeCallableModel(oweFeeCallable) { |
| 172 | 151 | this.$refs.deleteOweFeeCallable.open(oweFeeCallable) |
| 173 | 152 | }, |
| 153 | + handleSuccess() { | |
| 154 | + this._listSimplifyCallable(this.DEFAULT_PAGE, this.DEFAULT_ROWS) | |
| 155 | + }, | |
| 174 | 156 | open(params) { |
| 175 | 157 | this.handleSwitch(params) |
| 176 | 158 | } |
| ... | ... | @@ -182,9 +164,11 @@ export default { |
| 182 | 164 | .margin-top { |
| 183 | 165 | margin-top: 15px; |
| 184 | 166 | } |
| 167 | + | |
| 185 | 168 | .text-right { |
| 186 | 169 | text-align: right; |
| 187 | 170 | } |
| 171 | + | |
| 188 | 172 | .textAuto { |
| 189 | 173 | white-space: nowrap; |
| 190 | 174 | overflow: hidden; | ... | ... |
src/components/fee/simplifyOwnerRooms.vue
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | <el-row class="margin-top"> |
| 4 | 4 | <el-col :span="22" class="text-right"></el-col> |
| 5 | 5 | <el-col :span="2" class="text-right"> |
| 6 | - <el-button | |
| 6 | + <!-- <el-button | |
| 7 | 7 | type="primary" |
| 8 | 8 | size="small" |
| 9 | 9 | style="margin-left:10px" |
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | > |
| 13 | 13 | <i class="el-icon-plus"></i> |
| 14 | 14 | <span>{{ $t('simplifyOwnerRooms.batchPay') }}</span> |
| 15 | - </el-button> | |
| 15 | + </el-button> --> | |
| 16 | 16 | </el-col> |
| 17 | 17 | </el-row> |
| 18 | 18 | <div> |
| ... | ... | @@ -46,7 +46,7 @@ |
| 46 | 46 | {{scope.row.roomOweFee || '0.00'}}({{$t('simplifyOwnerRooms.updateDaily')}}) |
| 47 | 47 | </template> |
| 48 | 48 | </el-table-column> |
| 49 | - <el-table-column :label="$t('simplifyOwnerRooms.actions')" align="center"> | |
| 49 | + <el-table-column :label="$t('simplifyOwnerRooms.actions')" align="center" v-if="hasChange == 'Y'"> | |
| 50 | 50 | <template slot-scope="scope"> |
| 51 | 51 | <el-button-group v-if="simplifyOwnerRoomsInfo.roomId != scope.row.roomId"> |
| 52 | 52 | <el-button size="mini" @click="_toChooseOwnerRoomModel(scope.row)"> |
| ... | ... | @@ -82,6 +82,12 @@ import { queryRoomsByOwner } from '@/api/fee/simplifyOwnerRoomsApi' |
| 82 | 82 | |
| 83 | 83 | export default { |
| 84 | 84 | name: 'SimplifyOwnerRooms', |
| 85 | + props:{ | |
| 86 | + hasChange:{ | |
| 87 | + type:String, | |
| 88 | + default:'Y' | |
| 89 | + } | |
| 90 | + }, | |
| 85 | 91 | data() { |
| 86 | 92 | return { |
| 87 | 93 | DEFAULT_PAGE: 1, |
| ... | ... | @@ -92,7 +98,7 @@ export default { |
| 92 | 98 | roomId: '', |
| 93 | 99 | total: 0, |
| 94 | 100 | records: 1, |
| 95 | - allOweFeeAmount: 0 | |
| 101 | + allOweFeeAmount: 0, | |
| 96 | 102 | }, |
| 97 | 103 | currentPage: 1, |
| 98 | 104 | pageSize: 10, |
| ... | ... | @@ -151,7 +157,7 @@ export default { |
| 151 | 157 | roomId: '', |
| 152 | 158 | total: 0, |
| 153 | 159 | records: 1, |
| 154 | - allOweFeeAmount: 0 | |
| 160 | + allOweFeeAmount: 0, | |
| 155 | 161 | } |
| 156 | 162 | }, |
| 157 | 163 | _openSimplifyOwnerRoomsBatchPayFeeModal() { | ... | ... |
src/components/fee/simplifyRoomFee.vue
| ... | ... | @@ -80,7 +80,6 @@ |
| 80 | 80 | <template slot-scope="scope"> |
| 81 | 81 | <span class="hand" @click="viewRoomFeeConfig(scope.row)"> |
| 82 | 82 | {{ scope.row.feeName }}{{ getSimplifyRoomFeeRoomName(scope.row) }} |
| 83 | - <i class="el-icon-info"></i> | |
| 84 | 83 | </span> |
| 85 | 84 | </template> |
| 86 | 85 | </el-table-column> |
| ... | ... | @@ -184,7 +183,6 @@ |
| 184 | 183 | <template slot-scope="scope"> |
| 185 | 184 | <span class="hand" @click="viewRoomFeeConfig(scope.row)"> |
| 186 | 185 | {{ scope.row.feeName }}{{ getSimplifyRoomFeeRoomName(scope.row) }} |
| 187 | - <i class="el-icon-info"></i> | |
| 188 | 186 | </span> |
| 189 | 187 | </template> |
| 190 | 188 | </el-table-column> | ... | ... |
src/components/fee/writeOweFeeCallable.vue
src/components/org/scheduleClassesDay.vue
| ... | ... | @@ -24,26 +24,12 @@ |
| 24 | 24 | <script> |
| 25 | 25 | export default { |
| 26 | 26 | name: 'ScheduleClassesDay', |
| 27 | - props: { | |
| 28 | - initialData: { | |
| 29 | - type: Object, | |
| 30 | - default: () => ({}) | |
| 31 | - } | |
| 32 | - }, | |
| 33 | 27 | data() { |
| 34 | 28 | return { |
| 35 | 29 | scheduleCycle: 1, |
| 36 | 30 | days: [] |
| 37 | 31 | } |
| 38 | 32 | }, |
| 39 | - created() { | |
| 40 | - if (this.initialData.days && this.initialData.days.length > 0) { | |
| 41 | - this.days = [...this.initialData.days] | |
| 42 | - this.scheduleCycle = this.initialData.scheduleCycle | |
| 43 | - } else { | |
| 44 | - this.changeInspectionPeriod() | |
| 45 | - } | |
| 46 | - }, | |
| 47 | 33 | methods: { |
| 48 | 34 | notify(params) { |
| 49 | 35 | this.days = params.days; |
| ... | ... | @@ -60,9 +46,10 @@ export default { |
| 60 | 46 | this.changeInspectionPeriod() |
| 61 | 47 | }, |
| 62 | 48 | changeInspectionPeriod() { |
| 63 | - this.days = [] | |
| 49 | + let _days = this.days; | |
| 50 | + _days.splice(0, _days.length); | |
| 64 | 51 | for (let cycleIndex = 0; cycleIndex < this.scheduleCycle; cycleIndex++) { |
| 65 | - this.days.push({ | |
| 52 | + _days.push({ | |
| 66 | 53 | day: cycleIndex + 1, |
| 67 | 54 | workday: '2002', |
| 68 | 55 | workdayName: this.$t('scheduleClassesDay.rest'), | ... | ... |
src/components/org/scheduleClassesMonth.vue
| ... | ... | @@ -24,26 +24,12 @@ |
| 24 | 24 | <script> |
| 25 | 25 | export default { |
| 26 | 26 | name: 'ScheduleClassesMonth', |
| 27 | - props: { | |
| 28 | - initialData: { | |
| 29 | - type: Object, | |
| 30 | - default: () => ({}) | |
| 31 | - } | |
| 32 | - }, | |
| 33 | 27 | data() { |
| 34 | 28 | return { |
| 35 | 29 | scheduleCycle: 1, |
| 36 | 30 | days: [] |
| 37 | 31 | } |
| 38 | 32 | }, |
| 39 | - created() { | |
| 40 | - if (this.initialData.days && this.initialData.days.length > 0) { | |
| 41 | - this.days = [...this.initialData.days] | |
| 42 | - this.scheduleCycle = this.initialData.scheduleCycle | |
| 43 | - } else { | |
| 44 | - this.changeInspectionPeriod() | |
| 45 | - } | |
| 46 | - }, | |
| 47 | 33 | methods: { |
| 48 | 34 | initData(scheduleCycle) { |
| 49 | 35 | this.scheduleCycle = scheduleCycle |
| ... | ... | @@ -58,9 +44,10 @@ export default { |
| 58 | 44 | this.changeInspectionPeriod(); |
| 59 | 45 | }, |
| 60 | 46 | changeInspectionPeriod() { |
| 61 | - this.days = [] | |
| 47 | + let _days = this.days; | |
| 48 | + _days.splice(0, _days.length); | |
| 62 | 49 | for (let cycleIndex = 0; cycleIndex < 31; cycleIndex++) { |
| 63 | - this.days.push({ | |
| 50 | + _days.push({ | |
| 64 | 51 | day: cycleIndex + 1, |
| 65 | 52 | workday: '2002', |
| 66 | 53 | workdayName: this.$t('scheduleClassesMonth.rest'), | ... | ... |
src/components/org/scheduleClassesWeek.vue
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | <el-form-item :label="getWeek(week)"> |
| 13 | 13 | <div class="schedule-weeks-container"> |
| 14 | 14 | <template v-for="(item, index) in days"> |
| 15 | - <div v-if="item.weekFlag === week" :key="index" class="schedule-week-item" @click="changeWorkdayWeekInfo(item)"> | |
| 15 | + <div v-if="item.weekFlag == 1" :key="index" class="schedule-week-item" @click="changeWorkdayWeekInfo(item)"> | |
| 16 | 16 | <div class="day-name">{{ getWorkDay(item.day) }}</div> |
| 17 | 17 | <div class="workday-name">{{ item.workdayName }}</div> |
| 18 | 18 | <div v-for="(time, timeIndex) in item.times" :key="timeIndex" class="time-range"> |
| ... | ... | @@ -29,45 +29,34 @@ |
| 29 | 29 | <script> |
| 30 | 30 | export default { |
| 31 | 31 | name: 'ScheduleClassesWeek', |
| 32 | - props: { | |
| 33 | - initialData: { | |
| 34 | - type: Object, | |
| 35 | - default: () => ({}) | |
| 36 | - } | |
| 37 | - }, | |
| 38 | 32 | data() { |
| 39 | 33 | return { |
| 40 | 34 | scheduleCycle: 1, |
| 41 | 35 | days: [] |
| 42 | 36 | } |
| 43 | 37 | }, |
| 44 | - created() { | |
| 45 | - if (this.initialData.days && this.initialData.days.length > 0) { | |
| 46 | - this.days = [...this.initialData.days] | |
| 47 | - this.scheduleCycle = this.initialData.scheduleCycle | |
| 48 | - } else { | |
| 49 | - this.changeInspectionPeriodWeek() | |
| 50 | - } | |
| 51 | - }, | |
| 52 | 38 | methods: { |
| 53 | 39 | initData(scheduleCycle) { |
| 54 | 40 | this.scheduleCycle = scheduleCycle |
| 55 | 41 | this.changeInspectionPeriodWeek() |
| 56 | 42 | }, |
| 57 | 43 | notify(params) { |
| 58 | - this.days = params.days; | |
| 59 | 44 | this.scheduleCycle = parseInt(params.scheduleCycle); |
| 45 | + this.days = params.days | |
| 60 | 46 | |
| 47 | + // 使用深拷贝确保数据是响应式的,并确保每个 item 都有 times 数组 | |
| 61 | 48 | if (params.days && params.days.length > 0) { |
| 62 | 49 | return; |
| 63 | 50 | } |
| 51 | + | |
| 64 | 52 | this.changeInspectionPeriodWeek(); |
| 65 | 53 | }, |
| 66 | 54 | changeInspectionPeriodWeek() { |
| 67 | - this.days = [] | |
| 55 | + let _days = this.days; | |
| 56 | + _days.splice(0, _days.length); | |
| 68 | 57 | for (let weekIndex = 0; weekIndex < this.scheduleCycle; weekIndex++) { |
| 69 | 58 | for (let cycleIndex = 0; cycleIndex < 7; cycleIndex++) { |
| 70 | - this.days.push({ | |
| 59 | + _days.push({ | |
| 71 | 60 | weekFlag: weekIndex + 1, |
| 72 | 61 | day: cycleIndex + 1, |
| 73 | 62 | workday: '2002', | ... | ... |
src/components/room/roomTree.vue
| ... | ... | @@ -55,7 +55,7 @@ export default { |
| 55 | 55 | floorId: unit.floorId, |
| 56 | 56 | floorNum: unit.floorNum, |
| 57 | 57 | icon: "/img/floor.png", |
| 58 | - text: `${unit.floorNum}${this.$t('room.floorUnitTree.building')}`, | |
| 58 | + text: `${unit.floorNum}`, | |
| 59 | 59 | children: [] |
| 60 | 60 | } |
| 61 | 61 | } |
| ... | ... | @@ -63,7 +63,7 @@ export default { |
| 63 | 63 | const unitNode = { |
| 64 | 64 | id: `u_${unit.unitId}`, |
| 65 | 65 | unitId: unit.unitId, |
| 66 | - text: `${unit.unitNum}${this.$t('room.floorUnitTree.unit')}`, | |
| 66 | + text: `${unit.unitNum}`, | |
| 67 | 67 | icon: "/img/unit.png", |
| 68 | 68 | children: [] |
| 69 | 69 | } | ... | ... |
src/components/room/roomTreeDiv.vue
| ... | ... | @@ -68,7 +68,7 @@ export default { |
| 68 | 68 | floorId: unit.floorId, |
| 69 | 69 | floorNum: unit.floorNum, |
| 70 | 70 | icon: "/img/floor.png", |
| 71 | - text: `${unit.floorNum}${this.$t('room.floorUnitTree.building')}`, | |
| 71 | + text: `${unit.floorNum}`, | |
| 72 | 72 | children: [] |
| 73 | 73 | } |
| 74 | 74 | } |
| ... | ... | @@ -79,7 +79,7 @@ export default { |
| 79 | 79 | unitNum: unit.unitNum, |
| 80 | 80 | floorId: unit.floorId, // Add floorId reference |
| 81 | 81 | icon: "/img/unit.png", |
| 82 | - text: `${unit.unitNum}${this.$t('room.floorUnitTree.unit')}`, | |
| 82 | + text: `${unit.unitNum}`, | |
| 83 | 83 | children: [] |
| 84 | 84 | }) |
| 85 | 85 | }) | ... | ... |
src/i18n/commonLang.js
| ... | ... | @@ -72,7 +72,14 @@ export const messages = { |
| 72 | 72 | required:'Required', |
| 73 | 73 | invalid:'Invalid', |
| 74 | 74 | explanation:'Explanation', |
| 75 | - manage:'Manage' | |
| 75 | + manage:'Manage', | |
| 76 | + monday: 'Monday', | |
| 77 | + tuesday: 'Tuesday', | |
| 78 | + wednesday: 'Wednesday', | |
| 79 | + thursday: 'Thursday', | |
| 80 | + friday: 'Friday', | |
| 81 | + saturday: 'Saturday', | |
| 82 | + sunday: 'Sunday', | |
| 76 | 83 | } |
| 77 | 84 | }, |
| 78 | 85 | zh: { |
| ... | ... | @@ -148,7 +155,14 @@ export const messages = { |
| 148 | 155 | required:'必填', |
| 149 | 156 | invalid:'无效', |
| 150 | 157 | explanation:'说明', |
| 151 | - manage:'管理' | |
| 158 | + manage:'管理', | |
| 159 | + monday:'星期一', | |
| 160 | + tuesday:'星期二', | |
| 161 | + wednesday:'星期三', | |
| 162 | + thursday:'星期四', | |
| 163 | + friday:'星期五', | |
| 164 | + saturday:'星期六', | |
| 165 | + sunday:'星期日' | |
| 152 | 166 | } |
| 153 | 167 | } |
| 154 | 168 | } |
| 155 | 169 | \ No newline at end of file | ... | ... |
src/views/fee/printOweFeeList.vue
| 1 | 1 | <template> |
| 2 | 2 | <div class="print-owe-fee-container"> |
| 3 | - <el-card> | |
| 3 | + <div> | |
| 4 | 4 | <div class="text-center"> |
| 5 | 5 | <h1>{{ printPayFeeInfo.printName }}{{ $t('printOweFee.paymentNotice') }}</h1> |
| 6 | 6 | </div> |
| ... | ... | @@ -78,7 +78,7 @@ |
| 78 | 78 | {{ $t('common.cancel') }} |
| 79 | 79 | </el-button> |
| 80 | 80 | </div> |
| 81 | - </el-card> | |
| 81 | + </div> | |
| 82 | 82 | </div> |
| 83 | 83 | </template> |
| 84 | 84 | ... | ... |
src/views/fee/roomCreateFeeList.vue
| ... | ... | @@ -73,7 +73,7 @@ |
| 73 | 73 | </el-tab-pane> |
| 74 | 74 | <el-tab-pane v-if="roomCreateFeeInfo.ownerId" :label="$t('roomCreateFee.rooms')" name="simplifyOwnerRooms"> |
| 75 | 75 | <simplify-owner-rooms v-if="roomCreateFeeInfo._currentTab === 'simplifyOwnerRooms'" |
| 76 | - ref="simplifyOwnerRooms" :key="'simplifyOwnerRooms' + roomCreateFeeInfo.roomId"></simplify-owner-rooms> | |
| 76 | + ref="simplifyOwnerRooms" :key="'simplifyOwnerRooms' + roomCreateFeeInfo.roomId" hasChange="N"></simplify-owner-rooms> | |
| 77 | 77 | </el-tab-pane> |
| 78 | 78 | <el-tab-pane v-if="roomCreateFeeInfo.ownerId" :label="$t('roomCreateFee.owner')" name="carDetailOwner"> |
| 79 | 79 | <car-detail-owner v-if="roomCreateFeeInfo._currentTab === 'carDetailOwner'" ref="carDetailOwner" |
| ... | ... | @@ -109,14 +109,14 @@ |
| 109 | 109 | ref="simplifyRefundDeposit" |
| 110 | 110 | :key="'simplifyRefundDeposit' + roomCreateFeeInfo.roomId"></simplify-refund-deposit> |
| 111 | 111 | </el-tab-pane> |
| 112 | - <el-tab-pane :label="$t('roomCreateFee.billingRules')" name="feeDetailFeeRule"> | |
| 112 | + <!-- <el-tab-pane :label="$t('roomCreateFee.billingRules')" name="feeDetailFeeRule"> | |
| 113 | 113 | <fee-detail-fee-rule v-if="roomCreateFeeInfo._currentTab === 'feeDetailFeeRule'" ref="feeDetailFeeRule" |
| 114 | 114 | :key="'feeDetailFeeRule' + roomCreateFeeInfo.roomId"></fee-detail-fee-rule> |
| 115 | 115 | </el-tab-pane> |
| 116 | 116 | <el-tab-pane :label="$t('roomCreateFee.feeBills')" name="feeDetailRuleBill"> |
| 117 | 117 | <fee-detail-rule-bill v-if="roomCreateFeeInfo._currentTab === 'feeDetailRuleBill'" ref="feeDetailRuleBill" |
| 118 | 118 | :key="'feeDetailRuleBill' + roomCreateFeeInfo.roomId"></fee-detail-rule-bill> |
| 119 | - </el-tab-pane> | |
| 119 | + </el-tab-pane> --> | |
| 120 | 120 | </el-tabs> |
| 121 | 121 | </el-card> |
| 122 | 122 | </div> |
| ... | ... | @@ -142,8 +142,8 @@ import SimplifyMeterWaterLog from '@/components/fee/simplifyMeterWaterLog' |
| 142 | 142 | import OwnerDetailAccount from '@/components/owner/ownerDetailAccount' |
| 143 | 143 | import OwnerDetailAccountReceipt from '@/components/owner/ownerDetailAccountReceipt' |
| 144 | 144 | import SimplifyRefundDeposit from '@/components/fee/simplifyRefundDeposit' |
| 145 | -import FeeDetailFeeRule from '@/components/fee/feeDetailFeeRule' | |
| 146 | -import FeeDetailRuleBill from '@/components/fee/feeDetailRuleBill' | |
| 145 | +// import FeeDetailFeeRule from '@/components/fee/feeDetailFeeRule' | |
| 146 | +// import FeeDetailRuleBill from '@/components/fee/feeDetailRuleBill' | |
| 147 | 147 | |
| 148 | 148 | import ExportFeeImportExcel from '@/components/fee/exportFeeImportExcel' |
| 149 | 149 | import DoImportCreateFee from '@/components/fee/doImportCreateFee' |
| ... | ... | @@ -167,8 +167,8 @@ export default { |
| 167 | 167 | OwnerDetailAccount, |
| 168 | 168 | OwnerDetailAccountReceipt, |
| 169 | 169 | SimplifyRefundDeposit, |
| 170 | - FeeDetailFeeRule, | |
| 171 | - FeeDetailRuleBill, | |
| 170 | + // FeeDetailFeeRule, | |
| 171 | + // FeeDetailRuleBill, | |
| 172 | 172 | |
| 173 | 173 | ExportFeeImportExcel, |
| 174 | 174 | DoImportCreateFee, | ... | ... |
src/views/org/editScheduleClassesList.vue
| ... | ... | @@ -23,15 +23,15 @@ |
| 23 | 23 | </el-select> |
| 24 | 24 | </el-form-item> |
| 25 | 25 | |
| 26 | - <div v-if="editScheduleClassesInfo.scheduleType === '1001'"> | |
| 26 | + <div v-if="editScheduleClassesInfo.scheduleType == '1001'"> | |
| 27 | 27 | <schedule-classes-day ref="dayComponent" |
| 28 | 28 | @editDay="editDay" @cycleChange="changeScheduleCycle" /> |
| 29 | 29 | </div> |
| 30 | - <div v-if="editScheduleClassesInfo.scheduleType === '2002'"> | |
| 30 | + <div v-if="editScheduleClassesInfo.scheduleType == '2002'"> | |
| 31 | 31 | <schedule-classes-week ref="weekComponent" |
| 32 | 32 | @editDay="editDay" @cycleChange="changeScheduleCycle" /> |
| 33 | 33 | </div> |
| 34 | - <div v-if="editScheduleClassesInfo.scheduleType === '3003'"> | |
| 34 | + <div v-if="editScheduleClassesInfo.scheduleType == '3003'"> | |
| 35 | 35 | <schedule-classes-month ref="monthComponent" |
| 36 | 36 | @editDay="editDay" /> |
| 37 | 37 | </div> |
| ... | ... | @@ -106,7 +106,7 @@ export default { |
| 106 | 106 | scheduleCycle: this.editScheduleClassesInfo.scheduleCycle, |
| 107 | 107 | days: this.editScheduleClassesInfo.days |
| 108 | 108 | }) |
| 109 | - }, 100) | |
| 109 | + }, 500) | |
| 110 | 110 | } |
| 111 | 111 | if (this.editScheduleClassesInfo.scheduleType === '3003') { |
| 112 | 112 | setTimeout(() => { | ... | ... |
src/views/simplify/simplifyAcceptanceList.vue
| ... | ... | @@ -215,7 +215,7 @@ |
| 215 | 215 | <simplify-his-fee ref="simplifyHisFee"></simplify-his-fee> |
| 216 | 216 | </el-tab-pane> |
| 217 | 217 | <el-tab-pane :label="$t('simplifyAcceptance.house')" name="simplifyOwnerRooms"> |
| 218 | - <simplify-owner-rooms ref="simplifyOwnerRooms"></simplify-owner-rooms> | |
| 218 | + <simplify-owner-rooms ref="simplifyOwnerRooms" @notifyRoom="notifyRoom"></simplify-owner-rooms> | |
| 219 | 219 | </el-tab-pane> |
| 220 | 220 | <el-tab-pane :label="$t('simplifyAcceptance.contract')" name="simplifyContract"> |
| 221 | 221 | <simplify-contract ref="simplifyContract"></simplify-contract> |
| ... | ... | @@ -381,6 +381,7 @@ export default { |
| 381 | 381 | this._restoreSearchData() |
| 382 | 382 | }, |
| 383 | 383 | methods: { |
| 384 | + | |
| 384 | 385 | _initMethod() { |
| 385 | 386 | if (!this.$route.query.searchValue) { |
| 386 | 387 | return |
| ... | ... | @@ -390,6 +391,7 @@ export default { |
| 390 | 391 | this.simplifyAcceptanceInfo.searchPlaceholder = 'simplifyAcceptance.houseNumberPlaceholder' |
| 391 | 392 | this._doSearch() |
| 392 | 393 | }, |
| 394 | + | |
| 393 | 395 | _changeSearchType() { |
| 394 | 396 | switch (this.simplifyAcceptanceInfo.searchType) { |
| 395 | 397 | case '1': |
| ... | ... | @@ -605,6 +607,12 @@ export default { |
| 605 | 607 | _handover() { |
| 606 | 608 | this.$router.push('/views/room/handover') |
| 607 | 609 | }, |
| 610 | + notifyRoom(room) { | |
| 611 | + this.simplifyAcceptanceInfo.searchType = '1' | |
| 612 | + this.simplifyAcceptanceInfo.searchValue = room.floorNum + '-' + room.unitNum + '-' + room.roomNum | |
| 613 | + this.simplifyAcceptanceInfo.searchPlaceholder = 'simplifyAcceptance.houseNumberPlaceholder' | |
| 614 | + this._doSearch() | |
| 615 | + }, | |
| 608 | 616 | _simplifyOwnerExitRoom() { |
| 609 | 617 | this.$router.push('/views/room/ownerExitRoom') |
| 610 | 618 | }, | ... | ... |