Commit de41792e8e5a320a8211e6ed1149f9cd3492ef70
1 parent
af4f57bf
物业费调试
Showing
1 changed file
with
23 additions
and
30 deletions
src/views/fee/index.vue
| @@ -115,7 +115,7 @@ const handleSelectionChange = (data: array) => { | @@ -115,7 +115,7 @@ const handleSelectionChange = (data: array) => { | ||
| 115 | */ | 115 | */ |
| 116 | const handleTimeChange = (value: array, args: string) => { | 116 | const handleTimeChange = (value: array, args: string) => { |
| 117 | if (args === "form") { | 117 | if (args === "form") { |
| 118 | - form.data.startTime = value ? value[0] : ""; | 118 | + form.data.beginTime = value ? value[0] : ""; |
| 119 | form.data.endTime = value ? value[1] : ""; | 119 | form.data.endTime = value ? value[1] : ""; |
| 120 | } else { | 120 | } else { |
| 121 | data.params.query.payStartTime = value ? value[0] : ""; | 121 | data.params.query.payStartTime = value ? value[0] : ""; |
| @@ -372,6 +372,7 @@ const handleClose = () => { | @@ -372,6 +372,7 @@ const handleClose = () => { | ||
| 372 | */ | 372 | */ |
| 373 | const edit = (obj: any) => { | 373 | const edit = (obj: any) => { |
| 374 | form.data = obj; | 374 | form.data = obj; |
| 375 | + form.data.totalFee = (obj.totalFee / 100).toFixed(2) | ||
| 375 | form.data.period = [obj.beginTime, obj.endTime]; | 376 | form.data.period = [obj.beginTime, obj.endTime]; |
| 376 | form.visible = true; | 377 | form.visible = true; |
| 377 | }; | 378 | }; |
| @@ -396,6 +397,7 @@ const submitForm = (formEl: InstanceType<typeof ElForm> | undefined) => { | @@ -396,6 +397,7 @@ const submitForm = (formEl: InstanceType<typeof ElForm> | undefined) => { | ||
| 396 | if (!formEl) return; | 397 | if (!formEl) return; |
| 397 | formEl.validate(async (valid) => { | 398 | formEl.validate(async (valid) => { |
| 398 | if (valid) { | 399 | if (valid) { |
| 400 | + form.data.totalFee *= 100 | ||
| 399 | propertyFeeSave(form.data) | 401 | propertyFeeSave(form.data) |
| 400 | .then((res) => { | 402 | .then((res) => { |
| 401 | getList(); | 403 | getList(); |
| @@ -529,7 +531,7 @@ onMounted(() => { | @@ -529,7 +531,7 @@ onMounted(() => { | ||
| 529 | placeholder="到期月份" | 531 | placeholder="到期月份" |
| 530 | /> | 532 | /> |
| 531 | </el-form-item> | 533 | </el-form-item> |
| 532 | - <el-form-item label="缴费日期"> | 534 | + <el-form-item label="缴费时间"> |
| 533 | <el-date-picker | 535 | <el-date-picker |
| 534 | v-model="value1" | 536 | v-model="value1" |
| 535 | type="datetimerange" | 537 | type="datetimerange" |
| @@ -567,7 +569,7 @@ onMounted(() => { | @@ -567,7 +569,7 @@ onMounted(() => { | ||
| 567 | type="success" | 569 | type="success" |
| 568 | @click="sureAll" | 570 | @click="sureAll" |
| 569 | :disabled="!data.list.length" | 571 | :disabled="!data.list.length" |
| 570 | - >一键确认(总计:{{ data.totals }}¥)</el-button | 572 | + >一键确认(总计:{{ (data.totals / 100).toFixed(2) }}¥)</el-button |
| 571 | > | 573 | > |
| 572 | <el-button | 574 | <el-button |
| 573 | type="danger" | 575 | type="danger" |
| @@ -630,13 +632,17 @@ onMounted(() => { | @@ -630,13 +632,17 @@ onMounted(() => { | ||
| 630 | prop="totalFee" | 632 | prop="totalFee" |
| 631 | label="待缴金额(¥)" | 633 | label="待缴金额(¥)" |
| 632 | align="center" | 634 | align="center" |
| 633 | - ></el-table-column> | 635 | + > |
| 636 | + <template #default="scope"> | ||
| 637 | + {{ (~~scope.row.totalFee / 100).toFixed(2) }} | ||
| 638 | + </template> | ||
| 639 | + </el-table-column> | ||
| 634 | <el-table-column prop="payStatus" label="缴费状态" align="center"> | 640 | <el-table-column prop="payStatus" label="缴费状态" align="center"> |
| 635 | <template #default="scope"> | 641 | <template #default="scope"> |
| 636 | {{ globalFilters(scope.row.payStatus, statusData) }} | 642 | {{ globalFilters(scope.row.payStatus, statusData) }} |
| 637 | </template> | 643 | </template> |
| 638 | </el-table-column> | 644 | </el-table-column> |
| 639 | - <el-table-column prop="payTime" label="缴费日期" align="center"> | 645 | + <el-table-column prop="payTime" label="缴费时间" align="center"> |
| 640 | <template #default="scope"> | 646 | <template #default="scope"> |
| 641 | {{ parseTime(new Date(scope.row.payTime).getTime()) }} | 647 | {{ parseTime(new Date(scope.row.payTime).getTime()) }} |
| 642 | </template> | 648 | </template> |
| @@ -732,44 +738,31 @@ onMounted(() => { | @@ -732,44 +738,31 @@ onMounted(() => { | ||
| 732 | <template #append>㎡</template> | 738 | <template #append>㎡</template> |
| 733 | </el-input> | 739 | </el-input> |
| 734 | </el-form-item> | 740 | </el-form-item> |
| 735 | - <!-- <el-form-item label="缴费状态"> | ||
| 736 | - <el-select | ||
| 737 | - v-model="form.data.payStatus" | ||
| 738 | - placeholder="缴费状态" | ||
| 739 | - clearable | ||
| 740 | - > | ||
| 741 | - <el-option | ||
| 742 | - v-for="(item, index) in statusData" | ||
| 743 | - :label="item.label" | ||
| 744 | - :value="item.value" | ||
| 745 | - ></el-option> | ||
| 746 | - </el-select> | ||
| 747 | - </el-form-item> --> | ||
| 748 | <el-form-item label="费用周期"> | 741 | <el-form-item label="费用周期"> |
| 749 | - <el-date-picker | 742 | + <!-- <el-date-picker |
| 750 | v-model="form.data.period" | 743 | v-model="form.data.period" |
| 751 | type="datetimerange" | 744 | type="datetimerange" |
| 745 | + format="YYYY-MM" | ||
| 752 | range-separator="至" | 746 | range-separator="至" |
| 753 | - format="YYYY-MM-DD HH:mm:ss" | ||
| 754 | - value-format="YYYY-MM-DD HH:mm:ss" | ||
| 755 | start-placeholder="开始时间" | 747 | start-placeholder="开始时间" |
| 756 | end-placeholder="结束时间" | 748 | end-placeholder="结束时间" |
| 757 | @change="handleTimeChange($event, 'form')" | 749 | @change="handleTimeChange($event, 'form')" |
| 758 | - > | ||
| 759 | - </el-date-picker> | 750 | + > --> |
| 751 | + <!-- </el-date-picker> --> | ||
| 752 | + <el-date-picker | ||
| 753 | + v-model="form.data.period" | ||
| 754 | + type="monthrange" | ||
| 755 | + range-separator="至" | ||
| 756 | + @change="handleTimeChange($event, 'form')" | ||
| 757 | + start-placeholder="开始时间" | ||
| 758 | + end-placeholder="结束时间" | ||
| 759 | + /> | ||
| 760 | </el-form-item> | 760 | </el-form-item> |
| 761 | <el-form-item label="待缴金额" prop="totalFee"> | 761 | <el-form-item label="待缴金额" prop="totalFee"> |
| 762 | <el-input v-model="form.data.totalFee" placeholder="待缴金额"> | 762 | <el-input v-model="form.data.totalFee" placeholder="待缴金额"> |
| 763 | <template #append>元</template> | 763 | <template #append>元</template> |
| 764 | </el-input> | 764 | </el-input> |
| 765 | </el-form-item> | 765 | </el-form-item> |
| 766 | - <!-- <el-form-item label="缴费日期"> | ||
| 767 | - <el-date-picker | ||
| 768 | - v-model="form.data.payTime" | ||
| 769 | - type="datetime" | ||
| 770 | - placeholder="缴费日期" | ||
| 771 | - /> | ||
| 772 | - </el-form-item> --> | ||
| 773 | </el-form> | 766 | </el-form> |
| 774 | <template #footer> | 767 | <template #footer> |
| 775 | <span class="dialog-footer"> | 768 | <span class="dialog-footer"> |