费用功能继续完善

src/components/fee/editFee.vue

@@ -1,59 +1,30 @@
 <template>
-  <el-dialog
+  <el-dialog :title="$t('editFee.title')" :visible.sync="visible" width="40%" :before-close="handleClose">
-    :title="$t('editFee.title')"
-    :visible.sync="visible"
-    width="50%"
-    :before-close="handleClose"
-  >
     <el-form :model="editFeeInfo" label-width="120px">
       <el-form-item :label="$t('editFee.startTime')" prop="startTime">
-        <el-date-picker
+        <el-date-picker v-model="editFeeInfo.startTime" type="datetime"
-          v-model="editFeeInfo.startTime"
+          :placeholder="$t('editFee.startTimePlaceholder')" value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetime"
+          @change="validateStartTime"></el-date-picker>
-          :placeholder="$t('editFee.startTimePlaceholder')"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          @change="validateStartTime"
-        ></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('editFee.endTime')" prop="endTime">
-        <el-date-picker
+        <el-date-picker v-model="editFeeInfo.endTime" type="date" :placeholder="$t('editFee.endTimePlaceholder')"
-          v-model="editFeeInfo.endTime"
+          value-format="yyyy-MM-dd" @change="validateEndTime"></el-date-picker>
-          type="date"
-          :placeholder="$t('editFee.endTimePlaceholder')"
-          value-format="yyyy-MM-dd"
-          @change="validateEndTime"
-        ></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('editFee.maxEndTime')" prop="maxEndTime">
-        <el-date-picker
+        <el-date-picker v-model="editFeeInfo.maxEndTime" type="date" :placeholder="$t('editFee.maxEndTimePlaceholder')"
-          v-model="editFeeInfo.maxEndTime"
+          value-format="yyyy-MM-dd" @change="validateMaxEndTime"></el-date-picker>
-          type="date"
-          :placeholder="$t('editFee.maxEndTimePlaceholder')"
-          value-format="yyyy-MM-dd"
-          @change="validateMaxEndTime"
-        ></el-date-picker>
       </el-form-item>
       <template v-if="editFeeInfo.computingFormula === '1102'">
         <el-form-item :label="$t('editFee.rateCycle')" prop="rateCycle">
-          <el-input
+          <el-input v-model="editFeeInfo.rateCycle" :placeholder="$t('editFee.rateCyclePlaceholder')"></el-input>
-            v-model="editFeeInfo.rateCycle"
-            :placeholder="$t('editFee.rateCyclePlaceholder')"
-          ></el-input>
         </el-form-item>
         <el-form-item :label="$t('editFee.rate')" prop="rate">
-          <el-input
+          <el-input v-model="editFeeInfo.rate" :placeholder="$t('editFee.ratePlaceholder')"></el-input>
-            v-model="editFeeInfo.rate"
-            :placeholder="$t('editFee.ratePlaceholder')"
-          ></el-input>
         </el-form-item>
         <el-form-item :label="$t('editFee.rateStartTime')" prop="rateStartTime">
-          <el-date-picker
+          <el-date-picker v-model="editFeeInfo.rateStartTime" type="date"
-            v-model="editFeeInfo.rateStartTime"
+            :placeholder="$t('editFee.rateStartTimePlaceholder')" value-format="yyyy-MM-dd"
-            type="date"
+            @change="validateRateStartTime"></el-date-picker>
-            :placeholder="$t('editFee.rateStartTimePlaceholder')"
-            value-format="yyyy-MM-dd"
-            @change="validateRateStartTime"
-          ></el-date-picker>
         </el-form-item>
       </template>
     </el-form>
@@ -183,3 +154,16 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.el-form-item{
+  width: 90%;
+  text-align: left;
+}
+.el-select{
+  width: 100%;
+}
+.el-date-editor{  
+  width: 100%;
+}
+</style>

src/components/fee/feeDetailOwner.vue

@@ -23,51 +23,37 @@
         <el-table-column prop="address" :label="$t('feeDetailOwner.address')" align="center"></el-table-column>
         <el-table-column prop="roomCount" :label="$t('feeDetailOwner.roomCount')" align="center">
           <template #default="{ row }">
