水电抄表测试完成

wuxw
1 parent 963f5a4f
Showing 11 changed files with 111 additions and 238 deletions
src/api/fee/meterWaterManageApi.js
src/api/system/systemInfoManageApi.js
src/components/fee/addMeterWater.vue
src/components/fee/contractCreateFeeAdd.vue
src/components/fee/importMeterWaterFee.vue
src/components/fee/importMeterWaterFee2.vue
src/components/fee/roomMeterQrcode.vue
src/views/fee/contractCreateFeeList.vue
src/views/fee/listCarFeeList.vue
src/views/fee/meterTypeManageList.vue
src/views/fee/meterWaterManageList.vue
@@ -206,7 +206,7 @@ export function importMeterWaterData(data) {
   return new Promise((resolve, reject) => {
     data.append('communityId', getCommunityId())
     request({
-      url: '/assetImport/importData',
+      url: '/callComponent/upload/assetImport/importData',
       method: 'post',
       data,
       headers: {
@@ -38,4 +38,13 @@ export function updateSystemInfo(data) {
       reject(error)
     })
   })
+}
+
+export function getPropertyUrl() {
+  let systemInfo = localStorage.getItem('java110SystemInfo')
+  if (systemInfo) {
+    systemInfo = JSON.parse(systemInfo)
+    return systemInfo.propertyUrl
+  }
+  return ''
 }
 \ No newline at end of file
@@ -210,8 +210,8 @@ export default {
       try {
         const data = await getDict('pay_fee_config', 'fee_type_cd')
         this.feeTypeOptions = data.map(item => ({
-          value: item.name,
-          label: item.label
+          value: item.statusCd,
+          label: item.name
         }))
       } catch (error) {
         console.error('Failed to load fee types:', error)
@@ -229,13 +229,12 @@ export default {
         console.error('Failed to load meter types:', error)
       }
     },
-    async handleFeeTypeChange(feeTypeCd) {
+    async handleFeeTypeChange() {
       try {
         const { data } = await listFeeConfigs({
           communityId: this.form.communityId,
-          feeTypeCd,
+          feeTypeCd: this.form.feeTypeCd,
           isDefault: 'F',
-          valid: '1',
           page: 1,
           row: 20
         })
@@ -330,14 +329,17 @@ export default {
   color: #999;
   margin-top: 5px;
 }
-.el-form-item{
+
+.el-form-item {
   width: 90%;
   text-align: left;
 }
-.el-select{
+
+.el-select {
   width: 100%;
 }
-.el-date-editor{  
+
+.el-date-editor {
   width: 100%;
 }
 </style>
 \ No newline at end of file
 <template>
   <el-dialog :title="$t('contractCreateFeeAdd.title')" :visible.sync="visible" width="800px" @close="handleClose">
-    <el-form ref="form" :model="formData" :rules="rules" label-width="120px" label-position="right">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px" label-position="right" class="text-left">
       <el-form-item :label="$t('contractCreateFeeAdd.feeTypeCd')" prop="feeTypeCd">
         <el-select v-model="formData.feeTypeCd" :placeholder="$t('contractCreateFeeAdd.selectFeeType')"
           style="width: 100%" @change="handleFeeTypeChange">
@@ -45,14 +45,14 @@
       </el-form-item>
  
       <el-form-item :label="$t('contractCreateFeeAdd.endTime')" prop="endTime" :rules="formData.feeFlag === '2006012'
-          ? [
-            {
-              required: true,
-              message: $t('contractCreateFeeAdd.endTimeRequired'),
-              trigger: 'blur'
-            }
-          ]
-          : []
+        ? [
+          {
+            required: true,
+            message: $t('contractCreateFeeAdd.endTimeRequired'),
+            trigger: 'blur'
+          }
+        ]
+        : []
         ">
         <el-date-picker v-model="formData.endTime" type="datetime"
           :placeholder="$t('contractCreateFeeAdd.selectEndTime')" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%"
@@ -72,8 +72,8 @@
 </template>
  
 <script>
-import { saveContractCreateFee,listFeeConfigs } from '@/api/fee/contractCreateFeeApi'
-import { getCommunityId,getDict } from '@/api/community/communityApi'
+import { saveContractCreateFee, listFeeConfigs } from '@/api/fee/contractCreateFeeApi'
+import { getCommunityId, getDict } from '@/api/community/communityApi'
  
 export default {
   name: 'ContractCreateFeeAdd',
 <template>
-  <el-dialog
-    :title="$t('meterWater.meterReadingImport')"
-    :visible.sync="dialogVisible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="form"
-      :rules="rules"
-      label-width="120px"
-      label-position="right"
-    >
+  <el-dialog :title="$t('meterWater.meterReadingImport')" :visible.sync="dialogVisible" width="40%"
+    @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right" class="text-left">
       <el-form-item :label="$t('meterWater.feeType')" prop="feeTypeCd">
-        <el-select
-          v-model="form.feeTypeCd"
-          :placeholder="$t('meterWater.selectFeeType')"
-          style="width: 100%"
-          @change="handleFeeTypeChange"
-        >
-          <el-option
-            v-for="item in feeTypeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="form.feeTypeCd" :placeholder="$t('meterWater.selectFeeType')" style="width: 100%"
+          @change="handleFeeTypeChange">
+          <el-option v-for="item in feeTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
  
       <el-form-item :label="$t('meterWater.feeItem')" prop="configId">
-        <el-select
-          v-model="form.configId"
-          :placeholder="$t('meterWater.selectFeeItem')"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in feeConfigs"
-            :key="item.configId"
-            :label="item.feeName"
-            :value="item.configId"
-          />
+        <el-select v-model="form.configId" :placeholder="$t('meterWater.selectFeeItem')" style="width: 100%">
+          <el-option v-for="item in feeConfigs" :key="item.configId" :label="item.feeName" :value="item.configId" />
         </el-select>
       </el-form-item>
  
       <el-form-item :label="$t('meterWater.meterType')" prop="meterType">
-        <el-select
-          v-model="form.meterType"
-          :placeholder="$t('meterWater.selectMeterType')"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in meterTypes"
-            :key="item.typeId"
-            :label="item.typeName"
-            :value="item.typeId"
-          />
+        <el-select v-model="form.meterType" :placeholder="$t('meterWater.selectMeterType')" style="width: 100%">
+          <el-option v-for="item in meterTypes" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
         </el-select>
       </el-form-item>
  
       <el-form-item :label="$t('meterWater.selectFile')" prop="file">
-        <el-upload
-          ref="upload"
-          :auto-upload="false"
-          :limit="1"
-          :on-change="handleFileChange"
-          :file-list="fileList"
-          accept=".xls,.xlsx"
-        >
+        <el-upload ref="upload" :auto-upload="false" :limit="1" :on-change="handleFileChange" :file-list="fileList"
+          accept=".xls,.xlsx" action="">
           <el-button size="small" type="primary">{{ $t('meterWater.selectFile') }}</el-button>
           <div slot="tip" class="el-upload__tip">
             {{ fileList.length > 0 ? fileList[0].name : $t('meterWater.fileRequired') }}
@@ -195,9 +152,14 @@ export default {
       try {
         await exportMeterWaterTemplate({
           communityId: this.form.communityId,
-          meterType: this.form.meterType
+          meterType: this.form.meterType,
+          pagePath:'exportMeterWater'
         })
+        
         this.$message.success(this.$t('meterWater.downloadStarted'))
+        this.dialogVisible = false
+        this.$router.push('/pages/property/downloadTempFile?tab=下载中心')
+
       } catch (error) {
         console.error('Failed to download template:', error)
         this.$message.error(error.message || this.$t('common.downloadFailed'))
@@ -221,13 +183,16 @@ export default {
         formData.append('importAdapt', 'importMeterWaterFee')
  
         try {
-          const { data } = await importMeterWaterData(formData)
+          const res = await importMeterWaterData(formData)
+          if(!res.code){
+            this.$message.error(res)
+            return ;
+          }
           this.$message.success(this.$t('meterWater.importSuccess'))
           this.dialogVisible = false
-          this.$emit('success', data.logId)
+          this.$emit('success', res.logId)
         } catch (error) {
-          console.error('Failed to import meter water data:', error)
-          this.$message.error(error.message || this.$t('common.importFailed'))
+          this.$message.error(error.response.data|| this.$t('common.importFailed'))
         }
       })
     }
 <template>
-  <el-dialog
-    :title="$t('meterWater.meterReadingImport2')"
-    :visible.sync="dialogVisible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="form"
-      :rules="rules"
-      label-width="120px"
-      label-position="right"
-    >
+  <el-dialog :title="$t('meterWater.meterReadingImport2')" :visible.sync="dialogVisible" width="40%"
+    @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right" class="text-left">
       <el-form-item :label="$t('meterWater.feeType')" prop="feeTypeCd">
-        <el-select
-          v-model="form.feeTypeCd"
-          :placeholder="$t('meterWater.selectFeeType')"
-          style="width: 100%"
-          @change="handleFeeTypeChange"
-        >
-          <el-option
-            v-for="item in feeTypeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+        <el-select v-model="form.feeTypeCd" :placeholder="$t('meterWater.selectFeeType')" style="width: 100%"
+          @change="handleFeeTypeChange">
+          <el-option v-for="item in feeTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
  
       <el-form-item :label="$t('meterWater.feeItem')" prop="configId">
-        <el-select
-          v-model="form.configId"
-          :placeholder="$t('meterWater.selectFeeItem')"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in feeConfigs"
-            :key="item.configId"
-            :label="item.feeName"
-            :value="item.configId"
-          />
+        <el-select v-model="form.configId" :placeholder="$t('meterWater.selectFeeItem')" style="width: 100%">
+          <el-option v-for="item in feeConfigs" :key="item.configId" :label="item.feeName" :value="item.configId" />
         </el-select>
       </el-form-item>
  
       <el-form-item :label="$t('meterWater.meterType')" prop="meterType">
-        <el-select
-          v-model="form.meterType"
-          :placeholder="$t('meterWater.selectMeterType')"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in meterTypes"
-            :key="item.typeId"
-            :label="item.typeName"
-            :value="item.typeId"
-          />
+        <el-select v-model="form.meterType" :placeholder="$t('meterWater.selectMeterType')" style="width: 100%">
+          <el-option v-for="item in meterTypes" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
         </el-select>
       </el-form-item>
  
       <el-form-item :label="$t('meterWater.selectFile')" prop="file">
-        <el-upload
-          ref="upload"
-          :auto-upload="false"
-          :limit="1"
-          :on-change="handleFileChange"
-          :file-list="fileList"
-          accept=".xls,.xlsx"
-        >
+        <el-upload ref="upload" :auto-upload="false" :limit="1" :on-change="handleFileChange" :file-list="fileList"
+          accept=".xls,.xlsx" action="">
           <el-button size="small" type="primary">{{ $t('meterWater.selectFile') }}</el-button>
           <div slot="tip" class="el-upload__tip">
             {{ fileList.length > 0 ? fileList[0].name : $t('meterWater.fileRequired') }}
@@ -204,6 +161,8 @@ export default {
           pagePath: 'exportMeterWater2'
         })
         this.$message.success(this.$t('meterWater.downloadStarted'))
+        this.dialogVisible = false
+        this.$router.push('/pages/property/downloadTempFile?tab=下载中心')
       } catch (error) {
         console.error('Failed to download template:', error)
         this.$message.error(error.message || this.$t('common.downloadFailed'))
@@ -228,13 +187,13 @@ export default {
         formData.append('importMeterDynamic', 'true')
  
         try {
-          const { data } = await importMeterWaterData(formData)
+          const res = await importMeterWaterData(formData)
+ 
           this.$message.success(this.$t('meterWater.importSuccess'))
           this.dialogVisible = false
-          this.$emit('success', data.logId)
+          this.$emit('success', res.logId)
         } catch (error) {
-          console.error('Failed to import meter water data:', error)
-          this.$message.error(error.message || this.$t('common.importFailed'))
+          this.$message.error(error.response.data || this.$t('common.importFailed'))
         }
       })
     }
 <template>
-  <el-dialog :title="$t('meterWater.meterQRCode')" :visible.sync="dialogVisible" width="50%" @close="handleClose">
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right">
+  <el-dialog :title="$t('meterWater.meterQRCode')" :visible.sync="dialogVisible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right" class="text-left">
       <el-form-item :label="$t('meterWater.feeType')" prop="feeTypeCd">
         <el-select v-model="form.feeTypeCd" :placeholder="$t('meterWater.selectFeeType')" style="width: 100%"
           @change="handleFeeTypeChange">
@@ -29,7 +29,7 @@
         <el-input v-model="form.ownerName" :placeholder="$t('meterWater.inputRoom')" disabled />
       </el-form-item>
  
-      <el-form-item v-if="showQRCode" :label="$t('meterWater.qrCode')">
+      <el-form-item v-show="showQRCode" :label="$t('meterWater.qrCode')">
         <div class="qr-code-container">
           <div id="qrCodeCanvas" class="qr-code-canvas"></div>
           <div class="qr-code-title">
@@ -53,6 +53,7 @@ import QRCode from &#39;qrcodejs2&#39;
 import { listFeeConfigs, listMeterTypes } from '@/api/fee/meterWaterManageApi'
 import { getDict } from '@/api/community/communityApi'
 import { getCommunityId } from '@/api/community/communityApi'
+import { getPropertyUrl } from '@/api/system/systemInfoManageApi'
  
 export default {
   name: 'RoomMeterQrcode',
@@ -173,7 +174,7 @@ export default {
  
       this.clearQRCode()
  
-      const propertyUrl = this.$store.getters.systemInfo.propertyUrl
+      const propertyUrl = getPropertyUrl()
       const qrCodeUrl = `${propertyUrl}pages/meter/qrcodeMeter?configId=${this.form.configId}&meterType=${this.form.meterType}&roomId=${this.form.roomId}&communityId=${this.form.communityId}`
  
       this.qrCode = new QRCode(document.getElementById('qrCodeCanvas'), {
@@ -7,25 +7,16 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-input
-            v-model.trim="searchForm.contractCode"
-            :placeholder="$t('contractCreateFee.search.contractCode')"
-            clearable
-          />
+          <el-input v-model.trim="searchForm.contractCode" :placeholder="$t('contractCreateFee.search.contractCode')"
+            clearable />
         </el-col>
         <el-col :span="6">
-          <el-input
-            v-model.trim="searchForm.contractNameLike"
-            :placeholder="$t('contractCreateFee.search.contractNameLike')"
-            clearable
-          />
+          <el-input v-model.trim="searchForm.contractNameLike"
+            :placeholder="$t('contractCreateFee.search.contractNameLike')" clearable />
         </el-col>
         <el-col :span="6">
-          <el-input
-            v-model.trim="searchForm.contractType"
-            :placeholder="$t('contractCreateFee.search.contractType')"
-            clearable
-          />
+          <el-input v-model.trim="searchForm.contractType" :placeholder="$t('contractCreateFee.search.contractType')"
+            clearable />
         </el-col>
         <el-col :span="6">
           <el-button type="primary" @click="handleSearch">
@@ -44,77 +35,29 @@
     <el-card class="list-wrapper">
       <div slot="header" class="flex justify-between">
         <span>{{ $t('contractCreateFee.list.title') }}</span>
-        <el-button
-          type="primary"
-          size="small"
-          @click="handleBatchCreate"
-        >
+        <el-button type="primary" size="small" @click="handleBatchCreate">
           <i class="el-icon-plus"></i>
           {{ $t('contractCreateFee.list.batchCreate') }}
         </el-button>
       </div>
  
-      <el-table
-        v-loading="loading"
-        :data="tableData"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="contractCode"
-          :label="$t('contractCreateFee.table.contractCode')"
-          align="center"
-        />
-        <el-table-column
-          prop="parentContractCode"
-          :label="$t('contractCreateFee.table.parentContractCode')"
-          align="center"
-        >
+      <el-table v-loading="loading" :data="tableData" border style="width: 100%">
+        <el-table-column prop="contractCode" :label="$t('contractCreateFee.table.contractCode')" align="center" />
+        <el-table-column prop="parentContractCode" :label="$t('contractCreateFee.table.parentContractCode')"
+          align="center">
           <template slot-scope="scope">
             {{ scope.row.parentContractCode || '-' }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="contractName"
-          :label="$t('contractCreateFee.table.contractName')"
-          align="center"
-        />
-        <el-table-column
-          prop="contractTypeName"
-          :label="$t('contractCreateFee.table.contractType')"
-          align="center"
-        />
-        <el-table-column
-          prop="bContacts"
-          :label="$t('contractCreateFee.table.partyB')"
-          align="center"
-        />
-        <el-table-column
-          prop="amount"
-          :label="$t('contractCreateFee.table.amount')"
-          align="center"
-        />
-        <el-table-column
-          prop="startTime"
-          :label="$t('contractCreateFee.table.startTime')"
-          align="center"
-        />
-        <el-table-column
-          prop="endTime"
-          :label="$t('contractCreateFee.table.endTime')"
-          align="center"
-        />
-        <el-table-column
-          :label="$t('common.operation')"
-          align="center"
-          width="220"
-        >
+        <el-table-column prop="contractName" :label="$t('contractCreateFee.table.contractName')" align="center" />
+        <el-table-column prop="contractTypeName" :label="$t('contractCreateFee.table.contractType')" align="center" />
+        <el-table-column prop="bContacts" :label="$t('contractCreateFee.table.partyB')" align="center" />
+        <el-table-column prop="amount" :label="$t('contractCreateFee.table.amount')" align="center" />
+        <el-table-column prop="startTime" :label="$t('contractCreateFee.table.startTime')" align="center" />
+        <el-table-column prop="endTime" :label="$t('contractCreateFee.table.endTime')" align="center" />
+        <el-table-column :label="$t('common.operation')" align="center" width="220">
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.state !== '2002'"
-              size="mini"
-              @click="handlePayFee(scope.row)"
-            >
+            <el-button v-if="scope.row.state !== '2002'" size="mini" @click="handlePayFee(scope.row)">
               {{ $t('contractCreateFee.table.payFee') }}
             </el-button>
             <el-button size="mini" @click="handleViewDetail(scope.row)">
@@ -127,15 +70,9 @@
         </el-table-column>
       </el-table>
  
-      <el-pagination
-        :current-page.sync="pagination.current"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination :current-page.sync="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size"
+        :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
     </el-card>
  
     <!-- 创建费用弹窗 -->
@@ -5,7 +5,7 @@
         <div>{{ listCarFeeInfo.carNum }}
           <span>{{ $t('listCarFee.fee') }}</span>({{ listCarFeeInfo.parkingName }})
         </div>
-        <div class="ibox-tools" style="top:10px;">
+        <div class="" style="top:10px;">
           <el-button type="primary" size="small" style="margin-left:10px" @click="_openCarCreateFeeAddModal">
             <i class="el-icon-plus"></i>
             <span>{{ $t('listCarFee.createFee') }}</span>
@@ -16,7 +16,7 @@
           </el-button>
         </div>
       </div>
-      <div class="ibox-content">
+      <div class="">
         <el-table :data="listCarFeeInfo.fees" border style="width: 100%">
           <el-table-column prop="feeName" :label="$t('listCarFee.feeItem')" align="center">
             <template slot-scope="scope">
@@ -87,7 +87,7 @@
           </el-table-column>
         </el-table>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="12" class="table-desc">
             <div> {{ $t('listCarFee.note1') }}</div>
             <div> {{ $t('listCarFee.note2') }}</div>
           </el-col>
@@ -102,9 +102,9 @@
     </el-card>
  
     <!-- 子组件 -->
-    <delete-fee ref="deleteFee"></delete-fee>
-    <edit-fee ref="editFee"></edit-fee>
-    <split-fee ref="splitFee"></split-fee>
+    <delete-fee ref="deleteFee" @success="handleSuccess"></delete-fee>
+    <edit-fee ref="editFee" @success="handleSuccess"></edit-fee>
+    <split-fee ref="splitFee" @success="handleSuccess"></split-fee>
     <car-create-fee-add ref="carCreateFeeAdd" @success="handleSuccess"></car-create-fee-add>
     <!-- <add-meter-water ref="addMeterWater"></add-meter-water> -->
   </div>
@@ -26,7 +26,7 @@
       </el-table>
  
       <el-row class="margin-top">
-        <el-col :span="18" class="text-left">
+        <el-col :span="18" class="text-left table-desc">
           <div>{{ $t('meterTypeManage.tip') }}</div>
         </el-col>
         <el-col :span="6">
@@ -9,14 +9,14 @@
           <div slot="header" class="flex justify-between">
             <span>{{ $t('meterWater.queryConditions') }}</span>
           </div>
-          <el-form :inline="true" :model="conditions" class="demo-form-inline">
-            <el-form-item :label="$t('meterWater.meterType')">
+          <el-form :inline="true" :model="conditions" class="demo-form-inline text-left">
+            <el-form-item >
               <el-select v-model="conditions.meterType" :placeholder="$t('meterWater.selectMeterType')" clearable
                 style="width: 100%">
                 <el-option v-for="item in meterTypes" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
               </el-select>
             </el-form-item>
-            <el-form-item :label="$t('meterWater.meterId')">
+            <el-form-item >
               <el-input v-model="conditions.waterId" :placeholder="$t('meterWater.inputMeterId')" clearable />
             </el-form-item>
             <el-form-item>