From 4108da903e7944df37497f8755914866a4d3b4cd Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 31 Oct 2024 17:58:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BD=95=E5=8D=95?= =?UTF-8?q?=E5=BC=80=E5=8D=95=E5=90=8D=E7=A7=B0=E5=AD=97=E6=95=B0=E9=99=90?= =?UTF-8?q?=E5=88=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AF=B9=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SelectBox/SelectBox.vue | 1 + src/components/tablecmt/tablecmt.vue | 8 +- .../finance/ReconciliationDepositSlip.js | 94 ++++++++++++++----- .../distribution/artery/abnormalList.vue | 6 +- 4 files changed, 78 insertions(+), 31 deletions(-) diff --git a/src/components/SelectBox/SelectBox.vue b/src/components/SelectBox/SelectBox.vue index fe2584ee..4c95168f 100644 --- a/src/components/SelectBox/SelectBox.vue +++ b/src/components/SelectBox/SelectBox.vue @@ -9,6 +9,7 @@ @change="handleChange" :clearable="props.clearable !== false" :disabled="props.disabled === true" + :maxlength="30" >
{ console.log('props.columnListName :>> ', props.columnListName); - postSaveTableSeting({ - tableKey: $route.path + props.columnListName, - tableSetCongig: JSON.stringify(props.columnList), - }); + // postSaveTableSeting({ + // tableKey: $route.path + props.columnListName, + // tableSetCongig: JSON.stringify(props.columnList), + // }); }; defineExpose({ handleCheckSelect, handleClearSelect }); diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js index d074aa26..02c54fd5 100644 --- a/src/option/finance/ReconciliationDepositSlip.js +++ b/src/option/finance/ReconciliationDepositSlip.js @@ -114,18 +114,18 @@ export const columnList = [ width: '150', checkarr: [ { - label:'商配', - value:1 - }, - { - label:'市配', - value:2 - }, - { - label:'自提', - value:3 - }, - ], + label: '商配', + value: 1, + }, + { + label: '市配', + value: 2, + }, + { + label: '自提', + value: 3, + }, + ], fixed: false, sortable: true, head: false, @@ -152,6 +152,28 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'goodsNum', + label: '品类件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'goodsPrice', + label: '品类单价', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'totalNum', label: '总件数', @@ -726,18 +748,18 @@ export const columnListB = [ width: '150', checkarr: [ { - label:'商配1', - value:1 - }, - { - label:'市配', - value:2 - }, - { - label:'自提', - value:3 - }, - ], + label: '商配1', + value: 1, + }, + { + label: '市配', + value: 2, + }, + { + label: '自提', + value: 3, + }, + ], fixed: false, sortable: true, head: false, @@ -764,6 +786,28 @@ export const columnListB = [ sortable: true, head: false, }, + { + prop: 'goodsNum', + label: '品类件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'goodsPrice', + label: '品类单价', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'totalNum', label: '总件数', @@ -1291,4 +1335,4 @@ export const confirmColumnList = [ head: false, isshowSummary: true, }, -]; \ No newline at end of file +]; diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue index ca11436d..95968d3e 100644 --- a/src/views/distribution/artery/abnormalList.vue +++ b/src/views/distribution/artery/abnormalList.vue @@ -159,7 +159,9 @@ :align-center="true" v-model="details.popUpShow.abnormalVisited" > -
包条码 （{{ details.abnormalInfo.orderPackageCode }}）
+
+ 包条码 （{{ details.abnormalInfo.orderPackageCode }}） +
@@ -158,7 +164,7 @@ import { getopenOrderAdvancePageList, postOpenOrderFreezeByAdvanceIds, } from '@/api/waybill/TemporaryStorageList'; -import { postPageList } from '@/api/finance/CustomerSettlement'; +import { postPageList, postEnterBalance } from '@/api/finance/CustomerSettlement'; import { downloadXls, setNodeHeight, @@ -242,8 +248,6 @@ const details = reactive({ pageSize: 30, total: 0, }, - /** 列表Dom节点 */ - listNode: '', form: {}, }); @@ -251,25 +255,13 @@ const tableNodeRef = ref(); const { search, query, shortcuts, selectionList, drawerShow, page, defaultTime2 } = toRefs(details); -/** vuex */ -const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList'])); -console.log('permission :>> ', permission); - -onMounted(() => { - const timer = setTimeout(() => { - details.listNode = document.querySelector('.maboxhi'); - details.listNode.style.transition = 'all .5s ease-out'; - clearTimeout(timer); - }, 100); -}); - /** 请求页面数据 */ const onLoad = async (params = {}) => { try { // 开启列表loading动画 details.loadingObj.list = true; const queryCopy = { ...details.query }; - await TimeProcessing(queryCopy); + TimeProcessing(queryCopy); const submitData = { ...queryCopy, ...params, ...details.page }; // 获取暂存单列表 const res = await postPageList(submitData); @@ -409,6 +401,25 @@ const ViewTransactionInformation = ({ row }) => { query: { balanceOrderInfoId: row.id, backPath: '/finance/CustomerSettlement' }, }); }; + +const handleConfirmCustomer = ({ row }) => { + ElMessageBox.confirm(`【 ${row.balanceOrderNo} 】 确认结算`, '提示', { + type: 'warning', + }).then(async () => { + try { + details.loadingObj.pageLoading = true; + const res = await postEnterBalance({ balanceOrderInfoId: row.id }); + const { code, msg } = res.data; + if (code !== 200) return; + msg && ElMessage.success(msg); + onLoad(); + } catch (error) { + console.log('error :>> ', error); + } finally { + details.loadingObj.pageLoading = false; + } + }); +};