aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '账单明细查询简化接口替换' (#149) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/149
This commit is contained in:
wuteng 2025-11-25 16:50:37 +08:00
commit 902a3048e7
10 changed files with 21 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/emis/emisSettlePayRecord.js
View File

@ -16,6 +16,14 @@ export function getSettlePayStatInfoMap(query) {
params: query
})
}
// 查询账单收退款记录简化列表
export function listEmisSettlePayRecordSimple(query) {
return request({
url: '/emis/emisSettlePayRecord/listSimple',
method: 'get',
params: query
})
}
// 统计收款记录明细

6
src/views/emis/emisSettleBill/PayBackStat/PayDayRecordList.vue
View File

@ -100,7 +100,7 @@
</template>
<script>
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import { listEmisSettlePayRecordSimple, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import emisSettlePayRecordForm from '@/views/emis/emisSettlePayRecord/emisSettlePayRecordForm';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
@ -259,7 +259,7 @@ export default {
let qParam=this.initQueryParams();
this.loading = true;
listEmisSettlePayRecord(qParam).then(response => {
listEmisSettlePayRecordSimple(qParam).then(response => {
this.emisSettlePayRecordList = response.rows;
this.total = response.total;
this.loading = false;
@ -430,7 +430,7 @@ export default {
let qExportParam={...this.queryParams};
qExportParam.pageNum=1;
qExportParam.pageSize=20000;
listEmisSettlePayRecord(qExportParam).then(response => {
listEmisSettlePayRecordSimple(qExportParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}

50
src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue
View File

@ -8,9 +8,6 @@
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('序号')" align="center" type="index" width="50" />
@ -68,7 +65,7 @@
</template>
<script>
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord,payRecordReturn } from "@/api/emis/emisSettlePayRecord";
import { getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord,payRecordReturn } from "@/api/emis/emisSettlePayRecord";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import PayRecordSubBillRelList from '@/views/emis/emisSettlePayRecord/panel/PayRecordSubBillRelList.vue';
@ -171,57 +168,12 @@ export default {
watch: {
settleBillNo(newVal){
this.queryParams.settleBillNo=this.settleBillNo;
this.getList();
}
},
created() {
this.queryParams.settleBillNo=this.settleBillNo;
// this.getList();
},
methods: {
/** 查询账单收退款记录列表 */
getList() {
this.loading = true;
listEmisSettlePayRecord(this.queryParams).then(response => {
this.emisSettlePayRecordList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handlePayRecordReturn(row){
const id = row.id;
this.$modal.confirm('是否撤销收款').then(function() {
return payRecordReturn(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1

28
src/views/emis/emisSettlePayRecord/emisSettlePayRecordForm.vue
View File

@ -237,7 +237,7 @@
</template>
<script>
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import { getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
export default {
name: "emisSettlePayRecordForm",
@ -368,32 +368,6 @@ export default {
}
});
},
// /** 转换菜单数据结构 */
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisSettlePayRecord(queryParams).then(response => {
// this.emisSettlePayRecordOptions = [];
// const rootItem = { idId: 0, emisSettlePayRecordName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisSettlePayRecordOptions.push(rootItem);
// if(this.parentId != undefined) {
// this.form.parentId = this.parentId;
// }
// });
// },
}
};
</script>

2
src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue
View File

@ -135,7 +135,7 @@ import { getInfoBySettleBillNo,getWxPayQrCode,checkCanOnlinePay} from "@/api/emi
import {listEmisSettleSubBill,listHasPayMap} from "@/api/emis/emisSettleSubBill";
import shortLogoImg from '@/assets/logo/short_logo.png'
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import { getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import { parseTime } from "@/utils/custom";

2
src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue
View File

@ -391,7 +391,7 @@
import { getInfoBySettleBillNo} from "@/api/emis/emisSettleBill";
import {listEmisSettleSubBill,listHasPayMap} from "@/api/emis/emisSettleSubBill";
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import { getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';

2
src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
View File

@ -257,7 +257,7 @@
<script>
import { getInfoBySettleBillNo} from "@/api/emis/emisSettleBill";
import {listEmisSettleSubBill,listHasPayMap} from "@/api/emis/emisSettleSubBill";
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import { getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';

2
src/views/emis/emisSettlePayRecord/panel/PayRecordInputByMerge.vue
View File

@ -206,7 +206,7 @@
<script>
import { getInfoBySettleBillNo} from "@/api/emis/emisSettleBill";
import {listEmisSettleSubBill,listHasPayMap} from "@/api/emis/emisSettleSubBill";
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import { getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';

4
src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
View File

@ -122,7 +122,7 @@
</template>
<script>
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord,payRecordReturn } from "@/api/emis/emisSettlePayRecord";
import { listEmisSettlePayRecordSimple, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord,payRecordReturn } from "@/api/emis/emisSettlePayRecord";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import PayRecordSubBillRelList from '@/views/emis/emisSettlePayRecord/panel/PayRecordSubBillRelList.vue';
@ -234,7 +234,7 @@ export default {
/** 查询账单收退款记录列表 */
getList() {
this.loading = true;
listEmisSettlePayRecord(this.queryParams).then(response => {
listEmisSettlePayRecordSimple(this.queryParams).then(response => {
this.emisSettlePayRecordList = response.rows;
this.total = response.total;
this.loading = false;

4
src/views/emis/emisSettlePayRecord/panel/PayRecordListOnly.vue
View File

@ -56,7 +56,7 @@
</template>
<script>
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import { listEmisSettlePayRecordSimple, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
export default {
@ -167,7 +167,7 @@ export default {
/** 查询账单收退款记录列表 */
getList() {
this.loading = true;
listEmisSettlePayRecord(this.queryParams).then(response => {
listEmisSettlePayRecordSimple(this.queryParams).then(response => {
this.emisSettlePayRecordList = response.rows;
this.total = response.total;
this.loading = false;