v1.9 优化优惠申请 bug

wuxw
1 parent a1cba8c1
Showing 7 changed files with 61 additions and 95 deletions
src/api/fee/applyRoomDiscountManageApi.js
src/api/fee/simplifyRefundDepositApi.js
src/components/fee/editApplyRoomDiscount.vue
src/components/fee/editApplyRoomDiscountRecord.vue
src/components/fee/reviewApplyRoomDiscount.vue
src/components/fee/simplifyRefundDeposit.vue
vue.config.js
@@ -97,6 +97,24 @@ export function saveApplyRoomDiscount(data) {
     })
   })
 }
+export function editApplyRoomDiscount(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/applyRoomDiscount/editApplyRoomDiscount',
+      method: 'post',
+      data: {
+        ...data,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
  
 // 更新优惠申请
 export function updateApplyRoomDiscount(data) {
 import request from '@/utils/request'
  
 export function queryFeeDeposit(params) {
-  return request({
-    url: '/fee.queryFeeDeposit',
-    method: 'get',
-    params
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/fee.queryFeeDeposit',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+
+        resolve(res)
+
+    }).catch(error => {
+      reject(error)
+    })
   })
 }
 \ No newline at end of file
@@ -91,6 +91,7 @@ export default {
       this.form = {
         ...this.form,
         ...data,
+        state:'',
         communityId: getCommunityId()
       }
       setTimeout(() => {
 <template>
-  <el-dialog
-    :title="$t('applyRoomDiscount.editRecord.title')"
-    :visible.sync="visible"
-    width="60%"
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="form"
-      :rules="rules"
-      label-width="120px"
-    >
-      <el-form-item
-        :label="$t('applyRoomDiscount.editRecord.ardId')"
-        prop="ardId"
-      >
-        <el-input
-          v-model="form.ardId"
-          disabled
-        />
+  <el-dialog :title="$t('applyRoomDiscount.editRecord.title')" :visible.sync="visible" width="60%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('applyRoomDiscount.editRecord.ardId')" prop="ardId">
+        <el-input v-model="form.ardId" disabled />
       </el-form-item>
  
-      <el-form-item
-        :label="$t('applyRoomDiscount.editRecord.roomName')"
-        prop="roomName"
-      >
-        <el-input
-          v-model="form.roomName"
-          disabled
-        />
+      <el-form-item :label="$t('applyRoomDiscount.editRecord.roomName')" prop="roomName">
+        <el-input v-model="form.roomName" disabled />
       </el-form-item>
  
-      <el-form-item
-        :label="$t('applyRoomDiscount.editRecord.applyTypeName')"
-        prop="applyTypeName"
-      >
-        <el-input
-          v-model="form.applyTypeName"
-          disabled
-        />
+      <el-form-item :label="$t('applyRoomDiscount.editRecord.applyTypeName')" prop="applyTypeName">
+        <el-input v-model="form.applyTypeName" disabled />
       </el-form-item>
  
-      <el-form-item
-        :label="$t('applyRoomDiscount.editRecord.createUserName')"
-        prop="createUserName"
-      >
-        <el-input
-          v-model="form.createUserName"
-          disabled
-        />
+      <el-form-item :label="$t('applyRoomDiscount.editRecord.createUserName')" prop="createUserName">
+        <el-input v-model="form.createUserName" disabled />
       </el-form-item>
  
-      <el-form-item
-        :label="$t('applyRoomDiscount.editRecord.createUserTel')"
-        prop="createUserTel"
-      >
-        <el-input
-          v-model="form.createUserTel"
-          disabled
-        />
+      <el-form-item :label="$t('applyRoomDiscount.editRecord.createUserTel')" prop="createUserTel">
+        <el-input v-model="form.createUserTel" disabled />
       </el-form-item>
  
-      <el-form-item
-        :label="$t('applyRoomDiscount.editRecord.startTime')"
-        prop="startTime"
-      >
-        <el-date-picker
-          v-model="form.startTime"
-          type="datetime"
-          :placeholder="$t('applyRoomDiscount.editRecord.startTimePlaceholder')"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          style="width:100%"
-          @change="validateDate"
-        />
+      <el-form-item :label="$t('applyRoomDiscount.editRecord.startTime')" prop="startTime">
+        <el-date-picker v-model="form.startTime" type="datetime"
+          :placeholder="$t('applyRoomDiscount.editRecord.startTimePlaceholder')" value-format="yyyy-MM-dd HH:mm:ss"
+          style="width:100%" @change="validateDate" />
       </el-form-item>
  
-      <el-form-item
-        :label="$t('applyRoomDiscount.editRecord.endTime')"
-        prop="endTime"
-      >
-        <el-date-picker
-          v-model="form.endTime"
-          type="datetime"
-          :placeholder="$t('applyRoomDiscount.editRecord.endTimePlaceholder')"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          style="width:100%"
-          @change="validateDate"
-        />
+      <el-form-item :label="$t('applyRoomDiscount.editRecord.endTime')" prop="endTime">
+        <el-date-picker v-model="form.endTime" type="datetime"
+          :placeholder="$t('applyRoomDiscount.editRecord.endTimePlaceholder')" value-format="yyyy-MM-dd HH:mm:ss"
+          style="width:100%" @change="validateDate" />
       </el-form-item>
  
-      <el-form-item
-        :label="$t('applyRoomDiscount.editRecord.stateName')"
-        prop="stateName"
-      >
-        <el-input
-          v-model="form.stateName"
-          disabled
-        />
+      <el-form-item :label="$t('applyRoomDiscount.editRecord.stateName')" prop="stateName">
+        <el-input v-model="form.stateName" disabled />
       </el-form-item>
     </el-form>
  
@@ -112,7 +50,7 @@
 </template>
  
 <script>
-import { updateApplyRoomDiscount } from '@/api/fee/applyRoomDiscountManageApi'
+import { editApplyRoomDiscount } from '@/api/fee/applyRoomDiscountManageApi'
 import { getCommunityId } from '@/api/community/communityApi'
  
 export default {
@@ -206,7 +144,7 @@ export default {
     },
     async updateApplyRoomDiscount() {
       try {
-        await updateApplyRoomDiscount(this.form)
+        await editApplyRoomDiscount(this.form)
         this.$message.success(this.$t('applyRoomDiscount.message.updateSuccess'))
         this.visible = false
         this.$emit('success')
@@ -186,7 +186,8 @@ export default {
         ...data,
         communityId: getCommunityId(),
         selectedFees: [],
-        refundAmount: ''
+        refundAmount: '',
+        state:''
       }
       this.visible = true
       this.loadDiscounts()
@@ -82,7 +82,6 @@ export default {
       }
  
       queryFeeDeposit(params).then(response => {
-        if (response.code !== 0) return
         this.simplifyRefundDepositInfo.total = response.total
         this.simplifyRefundDepositInfo.records = response.records
         this.simplifyRefundDepositInfo.fees = response.data
@@ -102,7 +101,7 @@ export default {
     },
     _openRefundModel() {
       const roomId = this.simplifyRefundDepositInfo.roomId
-      this.$router.push(`/pages/fee/refundDepositFee?roomId=${roomId}`)
+      this.$router.push(`/views/fee/refundDepositFee?roomId=${roomId}`)
     },
     _toSimplifyFeeDepositFeeDetail(fee) {
       this.$router.push(`/views/fee/propertyFee?feeId=${fee.feeId}`)
@@ -4,14 +4,14 @@ module.exports = {
     open: true, // 自动打开浏览器
     proxy: {
       '/app': {
-        target: 'http://demo.homecommunity.cn/app', // 后端API地址
+        target: 'http://127.0.0.1:8008/app', // 后端API地址
         changeOrigin: true,
         pathRewrite: {
           '^/app': ''
         }
       },
       '/callComponent': {
-        target: 'http://demo.homecommunity.cn/callComponent', // 后端API地址
+        target: 'http://127.0.0.1:8008/callComponent', // 后端API地址
         changeOrigin: true,
         pathRewrite: {
           '^/callComponent': ''