v1.9 优化排版英文bug

wuxw
1 parent 63ef3e7f
Showing 15 changed files with 86 additions and 119 deletions
src/components/fee/deleteOweFeeCallable.vue
src/components/fee/simplifyCallable.vue
src/components/fee/simplifyOwnerRooms.vue
src/components/fee/simplifyRoomFee.vue
src/components/fee/writeOweFeeCallable.vue
src/components/org/scheduleClassesDay.vue
src/components/org/scheduleClassesMonth.vue
src/components/org/scheduleClassesWeek.vue
src/components/room/roomTree.vue
src/components/room/roomTreeDiv.vue
src/i18n/commonLang.js
src/views/fee/printOweFeeList.vue
src/views/fee/roomCreateFeeList.vue
src/views/org/editScheduleClassesList.vue
src/views/simplify/simplifyAcceptanceList.vue
@@ -31,9 +31,6 @@ export default {
     this._initEvent()
   },
   methods: {
-    _initEvent() {
-      this.$on('openDeleteOweFeeCallableModal', this.open)
-    },
     open(params) {
       this.deleteOweFeeCallableInfo = params
       this.dialogVisible = true
@@ -2,58 +2,41 @@
   <div>
     <el-row class="margin-top">
       <el-col :span="24" class="text-right">
-        <el-button 
-          type="primary" 
-          size="small" 
-          v-if="simplifyCallableInfo.roomId"
-          @click="_openWritePrintOweFeeCallableModal"
-        >
+        <el-button type="primary" size="small" v-if="simplifyCallableInfo.roomId"
+          @click="_openWritePrintOweFeeCallableModal">
           <i class="el-icon-plus"></i>
           {{ $t('simplifyCallable.register') }}
         </el-button>
-        <el-button 
-          type="primary" 
-          size="small" 
-          v-if="simplifyCallableInfo.roomId"
-          @click="_openAddOweFeeCallableModal"
-        >
+        <el-button type="primary" size="small" v-if="simplifyCallableInfo.roomId" @click="_openAddOweFeeCallableModal">
           <i class="el-icon-plus"></i>
           {{ $t('simplifyCallable.callable') }}
         </el-button>
-        <el-button 
-          type="primary" 
-          size="small" 
-          v-if="simplifyCallableInfo.roomId"
-          @click="_printOwnOrder"
-        >
+        <el-button type="primary" size="small" v-if="simplifyCallableInfo.roomId" @click="_printOwnOrder">
           <i class="el-icon-plus"></i>
           {{ $t('simplifyCallable.callableOrder') }}
         </el-button>
       </el-col>
     </el-row>
     <div>
-      <el-table
-        :data="simplifyCallableInfo.callables"
-        style="margin-top:10px"
-        border
-        stripe
-      >
+      <el-table :data="simplifyCallableInfo.callables" style="margin-top:10px" border stripe>
         <el-table-column prop="ofcId" :label="$t('simplifyCallable.id')" align="center"></el-table-column>
         <el-table-column prop="ownerName" :label="$t('simplifyCallable.ownerName')" align="center"></el-table-column>
-        <el-table-column prop="payerObjName" :label="$t('simplifyCallable.payerObjName')" align="center"></el-table-column>
+        <el-table-column prop="payerObjName" :label="$t('simplifyCallable.payerObjName')"
+          align="center"></el-table-column>
         <el-table-column prop="feeName" :label="$t('simplifyCallable.feeName')" align="center"></el-table-column>
         <el-table-column prop="amountdOwed" :label="$t('simplifyCallable.amount')" align="center"></el-table-column>
         <el-table-column :label="$t('simplifyCallable.timePeriod')" align="center">
           <template slot-scope="scope">
-            {{scope.row.startTime}}<br>~{{scope.row.endTime}}
+            {{ scope.row.startTime }}<br>~{{ scope.row.endTime }}
           </template>
         </el-table-column>
-        <el-table-column prop="callableWayName" :label="$t('simplifyCallable.callableWay')" align="center"></el-table-column>
+        <el-table-column prop="callableWayName" :label="$t('simplifyCallable.callableWay')"
+          align="center"></el-table-column>
         <el-table-column prop="staffName" :label="$t('simplifyCallable.staffName')" align="center"></el-table-column>
         <el-table-column prop="stateName" :label="$t('simplifyCallable.status')" align="center"></el-table-column>
         <el-table-column prop="remark" :label="$t('simplifyCallable.remark')" align="center">
           <template slot-scope="scope">
-            <div class="textAuto" style="max-width: 200px;">{{scope.row.remark}}</div>
+            <div class="textAuto" style="max-width: 200px;">{{ scope.row.remark }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="createTime" :label="$t('simplifyCallable.createTime')" align="center"></el-table-column>
@@ -67,16 +50,12 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-size="pageSize"
-        layout="total, prev, pager, next"
-        :total="total">
+      <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize"
+        layout="total, prev, pager, next" :total="total">
       </el-pagination>
     </div>
-    <write-owe-fee-callable ref="writeOweFeeCallable"></write-owe-fee-callable>
-    <delete-owe-fee-callable ref="deleteOweFeeCallable"></delete-owe-fee-callable>
+    <write-owe-fee-callable ref="writeOweFeeCallable" @success="handleSuccess" ></write-owe-fee-callable>
+    <delete-owe-fee-callable ref="deleteOweFeeCallable" @success="handleSuccess"></delete-owe-fee-callable>
   </div>
 </template>
@@ -171,6 +150,9 @@ export default {
     _openDeleteOweFeeCallableModel(oweFeeCallable) {
       this.$refs.deleteOweFeeCallable.open(oweFeeCallable)
     },
+    handleSuccess() {
+      this._listSimplifyCallable(this.DEFAULT_PAGE, this.DEFAULT_ROWS)
+    },
     open(params) {
       this.handleSwitch(params)
     }
@@ -182,9 +164,11 @@ export default {
 .margin-top {
   margin-top: 15px;
 }
+
 .text-right {
   text-align: right;
 }
+
 .textAuto {
   white-space: nowrap;
   overflow: hidden;
@@ -3,7 +3,7 @@
     <el-row class="margin-top">
       <el-col :span="22" class="text-right"></el-col>
       <el-col :span="2" class="text-right">
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           style="margin-left:10px"
@@ -12,7 +12,7 @@
         >
           <i class="el-icon-plus"></i>
           <span>{{ $t('simplifyOwnerRooms.batchPay') }}</span>
-        </el-button>
+        </el-button> -->
       </el-col>
     </el-row>
     <div>
@@ -46,7 +46,7 @@
             {{scope.row.roomOweFee || '0.00'}}({{$t('simplifyOwnerRooms.updateDaily')}})
           </template>
         </el-table-column>
-        <el-table-column :label="$t('simplifyOwnerRooms.actions')" align="center">
+        <el-table-column :label="$t('simplifyOwnerRooms.actions')" align="center" v-if="hasChange == 'Y'">
           <template slot-scope="scope">
             <el-button-group v-if="simplifyOwnerRoomsInfo.roomId != scope.row.roomId">
               <el-button size="mini" @click="_toChooseOwnerRoomModel(scope.row)">
@@ -82,6 +82,12 @@ import { queryRoomsByOwner } from &#39;@/api/fee/simplifyOwnerRoomsApi&#39;
 export default {
   name: 'SimplifyOwnerRooms',
+  props:{
+    hasChange:{
+      type:String,
+      default:'Y'
+    }
+  },
   data() {
     return {
       DEFAULT_PAGE: 1,
@@ -92,7 +98,7 @@ export default {
         roomId: '',
         total: 0,
         records: 1,
-        allOweFeeAmount: 0
+        allOweFeeAmount: 0,
       },
       currentPage: 1,
       pageSize: 10,
@@ -151,7 +157,7 @@ export default {
         roomId: '',
         total: 0,
         records: 1,
-        allOweFeeAmount: 0
+        allOweFeeAmount: 0,
       }
     },
     _openSimplifyOwnerRoomsBatchPayFeeModal() {
@@ -80,7 +80,6 @@
           <template slot-scope="scope">
             <span class="hand" @click="viewRoomFeeConfig(scope.row)">
               {{ scope.row.feeName }}{{ getSimplifyRoomFeeRoomName(scope.row) }}
-              <i class="el-icon-info"></i>
             </span>
           </template>
         </el-table-column>
@@ -184,7 +183,6 @@
           <template slot-scope="scope">
             <span class="hand" @click="viewRoomFeeConfig(scope.row)">
               {{ scope.row.feeName }}{{ getSimplifyRoomFeeRoomName(scope.row) }}
-              <i class="el-icon-info"></i>
             </span>
           </template>
         </el-table-column>
@@ -49,9 +49,6 @@ export default {
     this._initEvent()
   },
   methods: {
-    _initEvent() {
-      this.$on('openWriteOweFeeCallableModal', this.open)
-    },
     open(param) {
       Object.assign(this.writeOweFeeCallableInfo, param)
       this._loadWriteOweRoomFees()
@@ -24,26 +24,12 @@
 <script>
 export default {
   name: 'ScheduleClassesDay',
-  props: {
-    initialData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
   data() {
     return {
       scheduleCycle: 1,
       days: []
     }
   },
-  created() {
-    if (this.initialData.days && this.initialData.days.length > 0) {
-      this.days = [...this.initialData.days]
-      this.scheduleCycle = this.initialData.scheduleCycle
-    } else {
-      this.changeInspectionPeriod()
-    }
-  },
   methods: {
     notify(params) {
       this.days = params.days;
@@ -60,9 +46,10 @@ export default {
       this.changeInspectionPeriod()
     },
     changeInspectionPeriod() {
-      this.days = []
+      let _days = this.days;
+      _days.splice(0, _days.length);
       for (let cycleIndex = 0; cycleIndex < this.scheduleCycle; cycleIndex++) {
-        this.days.push({
+        _days.push({
           day: cycleIndex + 1,
           workday: '2002',
           workdayName: this.$t('scheduleClassesDay.rest'),
@@ -24,26 +24,12 @@
 <script>
 export default {
   name: 'ScheduleClassesMonth',
-  props: {
-    initialData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
   data() {
     return {
       scheduleCycle: 1,
       days: []
     }
   },
-  created() {
-    if (this.initialData.days && this.initialData.days.length > 0) {
-      this.days = [...this.initialData.days]
-      this.scheduleCycle = this.initialData.scheduleCycle
-    } else {
-      this.changeInspectionPeriod()
-    }
-  },
   methods: {
     initData(scheduleCycle) {
       this.scheduleCycle = scheduleCycle
@@ -58,9 +44,10 @@ export default {
       this.changeInspectionPeriod();
     },
     changeInspectionPeriod() {
-      this.days = []
+      let _days = this.days;
+      _days.splice(0, _days.length);
       for (let cycleIndex = 0; cycleIndex < 31; cycleIndex++) {
-        this.days.push({
+        _days.push({
           day: cycleIndex + 1,
           workday: '2002',
           workdayName: this.$t('scheduleClassesMonth.rest'),
@@ -12,7 +12,7 @@
       <el-form-item :label="getWeek(week)">
         <div class="schedule-weeks-container">
           <template v-for="(item, index) in days">
-            <div v-if="item.weekFlag === week"  :key="index" class="schedule-week-item" @click="changeWorkdayWeekInfo(item)">
+            <div v-if="item.weekFlag == 1"  :key="index" class="schedule-week-item" @click="changeWorkdayWeekInfo(item)">
               <div class="day-name">{{ getWorkDay(item.day) }}</div>
               <div class="workday-name">{{ item.workdayName }}</div>
               <div v-for="(time, timeIndex) in item.times" :key="timeIndex" class="time-range">
@@ -29,45 +29,34 @@
 <script>
 export default {
   name: 'ScheduleClassesWeek',
-  props: {
-    initialData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
   data() {
     return {
       scheduleCycle: 1,
       days: []
     }
   },
-  created() {
-    if (this.initialData.days && this.initialData.days.length > 0) {
-      this.days = [...this.initialData.days]
-      this.scheduleCycle = this.initialData.scheduleCycle
-    } else {
-      this.changeInspectionPeriodWeek()
-    }
-  },
   methods: {
     initData(scheduleCycle) {
       this.scheduleCycle = scheduleCycle
       this.changeInspectionPeriodWeek()
     },
     notify(params) {
-      this.days = params.days;
       this.scheduleCycle = parseInt(params.scheduleCycle);
+      this.days = params.days
+      // 使用深拷贝确保数据是响应式的，并确保每个 item 都有 times 数组
       if (params.days && params.days.length > 0) {
         return;
       }
+
       this.changeInspectionPeriodWeek();
     },
     changeInspectionPeriodWeek() {
-      this.days = []
+      let _days = this.days;
+      _days.splice(0, _days.length);
       for (let weekIndex = 0; weekIndex < this.scheduleCycle; weekIndex++) {
         for (let cycleIndex = 0; cycleIndex < 7; cycleIndex++) {
-          this.days.push({
+          _days.push({
             weekFlag: weekIndex + 1,
             day: cycleIndex + 1,
             workday: '2002',
@@ -55,7 +55,7 @@ export default {
                         floorId: unit.floorId,
                         floorNum: unit.floorNum,
                         icon: "/img/floor.png",
-                        text: `${unit.floorNum}${this.$t('room.floorUnitTree.building')}`,
+                        text: `${unit.floorNum}`,
                         children: []
                     }
                 }
@@ -63,7 +63,7 @@ export default {
                 const unitNode = {
                     id: `u_${unit.unitId}`,
                     unitId: unit.unitId,
-                    text: `${unit.unitNum}${this.$t('room.floorUnitTree.unit')}`,
+                    text: `${unit.unitNum}`,
                     icon: "/img/unit.png",
                     children: []
                 }
@@ -68,7 +68,7 @@ export default {
             floorId: unit.floorId,
             floorNum: unit.floorNum,
             icon: "/img/floor.png",
-            text: `${unit.floorNum}${this.$t('room.floorUnitTree.building')}`,
+            text: `${unit.floorNum}`,
             children: []
           }
         }
@@ -79,7 +79,7 @@ export default {
           unitNum: unit.unitNum,
           floorId: unit.floorId, // Add floorId reference
           icon: "/img/unit.png",
-          text: `${unit.unitNum}${this.$t('room.floorUnitTree.unit')}`,
+          text: `${unit.unitNum}`,
           children: []
         })
       })
@@ -72,7 +72,14 @@ export const messages = {
         required:'Required',
         invalid:'Invalid',
         explanation:'Explanation',
-        manage:'Manage'
+        manage:'Manage',
+        monday: 'Monday',
+        tuesday: 'Tuesday',
+        wednesday: 'Wednesday',
+        thursday: 'Thursday',
+        friday: 'Friday',
+        saturday: 'Saturday',
+        sunday: 'Sunday',
       }
     },
     zh: {
@@ -148,7 +155,14 @@ export const messages = {
         required:'必填',
         invalid:'无效',
         explanation:'说明',
-        manage:'管理'
+        manage:'管理',
+        monday:'星期一',
+        tuesday:'星期二',
+        wednesday:'星期三',
+        thursday:'星期四',
+        friday:'星期五',
+        saturday:'星期六',
+        sunday:'星期日'
       }
     }
   } 
 \ No newline at end of file
 <template>
   <div class="print-owe-fee-container">
-    <el-card>
+    <div>
       <div class="text-center">
         <h1>{{ printPayFeeInfo.printName }}{{ $t('printOweFee.paymentNotice') }}</h1>
       </div>
@@ -78,7 +78,7 @@
           {{ $t('common.cancel') }}
         </el-button>
       </div>
-    </el-card>
+    </div>
   </div>
 </template>
@@ -73,7 +73,7 @@
             </el-tab-pane>
             <el-tab-pane v-if="roomCreateFeeInfo.ownerId" :label="$t('roomCreateFee.rooms')" name="simplifyOwnerRooms">
               <simplify-owner-rooms v-if="roomCreateFeeInfo._currentTab === 'simplifyOwnerRooms'"
-                ref="simplifyOwnerRooms" :key="'simplifyOwnerRooms' + roomCreateFeeInfo.roomId"></simplify-owner-rooms>
+                ref="simplifyOwnerRooms" :key="'simplifyOwnerRooms' + roomCreateFeeInfo.roomId" hasChange="N"></simplify-owner-rooms>
             </el-tab-pane>
             <el-tab-pane v-if="roomCreateFeeInfo.ownerId" :label="$t('roomCreateFee.owner')" name="carDetailOwner">
               <car-detail-owner v-if="roomCreateFeeInfo._currentTab === 'carDetailOwner'" ref="carDetailOwner"
@@ -109,14 +109,14 @@
                 ref="simplifyRefundDeposit"
                 :key="'simplifyRefundDeposit' + roomCreateFeeInfo.roomId"></simplify-refund-deposit>
             </el-tab-pane>
-            <el-tab-pane :label="$t('roomCreateFee.billingRules')" name="feeDetailFeeRule">
+            <!-- <el-tab-pane :label="$t('roomCreateFee.billingRules')" name="feeDetailFeeRule">
               <fee-detail-fee-rule v-if="roomCreateFeeInfo._currentTab === 'feeDetailFeeRule'" ref="feeDetailFeeRule"
                 :key="'feeDetailFeeRule' + roomCreateFeeInfo.roomId"></fee-detail-fee-rule>
             </el-tab-pane>
             <el-tab-pane :label="$t('roomCreateFee.feeBills')" name="feeDetailRuleBill">
               <fee-detail-rule-bill v-if="roomCreateFeeInfo._currentTab === 'feeDetailRuleBill'" ref="feeDetailRuleBill"
                 :key="'feeDetailRuleBill' + roomCreateFeeInfo.roomId"></fee-detail-rule-bill>
-            </el-tab-pane>
+            </el-tab-pane> -->
           </el-tabs>
         </el-card>
       </div>
@@ -142,8 +142,8 @@ import SimplifyMeterWaterLog from &#39;@/components/fee/simplifyMeterWaterLog&#39;
 import OwnerDetailAccount from '@/components/owner/ownerDetailAccount'
 import OwnerDetailAccountReceipt from '@/components/owner/ownerDetailAccountReceipt'
 import SimplifyRefundDeposit from '@/components/fee/simplifyRefundDeposit'
-import FeeDetailFeeRule from '@/components/fee/feeDetailFeeRule'
-import FeeDetailRuleBill from '@/components/fee/feeDetailRuleBill'
+// import FeeDetailFeeRule from '@/components/fee/feeDetailFeeRule'
+// import FeeDetailRuleBill from '@/components/fee/feeDetailRuleBill'
 import ExportFeeImportExcel from '@/components/fee/exportFeeImportExcel'
 import DoImportCreateFee from '@/components/fee/doImportCreateFee'
@@ -167,8 +167,8 @@ export default {
     OwnerDetailAccount,
     OwnerDetailAccountReceipt,
     SimplifyRefundDeposit,
-    FeeDetailFeeRule,
-    FeeDetailRuleBill,
+    // FeeDetailFeeRule,
+    // FeeDetailRuleBill,
     ExportFeeImportExcel,
     DoImportCreateFee,
@@ -23,15 +23,15 @@
                 </el-select>
               </el-form-item>
-              <div v-if="editScheduleClassesInfo.scheduleType === '1001'">
+              <div v-if="editScheduleClassesInfo.scheduleType == '1001'">
                 <schedule-classes-day ref="dayComponent" 
                    @editDay="editDay" @cycleChange="changeScheduleCycle" />
               </div>
-              <div v-if="editScheduleClassesInfo.scheduleType === '2002'">
+              <div v-if="editScheduleClassesInfo.scheduleType == '2002'">
                 <schedule-classes-week ref="weekComponent" 
                    @editDay="editDay" @cycleChange="changeScheduleCycle" />
               </div>
-              <div v-if="editScheduleClassesInfo.scheduleType === '3003'">
+              <div v-if="editScheduleClassesInfo.scheduleType == '3003'">
                 <schedule-classes-month ref="monthComponent"
                    @editDay="editDay" />
               </div>
@@ -106,7 +106,7 @@ export default {
           scheduleCycle: this.editScheduleClassesInfo.scheduleCycle,
             days: this.editScheduleClassesInfo.days
           })
-        }, 100)
+        }, 500)
       }
       if (this.editScheduleClassesInfo.scheduleType === '3003') {
         setTimeout(() => {
@@ -215,7 +215,7 @@
             <simplify-his-fee ref="simplifyHisFee"></simplify-his-fee>
           </el-tab-pane>
           <el-tab-pane :label="$t('simplifyAcceptance.house')" name="simplifyOwnerRooms">
-            <simplify-owner-rooms ref="simplifyOwnerRooms"></simplify-owner-rooms>
+            <simplify-owner-rooms ref="simplifyOwnerRooms" @notifyRoom="notifyRoom"></simplify-owner-rooms>
           </el-tab-pane>
           <el-tab-pane :label="$t('simplifyAcceptance.contract')" name="simplifyContract">
             <simplify-contract ref="simplifyContract"></simplify-contract>
@@ -381,6 +381,7 @@ export default {
     this._restoreSearchData()
   },
   methods: {
+    
     _initMethod() {
       if (!this.$route.query.searchValue) {
         return
@@ -390,6 +391,7 @@ export default {
       this.simplifyAcceptanceInfo.searchPlaceholder = 'simplifyAcceptance.houseNumberPlaceholder'
       this._doSearch()
     },
+
     _changeSearchType() {
       switch (this.simplifyAcceptanceInfo.searchType) {
         case '1':
@@ -605,6 +607,12 @@ export default {
     _handover() {
       this.$router.push('/views/room/handover')
     },
+    notifyRoom(room) {
+      this.simplifyAcceptanceInfo.searchType = '1'
+      this.simplifyAcceptanceInfo.searchValue = room.floorNum + '-' + room.unitNum + '-' + room.roomNum 
+      this.simplifyAcceptanceInfo.searchPlaceholder = 'simplifyAcceptance.houseNumberPlaceholder'
+      this._doSearch()
+    },
     _simplifyOwnerExitRoom() {
       this.$router.push('/views/room/ownerExitRoom')
     },