-            <el-link type="primary" @click="_viewOwnerRooms(row)">
               {{ row.roomCount || 0 }}
-            </el-link>
           </template>
         </el-table-column>
         <el-table-column prop="memberCount" :label="$t('feeDetailOwner.memberCount')" align="center">
           <template #default="{ row }">
-            <el-link type="primary" @click="_viewOwnerMembers(row)">
               {{ row.memberCount || 0 }}
-            </el-link>
           </template>
         </el-table-column>
         <el-table-column prop="carCount" :label="$t('feeDetailOwner.carCount')" align="center">
           <template #default="{ row }">
-            <el-link type="primary" @click="_viewOwnerCars(row)">
               {{ row.carCount || 0 }}
-            </el-link>
           </template>
         </el-table-column>
         <el-table-column prop="complaintCount" :label="$t('feeDetailOwner.complaintCount')" align="center">
           <template #default="{ row }">
-            <el-link type="primary" @click="_viewComplaints(row)">
               {{ row.complaintCount || 0 }}
-            </el-link>
           </template>
         </el-table-column>
         <el-table-column prop="repairCount" :label="$t('feeDetailOwner.repairCount')" align="center">
           <template #default="{ row }">
-            <el-link type="primary" @click="_viewRepairs(row)">
               {{ row.repairCount || 0 }}
-            </el-link>
           </template>
         </el-table-column>
         <el-table-column prop="oweFee" :label="$t('feeDetailOwner.oweFee')" align="center">
           <template #default="{ row }">
-            <el-link type="primary" @click="_viewOweFees(row)">
               {{ row.oweFee || '0.00' }}
-            </el-link>
           </template>
         </el-table-column>
         <el-table-column prop="contractCount" :label="$t('feeDetailOwner.contractCount')" align="center">
           <template #default="{ row }">
-            <el-link type="primary" @click="_viewRoomContracts(row)">
               {{ row.contractCount || 0 }}
-            </el-link>
           </template>
         </el-table-column>
       </el-table>

src/components/fee/simplifyRoomFee.vue

@@ -265,7 +265,7 @@
     <room-create-fee-add ref="roomCreateFeeAdd" @success="handleNotify"></room-create-fee-add>
     <add-meter-water ref="addMeterWater" @success="handleNotify"></add-meter-water>
     <add-proxy-fee ref="addProxyFee" @success="handleNotify"></add-proxy-fee>
-    
+    <finish-fee ref="finishFee" @success="handleNotify"></finish-fee>
   </div>
 </template>
 
@@ -281,6 +281,7 @@ import EditFee from '@/components/fee/editFee'
 import RoomCreateFeeAdd from '@/components/fee/roomCreateFeeAdd'
 import AddMeterWater from '@/components/fee/addMeterWater'
 import AddProxyFee from '@/components/fee/addProxyFee'
+import FinishFee from '@/components/fee/finishFee'
 
 export default {
   name: 'SimplifyRoomFee',
@@ -291,6 +292,7 @@ export default {
     RoomCreateFeeAdd,
     AddMeterWater,
     AddProxyFee,
+    FinishFee
   },
   data() {
     return {
@@ -459,13 +461,13 @@ export default {
       })
     },
     deleteFee(fee) {
-      this.$emit('openDeleteFeeModal', {
+      this.$refs.deleteFee.open({
         communityId: getCommunityId(),
         feeId: fee.feeId
       })
     },
     finishFee(fee) {  
-      this.$emit('openFinishFeeModal', {
+      this.$refs.finishFee.open({
         communityId: getCommunityId(),
         feeId: fee.feeId
       })

src/components/room/roomTreeDiv.vue

@@ -117,7 +117,7 @@ export default {
             roomName: `${room.floorNum}-${room.unitNum}-${room.roomNum}`,
             icon: "/img/room.png",
             text: room.ownerName
-              ? `${room.roomNum}${room.ownerName})`
+              ? `${room.roomNum}(${room.ownerName})`
               : `${room.roomNum}`
           }))