|
|
|
@ -77,11 +77,27 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</basic-container> |
|
|
|
</basic-container> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 订单详情 --> |
|
|
|
|
|
|
|
<el-dialog v-model="details.popUpShow.orderVisted" width="70%" title="订单详情"> |
|
|
|
|
|
|
|
<tablecmt |
|
|
|
|
|
|
|
ref="orderTableNodeRef" |
|
|
|
|
|
|
|
:columnList="details.orderInfo.columnList" |
|
|
|
|
|
|
|
:tableData="details.orderInfo.data" |
|
|
|
|
|
|
|
:loading="details.loadingObj.orderList" |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
|
|
|
<el-text @click="()=> handleRemoveOrder(slotProps.scope)"> |
|
|
|
|
|
|
|
移 除 |
|
|
|
|
|
|
|
</el-text> |
|
|
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
</tablecmt> |
|
|
|
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 列表配置显示 --> |
|
|
|
<!-- 列表配置显示 --> |
|
|
|
<edittablehead |
|
|
|
<edittablehead |
|
|
|
@closce="showdrawer" |
|
|
|
@closce="showdrawer" |
|
|
|
:drawerShow="drawerShow" |
|
|
|
:drawerShow="drawerShow" |
|
|
|
v-model="details.columnList1" |
|
|
|
v-model="details.columnList" |
|
|
|
></edittablehead> |
|
|
|
></edittablehead> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
@ -92,7 +108,13 @@ import dayjs from 'dayjs'; |
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
/** 获取字典 */ |
|
|
|
/** 获取字典 */ |
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
import { postPageReconciliationList, postCheckBalance,postFindOrderDetail } from '@/api/finance/MerchantDepositSlip'; |
|
|
|
import { |
|
|
|
|
|
|
|
postPageReconciliationList, |
|
|
|
|
|
|
|
postCheckBalance, |
|
|
|
|
|
|
|
postFindOrderDetail, |
|
|
|
|
|
|
|
postCancleOrderInfoBindReconcilitionOrder, |
|
|
|
|
|
|
|
postReconciliationListExport |
|
|
|
|
|
|
|
} from '@/api/finance/MerchantDepositSlip'; |
|
|
|
import { |
|
|
|
import { |
|
|
|
downloadXls, |
|
|
|
downloadXls, |
|
|
|
setNodeHeight, |
|
|
|
setNodeHeight, |
|
|
|
@ -102,7 +124,7 @@ import { |
|
|
|
handleSelectQuery, |
|
|
|
handleSelectQuery, |
|
|
|
handleTranslationDataSeclect, |
|
|
|
handleTranslationDataSeclect, |
|
|
|
} from '@/utils/util'; |
|
|
|
} from '@/utils/util'; |
|
|
|
import { columnList } from '@/option/finance/MerchantDepositSlip'; |
|
|
|
import { columnList, orderColumnList } from '@/option/finance/MerchantDepositSlip'; |
|
|
|
import { useRouter } from 'vue-router'; |
|
|
|
import { useRouter } from 'vue-router'; |
|
|
|
import { deepClone } from '@/utils/util'; |
|
|
|
import { deepClone } from '@/utils/util'; |
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'; |
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'; |
|
|
|
@ -154,6 +176,7 @@ const details = reactive<any>({ |
|
|
|
/** 列表加载loading */ |
|
|
|
/** 列表加载loading */ |
|
|
|
list: false, |
|
|
|
list: false, |
|
|
|
pageLoading: false, |
|
|
|
pageLoading: false, |
|
|
|
|
|
|
|
orderList: false |
|
|
|
}, |
|
|
|
}, |
|
|
|
/** 列表复选框选中的数据 */ |
|
|
|
/** 列表复选框选中的数据 */ |
|
|
|
selectionList: [], |
|
|
|
selectionList: [], |
|
|
|
@ -166,12 +189,19 @@ const details = reactive<any>({ |
|
|
|
total: 0, |
|
|
|
total: 0, |
|
|
|
}, |
|
|
|
}, |
|
|
|
form: {}, |
|
|
|
form: {}, |
|
|
|
/** 页面激活状态 : 1 -- toB; 2 -- toC */ |
|
|
|
popUpShow: { |
|
|
|
pageStatus: 1 as 1 | 2, |
|
|
|
orderVisted: false |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
orderInfo: { |
|
|
|
|
|
|
|
reconciliationOrderId: '', |
|
|
|
|
|
|
|
data: [], |
|
|
|
|
|
|
|
query: {}, |
|
|
|
|
|
|
|
columnList: deepClone(orderColumnList) |
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
const tableNodeRef1 = ref(); |
|
|
|
const tableNodeRef1 = ref(); |
|
|
|
const tableNodeRef2 = ref(); |
|
|
|
const orderTableNodeRef = ref(); |
|
|
|
|
|
|
|
|
|
|
|
const { search, shortcuts, selectionList, drawerShow, page } = toRefs(details); |
|
|
|
const { search, shortcuts, selectionList, drawerShow, page } = toRefs(details); |
|
|
|
|
|
|
|
|
|
|
|
@ -182,9 +212,7 @@ console.log('permission :>> ', permission); |
|
|
|
onMounted(async () => { |
|
|
|
onMounted(async () => { |
|
|
|
await nextTick(); |
|
|
|
await nextTick(); |
|
|
|
|
|
|
|
|
|
|
|
const node = details.pageStatus === 1 ? tableNodeRef1.value.$el : tableNodeRef2.value.$el; |
|
|
|
setNodeHeight(tableNodeRef1.value.$el , '', true); |
|
|
|
|
|
|
|
|
|
|
|
setNodeHeight(node, '', true); |
|
|
|
|
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
/** 请求页面数据 */ |
|
|
|
/** 请求页面数据 */ |
|
|
|
@ -304,7 +332,7 @@ const handleConfirm = () => { |
|
|
|
const value = details.selectionList[index]; |
|
|
|
const value = details.selectionList[index]; |
|
|
|
|
|
|
|
|
|
|
|
if (Number(value.confirmStatisticsOrder) === 1) _errorArr.push(value.orderNo); |
|
|
|
if (Number(value.confirmStatisticsOrder) === 1) _errorArr.push(value.orderNo); |
|
|
|
_arr.push(value.orderInfoId); |
|
|
|
_arr.push(value.id); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (_errorArr.length > 0) |
|
|
|
if (_errorArr.length > 0) |
|
|
|
@ -341,11 +369,24 @@ const handleExport = () => { |
|
|
|
confirmButtonText: '确定', |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning', |
|
|
|
type: 'warning', |
|
|
|
}).then(() => { |
|
|
|
}).then(async() => { |
|
|
|
ElMessage({ |
|
|
|
try { |
|
|
|
type: 'success', |
|
|
|
details.loadingObj.pageLoading = true |
|
|
|
message: '导出成功!', |
|
|
|
|
|
|
|
}); |
|
|
|
const submitData= {...details.query} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const res = await postReconciliationListExport(submitData) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const {status, data} = res |
|
|
|
|
|
|
|
if (status !== 200) return |
|
|
|
|
|
|
|
downloadXls(data, '对账单数据.xlsx') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ElMessage.success('导出成功!'); |
|
|
|
|
|
|
|
} catch (error) { |
|
|
|
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
|
|
|
}finally{ |
|
|
|
|
|
|
|
details.loadingObj.pageLoading = false |
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -368,12 +409,53 @@ const ViewOrderList =async ({row})=>{ |
|
|
|
|
|
|
|
|
|
|
|
const {code, data} = res.data |
|
|
|
const {code, data} = res.data |
|
|
|
if (code !== 200) return |
|
|
|
if (code !== 200) return |
|
|
|
|
|
|
|
details.orderInfo.reconciliationOrderId = row.id |
|
|
|
|
|
|
|
details.orderInfo.data = data || [] |
|
|
|
|
|
|
|
details.popUpShow.orderVisted = true |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
await nextTick() |
|
|
|
|
|
|
|
setNodeHeight(orderTableNodeRef.value.$el, '60vh') |
|
|
|
} catch (error) { |
|
|
|
} catch (error) { |
|
|
|
console.log('error :>> ', error); |
|
|
|
console.log('error :>> ', error); |
|
|
|
}finally{ |
|
|
|
}finally{ |
|
|
|
details.loadingObj.pageLoading = false |
|
|
|
details.loadingObj.pageLoading = false |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** 移除订单 */ |
|
|
|
|
|
|
|
const handleRemoveOrder = ({row}) => { |
|
|
|
|
|
|
|
ElMessageBox.confirm('是否确认移除?', '提示', { |
|
|
|
|
|
|
|
confirmButtonText: '确定', |
|
|
|
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
|
|
|
type: 'warning', |
|
|
|
|
|
|
|
}).then(async() => { |
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
details.loadingObj.orderList = true |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const submitData= {reconciliationOrderId: details.orderInfo.reconciliationOrderId, orderInfoIds: [row.orderInfoId]} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const res = await postCancleOrderInfoBindReconcilitionOrder(submitData) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const {code, msg} = res.data |
|
|
|
|
|
|
|
if (code !== 200) return |
|
|
|
|
|
|
|
ElMessage.success(msg) |
|
|
|
|
|
|
|
onLoad() |
|
|
|
|
|
|
|
const resp = await postFindOrderDetail({ reconciliationOrderId: details.orderInfo.reconciliationOrderId }) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const {code: code1,data: data1} = resp.data |
|
|
|
|
|
|
|
if (code1 !== 200) return |
|
|
|
|
|
|
|
details.orderInfo.data = data1 || [] |
|
|
|
|
|
|
|
if (details.orderInfo.data.length === 0) details.popUpShow.orderVisted = false |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (error) { |
|
|
|
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
|
|
|
} finally { |
|
|
|
|
|
|
|
details.loadingObj.orderList = false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
</script> |
|
|
|
</script> |
|
|
|
|
|
|
|
|
|
|
|
<style scoped lang="scss"> |
|
|
|
<style scoped lang="scss"> |
|
|
|
|
