Commit 4afadb73e74e859bc7d6f38eb3bf639ac26e915a
1 parent
60586e79
v1.9 优化装修 上传视频失败问题 修复
Showing
5 changed files
with
13 additions
and
22 deletions
src/api/fee/listApplyRoomDiscountRecordApi.js
| @@ -81,7 +81,7 @@ export function uploadImage(data) { | @@ -81,7 +81,7 @@ export function uploadImage(data) { | ||
| 81 | export function uploadVedio(data, config) { | 81 | export function uploadVedio(data, config) { |
| 82 | return new Promise((resolve, reject) => { | 82 | return new Promise((resolve, reject) => { |
| 83 | request({ | 83 | request({ |
| 84 | - url: '/uploadVedio', | 84 | + url: '/callComponent/upload/uploadVedio/upload', |
| 85 | method: 'post', | 85 | method: 'post', |
| 86 | headers: { | 86 | headers: { |
| 87 | 'Content-Type': 'multipart/form-data' | 87 | 'Content-Type': 'multipart/form-data' |
src/components/contract/contractDetailReceipt.vue
| @@ -27,8 +27,8 @@ | @@ -27,8 +27,8 @@ | ||
| 27 | <el-table-column prop="feeName" :label="$t('contractDetailReceipt.feeItem')" align="center"></el-table-column> | 27 | <el-table-column prop="feeName" :label="$t('contractDetailReceipt.feeItem')" align="center"></el-table-column> |
| 28 | <el-table-column :label="$t('contractDetailReceipt.feePeriod')" align="center" width="200"> | 28 | <el-table-column :label="$t('contractDetailReceipt.feePeriod')" align="center" width="200"> |
| 29 | <template slot-scope="scope"> | 29 | <template slot-scope="scope"> |
| 30 | - {{ $dayjs(scope.row.startTime).format('YYYY-MM-DD') }}~<br /> | ||
| 31 | - {{ $dayjs(scope.row.endTime).format('YYYY-MM-DD') }} | 30 | + {{ dateFormat(scope.row.startTime) }}~<br /> |
| 31 | + {{ dateFormat(scope.row.endTime) }} | ||
| 32 | </template> | 32 | </template> |
| 33 | </el-table-column> | 33 | </el-table-column> |
| 34 | <el-table-column prop="amount" :label="$t('contractDetailReceipt.totalAmount')" align="center"> | 34 | <el-table-column prop="amount" :label="$t('contractDetailReceipt.totalAmount')" align="center"> |
| @@ -57,6 +57,7 @@ | @@ -57,6 +57,7 @@ | ||
| 57 | <script> | 57 | <script> |
| 58 | import { queryFeeReceipt, listFeePrintPage } from '@/api/contract/contractDetailReceiptApi' | 58 | import { queryFeeReceipt, listFeePrintPage } from '@/api/contract/contractDetailReceiptApi' |
| 59 | import { getCommunityId } from '@/api/community/communityApi' | 59 | import { getCommunityId } from '@/api/community/communityApi' |
| 60 | +import {dateFormat} from '@/utils/dateUtil' | ||
| 60 | 61 | ||
| 61 | export default { | 62 | export default { |
| 62 | name: 'ContractDetailReceipt', | 63 | name: 'ContractDetailReceipt', |
| @@ -91,6 +92,7 @@ export default { | @@ -91,6 +92,7 @@ export default { | ||
| 91 | } | 92 | } |
| 92 | }, | 93 | }, |
| 93 | methods: { | 94 | methods: { |
| 95 | + dateFormat, | ||
| 94 | open(data) { | 96 | open(data) { |
| 95 | this.contractDetailReceiptInfo.payObjId = data.ownerId | 97 | this.contractDetailReceiptInfo.payObjId = data.ownerId |
| 96 | this._listContractDetailReceipt(this.currentPage, this.pageSize) | 98 | this._listContractDetailReceipt(this.currentPage, this.pageSize) |
src/components/fee/applyRoomDiscountRecord.vue
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | <script> | 36 | <script> |
| 37 | import { addApplyRoomDiscountRecord } from '@/api/fee/listApplyRoomDiscountRecordApi' | 37 | import { addApplyRoomDiscountRecord } from '@/api/fee/listApplyRoomDiscountRecordApi' |
| 38 | import UploadImageUrl from '@/components/upload/UploadImageUrl' | 38 | import UploadImageUrl from '@/components/upload/UploadImageUrl' |
| 39 | -import UploadVedio from './uploadVedio' | 39 | +import UploadVedio from '@/components/upload/uploadVedio' |
| 40 | import { getCommunityId } from '@/api/community/communityApi' | 40 | import { getCommunityId } from '@/api/community/communityApi' |
| 41 | 41 | ||
| 42 | export default { | 42 | export default { |
src/components/fee/uploadVedio.vue renamed to src/components/upload/uploadVedio.vue
| @@ -4,23 +4,12 @@ | @@ -4,23 +4,12 @@ | ||
| 4 | <el-progress :percentage="progress" :stroke-width="2"></el-progress> | 4 | <el-progress :percentage="progress" :stroke-width="2"></el-progress> |
| 5 | <div class="file-name">{{ fileName }}</div> | 5 | <div class="file-name">{{ fileName }}</div> |
| 6 | </div> | 6 | </div> |
| 7 | - | ||
| 8 | - <el-button | ||
| 9 | - type="primary" | ||
| 10 | - size="small" | ||
| 11 | - @click="triggerUpload" | ||
| 12 | - :disabled="uploading" | ||
| 13 | - > | 7 | + |
| 8 | + <el-button type="primary" size="small" @click="triggerUpload" :disabled="uploading"> | ||
| 14 | <i class="el-icon-upload"></i> | 9 | <i class="el-icon-upload"></i> |
| 15 | {{ $t('uploadVedio.uploadButton') }} | 10 | {{ $t('uploadVedio.uploadButton') }} |
| 16 | </el-button> | 11 | </el-button> |
| 17 | - <input | ||
| 18 | - type="file" | ||
| 19 | - ref="fileInput" | ||
| 20 | - accept="video/*" | ||
| 21 | - style="display: none" | ||
| 22 | - @change="handleFileChange" | ||
| 23 | - /> | 12 | + <input type="file" ref="fileInput" accept="video/*" style="display: none" @change="handleFileChange" /> |
| 24 | </div> | 13 | </div> |
| 25 | </template> | 14 | </template> |
| 26 | 15 | ||
| @@ -66,9 +55,9 @@ export default { | @@ -66,9 +55,9 @@ export default { | ||
| 66 | } | 55 | } |
| 67 | }) | 56 | }) |
| 68 | 57 | ||
| 69 | - if (res.code === 0) { | 58 | + if (res.realFileName) { |
| 70 | this.progress = 100 | 59 | this.progress = 100 |
| 71 | - this.realFileName = res.data.realFileName | 60 | + this.realFileName = res.realFileName |
| 72 | this.$message.success(this.$t('common.operationSuccess')) | 61 | this.$message.success(this.$t('common.operationSuccess')) |
| 73 | } | 62 | } |
| 74 | } catch (error) { | 63 | } catch (error) { |
| @@ -95,7 +84,7 @@ export default { | @@ -95,7 +84,7 @@ export default { | ||
| 95 | .upload-vedio-container { | 84 | .upload-vedio-container { |
| 96 | .progress-container { | 85 | .progress-container { |
| 97 | margin-bottom: 10px; | 86 | margin-bottom: 10px; |
| 98 | - | 87 | + |
| 99 | .file-name { | 88 | .file-name { |
| 100 | font-size: 12px; | 89 | font-size: 12px; |
| 101 | color: #606266; | 90 | color: #606266; |
src/views/fee/owePayFeeOrderList.vue
| @@ -148,7 +148,7 @@ export default { | @@ -148,7 +148,7 @@ export default { | ||
| 148 | payType: 'common', | 148 | payType: 'common', |
| 149 | authCode: '', | 149 | authCode: '', |
| 150 | orderId: '', | 150 | orderId: '', |
| 151 | - printUrl: '/#/pages/fee/printPayFee', | 151 | + printUrl: '/#/pages/property/printPayFee', |
| 152 | detailIds: '', | 152 | detailIds: '', |
| 153 | paymentPoolId: '' | 153 | paymentPoolId: '' |
| 154 | }, | 154 | }, |