Lianxun_Vue.git

			@@ -1,9 +1,15 @@
			<div>
			<div class="row">
			<div class="col-md-2 " style="padding-right:0px;height: 95%; overflow-x: hidden; overflow-y: scroll;">
			<!-- 修改：使用 flex 布局，与电话费抄表页面保持一致 -->
			<!-- 原因：解决房屋树被表格覆盖的问题 -->
			<div class="flex justify-start">
			<!-- 修改：改回使用 property/roomTreeDiv 组件，与电话费抄表页面保持一致 -->
			<!-- 原因：确保房屋树能显示房间层级，支持房间选择 -->
			<div style="padding-right:0px;width: 250px; height: 95%; overflow-x: hidden; overflow-y: scroll;" class="room-floor-unit-tree">
			<vc:create path="property/roomTreeDiv" callBackListener="meterWaterManage"></vc:create>
			</div>
			<div class="col-md-10 margin-top-xs padding-l-0">
			<!-- 修改：调整右侧内容区域样式，使用 flex-grow: 1 自动填充剩余空间 -->
			<!-- 原因：适配 flex 布局，确保右侧内容不会被房屋树挤掉 -->
			<div class="margin-top-xs margin-left-sm" style="flex-grow: 1;">
			<div class="ibox ">
			<div class="ibox-title">
			<h5>
			@@ -14,16 +20,24 @@
			<div class="ibox-content">
			<div class="row">
			<div class="col-sm-2">
			<select class="custom-select" v-model="meterWaterManageInfo.conditions.meterType">
			<option selected value="">{{vc.i18n('请选择表类型','meterWaterManage')}}</option>
			<option v-for="(item,index) in meterWaterManageInfo.meterTypes" :key="index"
			v-bind:value="item.typeId">{{item.typeName}}
			</option>
			</select>
			</div>
			<!-- <div class="col-sm-2">
			<select class="custom-select" v-model="meterWaterManageInfo.conditions.meterType">
			<option selected value="">{{vc.i18n('请选择表类型','meterWaterManage')}}</option>
			<option v-for="(item,index) in meterWaterManageInfo.meterTypes" :key="index"
			v-bind:value="item.typeId">{{item.typeName}}
			</option>
			</select>
			</div>
			</div> -->
			<div class="col-sm-2">
			<div class="form-group">
			<input type="text" :placeholder="vc.i18n('请输入表ID','meterWaterManage')"
			<input type="text" :placeholder="vc.i18n('请输入表ID','meterWaterManage')"
			v-model="meterWaterManageInfo.conditions.waterId" class=" form-control">
			</div>
			</div>
			@@ -36,17 +50,19 @@
			</button>
			</div>
			</div>


			</div>
			</div>


			<div class="ibox">
			<div class="ibox-title">
			<h5>
			<vc:i18n name="抄表信息" namespace="meterWaterManage"></vc:i18n>
			</h5>
			<div class="ibox-tools" style="top:10px;">

			</div>
			<div class="ibox-content" style="overflow: visible;">
			<!-- 按钮区域 -->
			<div style="display: flex; gap: 8px; align-items: center; margin-bottom: 15px; flex-wrap: wrap;">
			<button type="button" class="btn btn-primary btn-sm" v-if="meterWaterManageInfo.conditions.objId" @click="_openAddMeterWaterModal()">
			<vc:i18n name="抄表" namespace="meterWaterManage"></vc:i18n>
			</button>
			@@ -57,81 +73,264 @@
			<!-- <button type="button" class="btn btn-white btn-sm" v-if="meterWaterManageInfo.conditions.objId" @click="_openMeterQrCode()">
			<vc:i18n name="二维码抄表" namespace="meterWaterManage"></vc:i18n>
			</button> -->
			<button type="button" class="btn btn-white btn-sm" style="margin-left:10px"
			<button type="button" class="btn btn-white btn-sm"
			@click="_openMeterWaterImport(null,true)">
			<i class="fa fa-plus"></i>抄表导入
			</button>
			<!-- 注释掉抄表导入2按钮 -->
			<!-- <button type="button" class="btn btn-white btn-sm" style="margin-left:10px"
			<!-- <button type="button" class="btn btn-white btn-sm"
			@click="_openMeterWaterImport2(null,true)">
			<i class="fa fa-plus"></i>抄表导入2
			</button> -->
			</div>
			<!-- 表格区域 -->
			<div class="hc-table-div" :style="{'width':_computeTableDivWidth()}" style="overflow-x: auto; margin-bottom: 15px;">
			<table class="table table-stripped" data-page-size="15">
			<thead>
			<tr style="white-space: nowrap;">
			<!-- 左侧列 -->
			<th class="text-center">
			<vc:i18n name="表ID" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="表类型" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="对象名称" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			用电类别/用水性质
			</th>
			<th class="text-center">
			路
			</th>
			<th class="text-center">
			客户名称
			</th>
			<th class="text-center">
			弄
			</th>
			<th class="text-center">
			门
			</th>
			<th class="text-center">
			室
			</th>
			<th class="text-center">
			户名
			</th>
			<th class="text-center">
			户号
			</th>
			<th class="text-center">
			地址
			</th>
			<th class="text-center">
			账号
			</th>
			<th class="text-center">
			电能表编号
			</th>
			<th class="text-center">
			供电局
			</th>
			<th class="text-center">
			倍率
			</th>
			<th class="text-center">
			单价
			</th>
			<th class="text-center">
			价格
			</th>
			<th class="text-center">
			开票金额
			</th>
			<th class="text-center">
			应付总额
			</th>
			<th class="text-center">
			差额
			</th>
			<th class="text-center">
			欠费未缴
			</th>
			<th class="text-center">
			结转余额
			</th>
			<th class="text-center">
			滞纳金
			</th>
			<th class="text-center">
			滞纳附加费
			</th>
			<th class="text-center">
			自动扣款
			</th>
			<th class="text-center">
			是否过户
			</th>
			<th class="text-center">
			过户后公司名称
			</th>
			<th class="text-center">
			申请公司名称
			</th>
			<th class="text-center">
			申请部门/项目
			</th>
			<th class="text-center">
			收费标准
			</th>
			<th class="text-center">
			对应户数
			</th>
			<th class="text-center">
			费用ID
			</th>
			<th class="text-center">
			缴费状态
			</th>
			<th class="text-center">
			经办人
			</th>
			<th class="text-center">
			最后缴费日期
			</th>
			<th class="text-center">
			抄表本号
			</th>
			<th class="text-center">
			抄表类型
			</th>
			<th class="text-center">
			用水量
			</th>
			<th class="text-center">
			污水处理水量
			</th>
			<th class="text-center">
			水费缴纳方
			</th>
			<th class="text-center">
			备注
			</th>
			<th class="text-center">
			备注2
			</th>
			<th class="text-center">
			状态码
			</th>
			<th class="text-center">
			录入人
			</th>
			<th class="text-center">
			录入时间
			</th>
			<th class="text-center">
			<vc:i18n name="上期度数" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="本期度数" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="上期读表时间" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="本期读表时间" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="创建时间" namespace="meterWaterManage"></vc:i18n>
			</th>
			<!-- 操作列 -->
			<th class="text-center" style="position: sticky; right: 0; background-color: #fff; z-index: 10;">
			<vc:i18n name="操作" namespace="meterWaterManage"></vc:i18n>
			</th>
			</tr>
			</thead>
			<tbody>
			<tr v-for="meterWater in meterWaterManageInfo.meterWaters" style="white-space: nowrap;">
			<!-- 左侧列 -->
			<td class="text-center">{{meterWater.waterId \|\| '-'}}</td>
			<td class="text-center">{{meterWater.meterTypeName \|\| '-'}}</td>
			<td class="text-center">{{meterWater.objName \|\| '-'}}</td>
			<td class="text-center">{{meterWater.meterType \|\| '-'}}</td>
			<td class="text-center">{{meterWater.roadName \|\| '-'}}</td>
			<td class="text-center">{{meterWater.householdName \|\| '-'}}</td>
			<td class="text-center">{{meterWater.floorNum \|\| '-'}}</td>
			<td class="text-center">{{meterWater.doorNum \|\| '-'}}</td>
			<td class="text-center">{{meterWater.roomNum \|\| '-'}}</td>
			<td class="text-center">{{meterWater.householdName \|\| '-'}}</td>
			<td class="text-center">{{meterWater.householdNumber \|\| '-'}}</td>
			<td class="text-center">{{meterWater.address \|\| '-'}}</td>
			<td class="text-center">{{meterWater.accountNumber \|\| '-'}}</td>
			<td class="text-center">{{meterWater.electricMeterId \|\| '-'}}</td>
			<td class="text-center">{{meterWater.powerSupplyBureau \|\| '-'}}</td>
			<td class="text-center">{{meterWater.multiplyingFactor \|\| '-'}}</td>
			<td class="text-center">{{meterWater.unitPrice \|\| '-'}}</td>
			<td class="text-center">{{meterWater.price \|\| '-'}}</td>
			<td class="text-center">{{meterWater.invoiceAmount \|\| '-'}}</td>
			<td class="text-center">{{meterWater.totalPayableAmount \|\| '-'}}</td>
			<td class="text-center">{{meterWater.amountDifference \|\| '-'}}</td>
			<td class="text-center">{{meterWater.arrearsUnpaid \|\| '-'}}</td>
			<td class="text-center">{{meterWater.carryOverBalance \|\| '-'}}</td>
			<td class="text-center">{{meterWater.latePaymentFine \|\| '-'}}</td>
			<td class="text-center">{{meterWater.latePaymentSurcharge \|\| '-'}}</td>
			<td class="text-center">{{meterWater.autoDeduction \|\| '-'}}</td>
			<td class="text-center">{{meterWater.isTransferred \|\| '-'}}</td>
			<td class="text-center">{{meterWater.companyNameAfterTransfer \|\| '-'}}</td>
			<td class="text-center">{{meterWater.checkApplyCompanyName \|\| '-'}}</td>
			<td class="text-center">{{meterWater.checkApplyDeptProject \|\| '-'}}</td>
			<td class="text-center">{{meterWater.collectionStandard \|\| '-'}}</td>
			<td class="text-center">{{meterWater.correspondingHouseholdCount \|\| '-'}}</td>
			<td class="text-center">{{meterWater.feeId \|\| '-'}}</td>
			<td class="text-center">{{meterWater.feePaymentStatus \|\| '-'}}</td>
			<td class="text-center">{{meterWater.handler \|\| '-'}}</td>
			<td class="text-center">{{meterWater.lastPaymentDate \|\| '-'}}</td>
			<td class="text-center">{{meterWater.meterReadBookNo \|\| '-'}}</td>
			<td class="text-center">{{meterWater.readingType \|\| '-'}}</td>
			<td class="text-center">{{meterWater.waterConsumption \|\| '-'}}</td>
			<td class="text-center">{{meterWater.sewageTreatmentWater \|\| '-'}}</td>
			<td class="text-center">{{meterWater.waterFeePayer \|\| '-'}}</td>
			<td class="text-center">{{meterWater.remark \|\| '-'}}</td>
			<td class="text-center">{{meterWater.remark2 \|\| '-'}}</td>
			<td class="text-center">{{meterWater.statusCd \|\| '-'}}</td>
			<td class="text-center">{{meterWater.writer \|\| '-'}}</td>
			<td class="text-center">{{meterWater.writeTime \|\| '-'}}</td>
			<td class="text-center">{{meterWater.preDegrees \|\| '-'}}</td>
			<td class="text-center">{{meterWater.curDegrees \|\| '-'}}</td>
			<td class="text-center">{{meterWater.preReadingTime \|\| '-'}}</td>
			<td class="text-center">{{meterWater.curReadingTime \|\| '-'}}</td>
			<td class="text-center">{{meterWater.createTime \|\| '-'}}</td>
			<!-- 操作列 -->
			<td class="text-center" style="position: sticky; right: 0; background-color: #fff; z-index: 10;">
			<div class="btn-group" style="margin-bottom: 5px;">
			<button class="btn-white btn btn-xs"
			@click="_openEditMeterWaterModel(meterWater)">
			<vc:i18n name="修改" namespace="meterWaterManage"></vc:i18n>
			</button>
			</div>
			<div class="btn-group">
			<button class="btn-white btn btn-xs"
			@click="_openDeleteMeterWaterModel(meterWater)">
			<vc:i18n name="删除" namespace="meterWaterManage"></vc:i18n>
			</button>
			</div>
			</td>
			</tr>
			</tbody>
			</table>
			</div>
			<!-- 分页区域 -->
			<div class="row margin-top-xs" style="padding-top: 20px; clear: both; margin-bottom: 20px;">
			<div class="col-sm-12">
			<div style="display: flex; justify-content: center; align-items: center; margin-top: 10px; width: 100%;">
			<vc:create path="frame/pagination"></vc:create>
			</div>
			</div>
			</div>
			</div>
			<div class="ibox-content">
			<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
			<thead>
			<tr>
			<th class="text-center">
			<vc:i18n name="表ID" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="表类型" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="对象名称" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="上期度数" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="本期度数" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="上期读表时间" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="本期读表时间" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="创建时间" namespace="meterWaterManage"></vc:i18n>
			</th>
			<th class="text-center">
			<vc:i18n name="操作" namespace="meterWaterManage"></vc:i18n>
			</th>
			</tr>
			</thead>
			<tbody>
			<tr v-for="meterWater in meterWaterManageInfo.meterWaters">
			<td class="text-center">{{meterWater.waterId}}</td>
			<td class="text-center">{{meterWater.meterTypeName}}</td>
			<td class="text-center">{{meterWater.objName}}</td>
			<td class="text-center">{{meterWater.preDegrees}}</td>
			<td class="text-center">{{meterWater.curDegrees}}</td>
			<td class="text-center">{{meterWater.preReadingTime}}</td>
			<td class="text-center">{{meterWater.curReadingTime}}</td>
			<td class="text-center">{{meterWater.createTime}}</td>
			<td class="text-center">
			<div class="btn-group">
			<button class="btn-white btn btn-xs"
			@click="_openEditMeterWaterModel(meterWater)">
			<vc:i18n name="修改" namespace="meterWaterManage"></vc:i18n>
			</button>
			</div>
			<div class="btn-group">
			<button class="btn-white btn btn-xs"
			@click="_openDeleteMeterWaterModel(meterWater)">
			<vc:i18n name="删除" namespace="meterWaterManage"></vc:i18n>
			</button>
			</div>
			</td>
			</tr>
			</tbody>
			</table>
			<!-- 分页 -->
			<vc:create path="frame/pagination"></vc:create>
			</div>


			</div>
			</div>
			</div>
			@@ -139,7 +338,6 @@
			<vc:create path="property/editMeterWater"></vc:create>
			<vc:create path="property/deleteMeterWater"></vc:create>
			<vc:create path="property/importMeterWaterFee"></vc:create>
			<vc:create path="property/importMeterWaterFee2"></vc:create>
			<vc:create path="room/roomMeterQrcode"></vc:create>

			</div>

			</div>