费用功能测试完成

wuxw
1 parent 0fd4eb05
Showing 11 changed files with 60 additions and 165 deletions
src/api/fee/writeOweFeeCallableApi.js
src/components/fee/audit.vue
src/components/fee/deleteOweFeeCallable.vue
src/components/fee/writeOweFeeCallable.vue
src/views/fee/addOweFeeCallableList.vue
src/views/fee/createFeeByComboList.vue
src/views/fee/feeComboManageList.vue
src/views/fee/oweFeeCallableList.vue
src/views/fee/payFeeAuditManageList.vue
src/views/fee/payFeeBatchList.vue
src/views/fee/staffFeeManageList.vue
@@ -27,11 +27,8 @@ export function listFee(params) {
       params
     }).then(response => {
       const res = response.data
-      if (res.code == 0) {
         resolve(res)
-      } else {
-        reject(new Error(res.msg || 'Failed to list fees'))
-      }
+
     }).catch(error => {
       reject(error)
     })
@@ -68,6 +68,7 @@ export default {
             this.formData.remark = `${this.$t('audit.state.reject')}:${this.formData.remark}`
           }
           this.$emit('notifyAuditInfo', this.formData)
+          this.$emit('success', this.formData)
           this.visible = false
         }
       })
@@ -53,6 +53,7 @@ export default {
           this.dialogVisible = false
           this.$emit('listOweFeeCallable', {})
           this.$emit('listOwnerData', {})
+          this.$emit('success', {})
           this.$message.success(this.$t('deleteOweFeeCallable.success'))
         } else {
           this.$message.error(res.msg)
 <template>
-  <el-dialog
-    :title="$t('writeOweFeeCallable.title')"
-    :visible.sync="dialogVisible"
-    width="70%"
-    :before-close="handleClose"
-  >
+  <el-dialog :title="$t('writeOweFeeCallable.title')" :visible.sync="dialogVisible" width="40%"
+    :before-close="handleClose">
     <div class="ibox-content">
-      <el-form label-width="120px">
+      <el-form label-width="120px" class="text-left">
         <el-form-item :label="$t('writeOweFeeCallable.room')">
-          <el-input 
-            v-model="writeOweFeeCallableInfo.roomName" 
-            readonly
-            :placeholder="$t('writeOweFeeCallable.roomPlaceholder')"
-          ></el-input>
+          <el-input v-model="writeOweFeeCallableInfo.roomName" readonly
+            :placeholder="$t('writeOweFeeCallable.roomPlaceholder')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('writeOweFeeCallable.fees')">
           <el-checkbox-group v-model="writeOweFeeCallableInfo.feeIds">
-            <el-checkbox 
-              v-for="(item,index) in writeOweFeeCallableInfo.fees" 
-              :key="index"
-              :label="item.feeId"
-            >
-              {{item.feeName}}
+            <el-checkbox v-for="(item, index) in writeOweFeeCallableInfo.fees" :key="index" :label="item.feeId">
+              {{ item.feeName }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item :label="$t('writeOweFeeCallable.remark')">
-          <el-input
-            type="textarea"
-            :rows="5"
-            v-model="writeOweFeeCallableInfo.remark"
-            :placeholder="$t('writeOweFeeCallable.remarkPlaceholder')"
-          ></el-input>
+          <el-input type="textarea" :rows="5" v-model="writeOweFeeCallableInfo.remark"
+            :placeholder="$t('writeOweFeeCallable.remarkPlaceholder')"></el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -88,6 +73,7 @@ export default {
           this.clearWriteOweFeeCallable()
           this.$emit('listOweFeeCallable', {})
           this.$emit('listOwnerData', {})
+          this.$emit('success', {})
           this.$message.success(this.$t('writeOweFeeCallable.success'))
         } else {
           this.$message.error(res.msg)
@@ -5,7 +5,7 @@
         <span>{{ $t('addOweFeeCallable.title') }}</span>
       </div>
  
-      <el-form label-position="right" label-width="120px">
+      <el-form label-position="right" label-width="120px" class="text-left">
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item :label="$t('addOweFeeCallable.callableWay')">
@@ -47,7 +47,7 @@
     </el-card>
  
     <choose-fee-combo ref="chooseFeeCombo" @chooseFeeCombo="handleChooseFeeCombo"
-      @loadData="handleLoadData"></choose-fee-combo>
+      ></choose-fee-combo>
   </div>
 </template>
  
@@ -103,6 +103,7 @@ export default {
         }
         const { data } = await listFeeComboMember(params)
         this.createFeeByComboInfo.selectConfigIds = []
+        console.log('data:', data)
         data.forEach(config => {
           config.startTime = ''
           config.endTime = ''
@@ -7,11 +7,7 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-input
-            v-model="searchForm.comboName"
-            :placeholder="$t('feeComboManage.search.comboName')"
-            clearable
-          />
+          <el-input v-model="searchForm.comboName" :placeholder="$t('feeComboManage.search.comboName')" clearable />
         </el-col>
         <el-col :span="6">
           <el-button type="primary" @click="handleSearch">
@@ -29,86 +25,39 @@
     <el-card class="list-wrapper">
       <div slot="header" class="flex justify-between">
         <span>{{ $t('feeComboManage.list.title') }}</span>
-        <el-button
-          type="primary"
-          size="small"
-          style="float: right"
-          @click="handleAdd"
-        >
+        <el-button type="primary" size="small" style="float: right" @click="handleAdd">
           {{ $t('common.add') }}
         </el-button>
       </div>
  
-      <el-table
-        v-loading="loading"
-        :data="tableData"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="comboId"
-          :label="$t('feeComboManage.table.comboId')"
-          align="center"
-        />
-        <el-table-column
-          prop="comboName"
-          :label="$t('feeComboManage.table.comboName')"
-          align="center"
-        />
-        <el-table-column
-          prop="createTime"
-          :label="$t('feeComboManage.table.createTime')"
-          align="center"
-        />
-        <el-table-column
-          prop="remark"
-          :label="$t('feeComboManage.table.remark')"
-          align="center"
-        />
-        <el-table-column
-          :label="$t('common.operation')"
-          align="center"
-          width="300"
-        >
+      <el-table v-loading="loading" :data="tableData" border style="width: 100%">
+        <el-table-column prop="comboId" :label="$t('feeComboManage.table.comboId')" align="center" />
+        <el-table-column prop="comboName" :label="$t('feeComboManage.table.comboName')" align="center" />
+        <el-table-column prop="createTime" :label="$t('feeComboManage.table.createTime')" align="center" />
+        <el-table-column prop="remark" :label="$t('feeComboManage.table.remark')" align="center" />
+        <el-table-column :label="$t('common.operation')" align="center" width="300">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              @click="handleToComboMember(scope.row)"
-            >
+            <el-button size="mini" @click="handleToComboMember(scope.row)">
               {{ $t('feeComboManage.operation.feeItems') }}
             </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              @click="handleEdit(scope.row)"
-            >
+            <el-button size="mini" type="primary" @click="handleEdit(scope.row)">
               {{ $t('common.edit') }}
             </el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              @click="handleDelete(scope.row)"
-            >
+            <el-button size="mini" type="danger" @click="handleDelete(scope.row)">
               {{ $t('common.delete') }}
             </el-button>
           </template>
         </el-table-column>
       </el-table>
  
-      <div class="remark-wrapper">
+      <div class="remark-wrapper text-left">
         <p>{{ $t('feeComboManage.remark.line1') }}</p>
         <p>{{ $t('feeComboManage.remark.line2') }}</p>
       </div>
  
-      <el-pagination
-        :current-page.sync="page.current"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="page.size"
-        :total="page.total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination :current-page.sync="page.current" :page-sizes="[10, 20, 30, 50]" :page-size="page.size"
+        :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
     </el-card>
  
     <!-- 子组件 -->
@@ -10,15 +10,15 @@
             <span>{{ $t('oweFeeCallable.search.title') }}</span>
           </div>
           <el-form :inline="true" :model="searchForm" class="search-form text-left">
-            <el-form-item :label="$t('oweFeeCallable.search.ownerName')">
+            <el-form-item >
               <el-input v-model="searchForm.ownerName"
                 :placeholder="$t('oweFeeCallable.search.ownerNamePlaceholder')"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('oweFeeCallable.search.feeName')">
+            <el-form-item >
               <el-input v-model="searchForm.feeName"
                 :placeholder="$t('oweFeeCallable.search.feeNamePlaceholder')"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('oweFeeCallable.search.callableWay')">
+            <el-form-item >
               <el-select v-model="searchForm.callableWay"
                 :placeholder="$t('oweFeeCallable.search.callableWayPlaceholder')" style="width:100%">
                 <el-option label="全部" value=""></el-option>
@@ -27,11 +27,11 @@
                 <el-option label="上门催缴" value="PRINT"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label="$t('oweFeeCallable.search.staffName')">
+            <el-form-item >
               <el-input v-model="searchForm.staffName"
                 :placeholder="$t('oweFeeCallable.search.staffNamePlaceholder')"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('oweFeeCallable.search.state')">
+            <el-form-item >
               <el-select v-model="searchForm.state" :placeholder="$t('oweFeeCallable.search.statePlaceholder')"
                 style="width:100%">
                 <el-option label="全部" value=""></el-option>
@@ -185,7 +185,7 @@ export default {
     },
     handleDetail(row) {
       this.$router.push({
-        path: '/fee/propertyFee',
+        path: '/views/fee/propertyFee',
         query: row
       })
     },
@@ -79,7 +79,7 @@
     </el-row>
  
     <apply-delete-fee-batch ref="applyDeleteFeeBatch" @success="handleSuccess" />
-    <audit ref="audit" @success="handleSuccess" />
+    <audit ref="audit" @success="_auditPayFeeBatchState" />
   </div>
 </template>
  
@@ -6,29 +6,18 @@
           <div slot="header" class="flex justify-between">
             <span>{{ $t('staffFeeManage.search.title') }}</span>
           </div>
-          <el-form :inline="true" :model="searchForm" class="demo-form-inline">
-            <el-form-item :label="$t('staffFeeManage.search.userCode')">
-              <el-input
-                v-model="searchForm.userCode"
-                :placeholder="$t('staffFeeManage.search.userCodePlaceholder')"
-                clearable
-              />
+          <el-form :inline="true" :model="searchForm" class="demo-form-inline text-left" >
+            <el-form-item >
+              <el-input v-model="searchForm.userCode" :placeholder="$t('staffFeeManage.search.userCodePlaceholder')"
+                clearable />
             </el-form-item>
-            <el-form-item :label="$t('staffFeeManage.search.startTime')">
-              <el-date-picker
-                v-model="searchForm.startTime"
-                type="datetime"
-                :placeholder="$t('staffFeeManage.search.startTimePlaceholder')"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              />
+            <el-form-item >
+              <el-date-picker v-model="searchForm.startTime" type="datetime"
+                :placeholder="$t('staffFeeManage.search.startTimePlaceholder')" value-format="yyyy-MM-dd HH:mm:ss" />
             </el-form-item>
-            <el-form-item :label="$t('staffFeeManage.search.endTime')">
-              <el-date-picker
-                v-model="searchForm.endTime"
-                type="datetime"
-                :placeholder="$t('staffFeeManage.search.endTimePlaceholder')"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              />
+            <el-form-item >
+              <el-date-picker v-model="searchForm.endTime" type="datetime"
+                :placeholder="$t('staffFeeManage.search.endTimePlaceholder')" value-format="yyyy-MM-dd HH:mm:ss" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="handleSearch">
@@ -48,59 +37,28 @@
         <el-card>
           <div slot="header" class="flex justify-between">
             <span>{{ $t('staffFeeManage.list.title') }}</span>
-            <el-button
-              type="primary"
-              size="small"
-              class="float-right"
-              @click="handleExport"
-            >
+            <el-button type="primary" size="small" class="float-right" @click="handleExport">
               {{ $t('common.export') }}
             </el-button>
           </div>
-          <el-table
-            v-loading="loading"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="userId"
-              :label="$t('staffFeeManage.table.userCode')"
-              align="center"
-            />
-            <el-table-column
-              prop="userName"
-              :label="$t('staffFeeManage.table.userName')"
-              align="center"
-            />
-            <el-table-column
-              prop="receivableAmount"
-              :label="$t('staffFeeManage.table.receivableAmount')"
-              align="center"
-            >
+          <el-table v-loading="loading" :data="tableData" border style="width: 100%">
+            <el-table-column prop="userId" :label="$t('staffFeeManage.table.userCode')" align="center" />
+            <el-table-column prop="userName" :label="$t('staffFeeManage.table.userName')" align="center" />
+            <el-table-column prop="receivableAmount" :label="$t('staffFeeManage.table.receivableAmount')"
+              align="center">
               <template slot-scope="scope">
                 {{ scope.row.receivableAmount }} {{ $t('staffFeeManage.table.yuan') }}
               </template>
             </el-table-column>
-            <el-table-column
-              prop="receivedAmount"
-              :label="$t('staffFeeManage.table.receivedAmount')"
-              align="center"
-            >
+            <el-table-column prop="receivedAmount" :label="$t('staffFeeManage.table.receivedAmount')" align="center">
               <template slot-scope="scope">
                 {{ scope.row.receivedAmount }} {{ $t('staffFeeManage.table.yuan') }}
               </template>
             </el-table-column>
           </el-table>
-          <el-pagination
-            :current-page="pagination.current"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="pagination.size"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="pagination.total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+          <el-pagination :current-page="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size"
+            layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
         </el-card>
       </el-col>
     </el-row>
@@ -184,9 +142,11 @@ export default {
 <style lang="scss" scoped>
 .staff-fee-manage-container {
   padding: 20px;
+
   .mb-20 {
     margin-bottom: 20px;
   }
+
   .float-right {
     float: right;
   }