From 577996dc0330e27e337c845376b11c3ea4522b88 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Mon, 27 May 2024 18:47:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/finance/MerchantDepositSlip.js | 14 + src/api/finance/WaybillAudit.js | 5 + src/option/finance/MerchantDepositSlip.js | 237 +++---- .../artery/directGoMarketDetails.vue | 10 +- .../artery/zeroAdditionalRecording.vue | 23 +- .../distribution/inventory/BookingNote.vue | 21 +- .../distribution/inventory/CreateOrder.vue | 24 +- src/views/finance/MerchantDepositSlip.vue | 382 +++++++---- src/views/finance/TransactionInformation.vue | 627 ++++++++---------- src/views/waybill/CreateZeroOrder.vue | 24 +- 10 files changed, 762 insertions(+), 605 deletions(-) create mode 100644 src/api/finance/MerchantDepositSlip.js diff --git a/src/api/finance/MerchantDepositSlip.js b/src/api/finance/MerchantDepositSlip.js new file mode 100644 index 00000000..c867eab5 --- /dev/null +++ b/src/api/finance/MerchantDepositSlip.js @@ -0,0 +1,14 @@ +import request from '@/axios'; + +/** + * 获取运单对账单数据 + * @param {*} data + * @returns + */ +export const postPageList = data => { + return request({ + url: '/api/logpm-statisticsdata-zhy/merchantStatistics/pageList', + method: 'post', + data, + }); +}; diff --git a/src/api/finance/WaybillAudit.js b/src/api/finance/WaybillAudit.js index 27162755..2d26837d 100644 --- a/src/api/finance/WaybillAudit.js +++ b/src/api/finance/WaybillAudit.js @@ -1,5 +1,10 @@ import request from '@/axios'; +/** + * 查询运单审核数据 + * @param {*} data + * @returns + */ export const postPageFinanceWaybillList = data => { return request({ url: '/api/logpm-warehouse/warehouseWaybill/pageFinanceWaybillList', diff --git a/src/option/finance/MerchantDepositSlip.js b/src/option/finance/MerchantDepositSlip.js index 248834e1..c83015d3 100644 --- a/src/option/finance/MerchantDepositSlip.js +++ b/src/option/finance/MerchantDepositSlip.js @@ -37,7 +37,7 @@ export const columnList = [ head: false, }, { - prop: 'orderCode', + prop: 'orderNo', label: '订单编号', type: 1, values: '', @@ -48,7 +48,7 @@ export const columnList = [ head: false, }, { - prop: 'createTime', + prop: 'shipper', label: '发货单位', type: 1, values: '', @@ -59,7 +59,7 @@ export const columnList = [ head: false, }, { - prop: 'userName', + prop: 'consignee', label: '收货单位', type: 1, values: '', @@ -69,30 +69,30 @@ export const columnList = [ sortable: true, head: false, }, + // { + // prop: 'templateType', + // label: '运单类型', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'templateType', + // label: '服务类型', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { - prop: 'templateType', - label: '运单类型', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', - label: '服务类型', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', + prop: 'waybillStatus', label: '运单状态', type: 1, values: '', @@ -102,19 +102,19 @@ export const columnList = [ sortable: true, head: false, }, + // { + // prop: 'templateType', + // label: '运单标识', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { - prop: 'templateType', - label: '运单标识', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', + prop: 'openTime', label: '开单时间', type: 1, values: '', @@ -125,7 +125,7 @@ export const columnList = [ head: false, }, { - prop: 'templateType', + prop: 'goodsName', label: '货物品类', type: 1, values: '', @@ -135,30 +135,30 @@ export const columnList = [ sortable: true, head: false, }, + // { + // prop: 'templateType', + // label: '品类件数', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'templateType', + // label: '品类数', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { - prop: 'templateType', - label: '品类件数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', - label: '品类数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', + prop: 'totalcount', label: '总件数', type: 1, values: '', @@ -169,7 +169,7 @@ export const columnList = [ head: false, }, { - prop: 'templateType', + prop: 'totalWeight', label: '总重量', type: 1, values: '', @@ -180,7 +180,7 @@ export const columnList = [ head: false, }, { - prop: 'templateType', + prop: 'totalVolume', label: '总体积', type: 1, values: '', @@ -191,7 +191,7 @@ export const columnList = [ head: false, }, { - prop: 'templateType', + prop: 'openFee', label: '开单总费用', type: 1, values: '', @@ -201,9 +201,53 @@ export const columnList = [ sortable: true, head: false, }, + // { + // prop: 'templateType', + // label: '预对账金额', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'templateType', + // label: '干线品类单价', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'templateType', + // label: '仓储品类单价', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'templateType', + // label: '配送品类单价', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { - prop: 'templateType', - label: '预对账金额', + prop: 'pickupFee', + label: '开单提货费', type: 1, values: '', width: '150', @@ -213,52 +257,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '干线品类单价', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', - label: '仓储品类单价', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', - label: '配送品类单价', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', - label: '提货费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', - label: '干线费', + prop: 'realPickupFee', + label: '实际提货费', type: 1, values: '', width: '150', @@ -267,6 +267,17 @@ export const columnList = [ sortable: true, head: false, }, + // { + // prop: 'templateType', + // label: '干线费', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'templateType', label: '在库周期', diff --git a/src/views/distribution/artery/directGoMarketDetails.vue b/src/views/distribution/artery/directGoMarketDetails.vue index a11b7c24..dea53cf0 100644 --- a/src/views/distribution/artery/directGoMarketDetails.vue +++ b/src/views/distribution/artery/directGoMarketDetails.vue @@ -167,11 +167,11 @@ background @size-change="size => sizeChange(size, 2)" @current-change="current => currentChange(current, 2)" - :current-page="page.pageNum" + :current-page="details.detailsInfo.page.pageNum" :page-sizes="[30, 50, 80, 120]" - :page-size="page.pageSize" + :page-size="details.detailsInfo.page.pageSize" layout="total, sizes, prev, pager, next, jumper" - :total="page.total" + :total="details.detailsInfo.page.total" > @@ -614,7 +614,7 @@ const onLoadDetails = async (params = {} as any) => { // 请求页面数据 const res = await postFindSignOrderDetailList({ - ...details.page, + ...details.detailsInfo.page, ...details.query, signOrderId: details.showDetailsSiginOrder.id, ...params, @@ -633,7 +633,7 @@ const onLoadDetails = async (params = {} as any) => { initData('isSupple', iterator); } - details.page.total = data.total; + details.detailsInfo.page.total = data.total; } catch (error) { console.log('error :>> ', error); } finally { diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue index 6e41f83f..2db4bb04 100644 --- a/src/views/distribution/artery/zeroAdditionalRecording.vue +++ b/src/views/distribution/artery/zeroAdditionalRecording.vue @@ -405,7 +405,7 @@ const onLoad = debounce(async (params = {}) => { try { details.loadingObj.oldListLoading = true; const submitData = { - ...details.page, + ...details.oldPage, ...details.oldQuery, orderCodes: details.orderCodeList, ...params, @@ -417,7 +417,9 @@ const onLoad = debounce(async (params = {}) => { if (code !== 200) return; details.oldData = data.records; - details.page.total = data.total; + details.oldPage.total = data.total; + + handleFilterData(); } catch (error) { console.log('error :>> ', error); } finally { @@ -437,7 +439,7 @@ const searchChange = () => { const searchReset = () => { details.query = {}; details.stockupDate = []; - details.page.pageNum = 1; + details.oldPage.pageNum = 1; onLoad(); }; @@ -580,7 +582,7 @@ const newSelectionChange = (list: any) => { /** 每页数量改变执行的回调 */ const sizeChange = (pageSize: number) => { - details.page.pageSize = pageSize; + details.oldPage.pageSize = pageSize; onLoad(); }; @@ -628,7 +630,7 @@ const handleAddWaybill = () => { ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]), ]; - details.page.pageNum = 1; + details.oldPage.pageNum = 1; onLoad(); } }; @@ -639,6 +641,9 @@ const handleRemoveWaybill = () => { details.newData = details.newData.filter((val, index) => { const _flag = !details.newSelectionList.includes(val); + + console.log('_flag :>> ', _flag); + console.log('details.orderCodeList :>> ', details.orderCodeList); if (!_flag) { const _code = val.orderCode + ',' + val.waybillNo; const _index = details.orderCodeList.indexOf(_code); @@ -648,7 +653,9 @@ const handleRemoveWaybill = () => { return _flag; }); - details.page.pageNum = 1; + handleFilterData() + + details.oldPage.pageNum = 1; onLoad(); }; @@ -657,7 +664,7 @@ const handleRefresh = () => { details.newData = []; details.newSelectionList = []; details.orderCodeList = []; - details.page.pageNum = 1; + details.oldPage.pageNum = 1; onLoad(); }; @@ -686,7 +693,7 @@ const handleAdd = (warehouseName, finalNodeId) => { ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]), ]; - details.page.pageNum = 1; + details.oldPage.pageNum = 1; onLoad(); details.showPopUpObj.editNodeIdDialogVisible = false; diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue index 9ba0fd18..d5ecac8f 100644 --- a/src/views/distribution/inventory/BookingNote.vue +++ b/src/views/distribution/inventory/BookingNote.vue @@ -1828,13 +1828,26 @@ const handlePrint = async () => { const { code, data } = res.data; if (code !== 200 || !data || data.length === 0) return; - let _html = ''; - for (let i = 0; i < data.length; i++) { - const value = data[i]; + if (getObjType(data) !== 'object') return; + + for (const key in data) { + const element = data[key]; + + for (let i = 0; i < element.length; i++) { + const value = element[i]; - _html += JSON.parse(JSON.stringify(value.templateHtml)); + let template = value.templateHtml; + + console.log('value.templateHtml :>> ', value.templateHtml); + + template = template.replace('第n页', `第${i + 1}页`); + template = template.replace('共n页', `共${element.length}页`); + template = template.replaceAll('0.00', ``); + + _html += JSON.parse(JSON.stringify(template)); + } } console.log('res :>> ', res); diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 1753d82e..b40cc930 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -1329,6 +1329,8 @@ const details = reactive({ /** 回付 */ huiPay: 0, huilaiPay: 0, + /** 回扣 */ + rebate: 0, /** 三方操作费 */ thirdOperationFee: 0, /** 送货方式 */ @@ -2647,7 +2649,7 @@ const handleTrunkLinePrice = (trunkLine, template) => { for (let i = 0; i < details.goodsList.length; i++) { const value = details.goodsList[i]; - if (value.subtotalFreight) _total += computeNumber(_total, '+', value.subtotalFreight).result; + if (value.subtotalFreight) _total = computeNumber(_total, '+', value.subtotalFreight).result; } // 是否存在最低计费 @@ -3344,10 +3346,24 @@ const handlePrint = async () => { let _html = ''; - for (let i = 0; i < data.length; i++) { - const value = data[i]; + if (getObjType(data) !== 'object') return; - _html += JSON.parse(JSON.stringify(value.templateHtml)); + for (const key in data) { + const element = data[key]; + + for (let i = 0; i < element.length; i++) { + const value = element[i]; + + let template = value.templateHtml; + + console.log('value.templateHtml :>> ', value.templateHtml); + + template = template.replace('第n页', `第${i + 1}页`); + template = template.replace('共n页', `共${element.length}页`); + template = template.replaceAll('0.00', ``); + + _html += JSON.parse(JSON.stringify(template)); + } } console.log('res :>> ', res); diff --git a/src/views/finance/MerchantDepositSlip.vue b/src/views/finance/MerchantDepositSlip.vue index d4182a43..67d8faab 100644 --- a/src/views/finance/MerchantDepositSlip.vue +++ b/src/views/finance/MerchantDepositSlip.vue @@ -1,98 +1,207 @@ @@ -115,6 +224,7 @@ import { getopenOrderAdvancePageList, postOpenOrderFreezeByAdvanceIds, } from '@/api/waybill/TemporaryStorageList'; +import { postPageList } from '@/api/finance/MerchantDepositSlip'; import { downloadXls, setNodeHeight, @@ -135,7 +245,10 @@ const details = reactive({ /** 是否开启搜索 */ search: true, /** 表格搜索条件 */ - query: {}, + /** toB */ + query1: {}, + /** toC */ + query2: {}, /** 时间快捷选择设置 */ shortcuts: [ { @@ -169,7 +282,10 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList: deepClone(columnList), + /** toB */ + columnList1: deepClone(columnList), + /** toC */ + columnList2: deepClone(columnList), /** 列表数据 */ data: [], /** 页面loading */ @@ -184,29 +300,30 @@ const details = reactive({ drawerShow: false, /** 分页参数 */ page: { - currentPage: 1, + pageNum: 1, pageSize: 30, total: 0, }, - /** 列表Dom节点 */ - listNode: '', form: {}, + /** 页面激活状态 : 1 -- toB; 2 -- toC */ + pageStatus: 1 as 1 | 2, }); -const tableNodeRef = ref(); +const tableNodeRef1 = ref(); +const tableNodeRef2 = ref(); -const { search, query, shortcuts, stockupDate, selectionList, drawerShow, page } = toRefs(details); +const { search, shortcuts, stockupDate, selectionList, drawerShow, page } = 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); +onMounted(async () => { + await nextTick(); + + const node = details.pageStatus === 1 ? tableNodeRef1.value.$el : tableNodeRef2.value.$el; + + setNodeHeight(node, '', true); }); /** 请求页面数据 */ @@ -215,8 +332,12 @@ const onLoad = async (params = {}) => { // 开启列表loading动画 details.loadingObj.list = true; + const submitData = { ...details.query, ...params, ...details.page }; + // listType 1 -- toB ; 2 -- toC + submitData.listType = details.pageStatus; + // 获取暂存单列表 - const res = await getopenOrderAdvancePageList(details.page, { ...details.query, ...params }); + const res = await postPageList(submitData); console.log('res :>> ', res); const { code, data } = res.data; if (code !== 200) return; @@ -246,10 +367,11 @@ const searchChange = () => { /** 清空表单 */ const searchReset = () => { - details.query = {}; + // details.query = {}; + details.pageStatus === 1 ? (details.query1 = {}) : (details.query2 = {}); details.stockupDate = []; - details.page.currentPage = 1; - handleClearTableQuery(details.columnList); + details.page.pageNum = 1; + handleClearTableQuery(details.pageStatus === 1 ? details.columnList1 : details.columnList2); initOnLoad(); }; @@ -262,12 +384,14 @@ const showdrawer = (_flag?: boolean) => { const searchHide = () => { details.search = !details.search; - setNodeHeight(tableNodeRef.value.$el, '', true); + const node = details.pageStatus === 1 ? tableNodeRef1.value.$el : tableNodeRef2.value.$el; + + setNodeHeight(node, '', true); }; /** 表格表头输入框搜索 */ const inputsc = (index, col) => { - handleInputQuery(index, col, details.query); + handleInputQuery(index, col, details.pageStatus === 1 ? details.query1 : details.query2); initOnLoad(); }; @@ -286,7 +410,7 @@ const timesc = (index, row) => { /** 表格表头下拉框选择 */ const selectsc = (index, colors) => { - handleSelectQuery(index, colors, details.query); + handleSelectQuery(index, colors, details.pageStatus === 1 ? details.query1 : details.query2); initOnLoad(); }; @@ -307,12 +431,32 @@ const currentChange = pageNum => { onLoad(); }; -/** 批量审核 */ -const handleAudit = () => { - if (details.selectionList.length === 0) { - ElMessage.warning('请选择要审核的单据'); - return; - } +const handleClickTab = async e => { + console.log('e :>> ', e); + + await nextTick(); + + const node = details.pageStatus === 1 ? tableNodeRef1.value.$el : tableNodeRef2.value.$el; + + setNodeHeight(node, '', true); + console.log('details.pageStatus :>> ', details.pageStatus); + initOnLoad(); +}; + +/** 批量对账单确认 */ +const handleConfirm = () => { + if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据'); + + ElMessageBox.confirm('是否确认对账单?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + ElMessage({ + type: 'success', + message: '确认成功!', + }); + }); }; /** 导出 */ diff --git a/src/views/finance/TransactionInformation.vue b/src/views/finance/TransactionInformation.vue index cea4eeff..da894e48 100644 --- a/src/views/finance/TransactionInformation.vue +++ b/src/views/finance/TransactionInformation.vue @@ -8,246 +8,28 @@
-
运单 / 订单信息
+
订 单 信 息
- -
- 运单号： - 1231231231 -
- -
-
- 对账单总金额 (元) ： - 1231231231 -
- -
- 开单时间： - 1231231231 -
- -
- 发站： - 1231231231 -
- -
- 到站： - 1231231231 -
-
- -
-
- 品牌： - 1231231231 -
- -
- 发货单位： - 1231231231 -
- -
- 收货单位： - 1231231231 -
- -
- 收货人： - 1231231231 -
-
- -
-
- 服务类型： - 1231231231 -
- -
- 运单类型： - 1231231231 -
-
+ -
+
订单号： 1231231231
-
-
- 件数： - 1231231231 -
- -
- 重量： - 1231231231 -
- -
- 体积： - 1231231231 -
-
- -
-
- 干线费： - 1231231231 -
- -
- 提货费： - 1231231231 -
- -
- 仓储费： - 1231231231 -
- -
- 仓储管理费： - 1231231231 -
-
- -
-
- 仓储分拣费： - 1231231231 -
- -
- 仓储操作 / 装卸费： - 1231231231 -
- -
- 配送费： - 1231231231 -
- -
- 配送操作 / 装卸费： - 1231231231 -
-
- -
-
- 配送分货费： - 1231231231 -
- -
- 配送上楼费： - 1231231231 -
- -
- 配送平移费： - 1231231231 -
- -
- 安装费： - 1231231231 -
-
- -
-
- 保价费： - 1231231231 -
- -
- 申明价值： - 1231231231 -
- -
- 其它费用： - 1231231231 -
- -
- 回扣： - 1231231231 -
-
- - -
- 第三方操作费： + +
+ 运单号： 1231231231
+
-
- 支付方式： - 1231231231 -
- -
- 付款方式： - 1231231231 -
- -
- 现付： - 1231231231 -
- -
- 到付： - 1231231231 -
-
- -
-
- 月结： - 1231231231 -
- -
- 回付： - 1231231231 -
- -
- 内部结算： - 1231231231 -
- -
- 代收货款： - 1231231231 -
-
- -
-
- 代收货款已收： - 1231231231 -
- -
- 售后： - 1231231231 -
- -
- 异动金额： +
+ {{ item.label }} 1231231231
@@ -258,7 +40,7 @@
- 异动信息 + 异 动 信 息 （此处填写要登记的异动的金额，整数表示异动增款；负数表示异动减款） @@ -266,125 +48,17 @@ -
- - - 运单 - 订单号 - + @@ -417,7 +91,7 @@
-
异动记录
+
异 动 记 录
@@ -530,6 +204,249 @@ const details = reactive({ head: false, }, ], + formOption: [ + { + label: '干线费：', + prop: 'num', + type: 'number', + }, + { + label: '提货费：', + prop: 'num', + type: 'number', + }, + { + label: '仓储费：', + prop: 'num', + type: 'number', + }, + { + label: '仓储管理费：', + prop: 'num', + type: 'number', + }, + { + label: '仓储分拣费：', + prop: 'num', + type: 'number', + }, + { + label: '仓储操作 / 装卸费：', + prop: 'num', + type: 'number', + }, + { + label: '配送费：', + prop: 'num', + type: 'number', + }, + { + label: '配送操作 / 装卸费：', + prop: 'num', + type: 'number', + }, + { + label: '配送分货费：', + prop: 'num', + type: 'number', + }, + { + label: '配送上楼费：', + prop: 'num', + type: 'number', + }, + { + label: '配送平移费：', + prop: 'num', + type: 'number', + }, + { + label: '安装费：', + prop: 'num', + type: 'number', + }, + { + label: '报价费：', + prop: 'num', + type: 'number', + }, + { + label: '申明价值：', + prop: 'num', + type: 'number', + }, + { + label: '其它费用：', + prop: 'num', + type: 'number', + }, + { + label: '回扣：', + prop: 'num', + type: 'number', + }, + { + label: '第三方操作费：', + prop: 'num', + type: 'number', + }, + { + label: '内部结算：', + prop: 'num', + type: 'number', + }, + { + label: '代收货款：', + prop: 'num', + type: 'number', + }, + { + label: '代收货款已收：', + prop: 'num', + type: 'number', + }, + { + label: '异动时间：', + prop: 'num', + type: 'time', + }, + { + label: '结算网点：', + prop: 'num', + type: 'select', + }, + { + label: '备注：', + prop: 'num', + type: 'textarea', + }, + ], + titleOption: [ + { + label: '对账单总金额（元）：', + prop: 'num', + }, + { + label: '开单时间：', + prop: 'num', + }, + { + label: '发站：', + prop: 'num', + }, + { + label: '到站：', + prop: 'num', + }, + { + label: '品类：', + prop: 'num', + }, + { + label: '发货单位：', + prop: 'num', + }, + { + label: '收货单位：', + prop: 'num', + }, + { + label: '收货人：', + prop: 'num', + }, + { + label: '服务类型：', + prop: 'num', + }, + { + label: '运单类型：', + prop: 'num', + }, + { + label: '件数：', + prop: 'num', + }, + { + label: '重量：', + prop: 'num', + }, + { + label: '体积：', + prop: 'num', + }, + { + label: '干线费：', + prop: 'num', + }, + { + label: '提货费：', + prop: 'num', + }, + { + label: '仓储费：', + prop: 'num', + }, + { + label: '仓储管理费', + prop: 'num', + }, + { + label: '仓储分拣费', + prop: 'num', + }, + { + label: '仓储操作 / 装卸费：', + prop: 'num', + }, + { + label: '配送费：', + prop: 'num', + }, + { + label: '配送操作 / 装卸费：', + prop: 'num', + }, + { + label: '配送分货费', + prop: 'num', + }, + { + label: '配送上楼费：', + prop: 'num', + }, + { + label: '配送平移费：', + prop: 'num', + }, + { + label: '安装费：', + prop: 'num', + }, + { + label: '保价费：', + prop: 'num', + }, + { + label: '申明价值：', + prop: 'num', + }, + { + label: '其它费用：', + prop: 'num', + }, + { + label: '回扣：', + prop: 'num', + }, + { + label: '售后：', + prop: 'num', + }, + { + label: '异动金额：', + prop: 'num', + }, + ], }); const { form } = toRefs(details); @@ -590,12 +507,18 @@ const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => { .info_row { display: flex; padding: 0 10px; + flex-wrap: wrap; & > div { width: 25%; flex: none; box-sizing: border-box; - padding: 0 10px; + padding: 5px 10px; + + .title { + min-width: 90px; + display: inline-block; + } } } @@ -627,4 +550,12 @@ const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => { align-items: center; justify-content: center; } + +:deep(.el-input-number) { + width: 100%; + + .el-input__inner { + text-align: left !important; + } +} diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index 58d4aaa7..310084bf 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -1474,6 +1474,8 @@ const details = reactive({ consignerLoading: false, /** 提交 */ submitLoadingBtn: false, + /** qrCode */ + qrCodeLoading: false, pageLoading: false, }, /** 列表Dom节点 */ @@ -2206,7 +2208,7 @@ const handleTrunkLinePrice = (trunkLine, template) => { for (let i = 0; i < details.goodsList.length; i++) { const value = details.goodsList[i]; - if (value.subtotalFreight) _total += computeNumber(_total, '+', value.subtotalFreight).result; + if (value.subtotalFreight) _total = computeNumber(_total, '+', value.subtotalFreight).result; } console.log('trunkLine :>> ', trunkLine); @@ -3083,10 +3085,24 @@ const handlePrint = async () => { let _html = ''; - for (let i = 0; i < data.length; i++) { - const value = data[i]; + if (getObjType(data) !== 'object') return; - _html += JSON.parse(JSON.stringify(value.templateHtml)); + for (const key in data) { + const element = data[key]; + + for (let i = 0; i < element.length; i++) { + const value = element[i]; + + let template = value.templateHtml; + + console.log('value.templateHtml :>> ', value.templateHtml); + + template = template.replace('第n页', `第${i + 1}页`); + template = template.replace('共n页', `共${element.length}页`); + template = template.replaceAll('0.00', ``); + + _html += JSON.parse(JSON.stringify(template)); + } } console.log('res :>> ', res);