From 5f265b5b978486ebdb22527ed7f9cd73b047656a Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Tue, 27 May 2025 23:46:13 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E7=BB=99=E9=A1=B5=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=9C=80=E8=A6=81=E5=BC=80=E7=A5=A8=E7=9A=84=E5=88=97?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9aeb6fe0 --- jshERP-web/src/views/bill/PurchaseBackList.vue | 5 ++--- jshERP-web/src/views/bill/PurchaseInList.vue | 5 ++--- jshERP-web/src/views/bill/SaleBackList.vue | 5 ++--- jshERP-web/src/views/bill/SaleOutList.vue | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index 05842785..2c519ea4 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -244,8 +244,8 @@ offset: 1 }, // 默认索引 - defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalTaxLastMoney', - 'needBackMoney','changeAmount','debt','needInvoiceStr','status'], + defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney', + 'needBackMoney','changeAmount','debt','status'], // 默认列 defColumns: [ { @@ -289,7 +289,6 @@ { title: '本次退款', dataIndex: 'changeAmount',width:80}, { title: '本次欠款', dataIndex: 'debt',width:80}, { title: '备注', dataIndex: 'remark',width:200}, - { title: '需要发票', dataIndex: 'needInvoiceStr',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } } diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 1e180ee9..a2a09570 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -268,8 +268,8 @@ offset: 1 }, // 默认索引 - defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalTaxLastMoney', - 'needInMoney','changeAmount','debt','needInvoiceStr','status'], + defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney', + 'needInMoney','changeAmount','debt','status'], // 默认列 defColumns: [ { @@ -317,7 +317,6 @@ scopedSlots: { customRender: 'customRenderDebt' } }, { title: '备注', dataIndex: 'remark',width:200}, - { title: '需要发票', dataIndex: 'needInvoiceStr',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } } diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index bc39621f..a7b3a86b 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -244,8 +244,8 @@ offset: 1 }, // 默认索引 - defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalTaxLastMoney','needBackMoney', - 'changeAmount','debt','needInvoiceStr','status'], + defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney','needBackMoney', + 'changeAmount','debt','status'], // 默认列 defColumns: [ { @@ -290,7 +290,6 @@ { title: '本次欠款', dataIndex: 'debt',width:80}, { title: '销售人员', dataIndex: 'salesManStr',width:120}, { title: '备注', dataIndex: 'remark',width:200}, - { title: '需要发票', dataIndex: 'needInvoiceStr',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } } diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 818c2866..5113dc2d 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -268,8 +268,8 @@ offset: 1 }, // 默认索引 - defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalTaxLastMoney', - 'needOutMoney','changeAmount','debt','needInvoiceStr','status'], + defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney', + 'needOutMoney','changeAmount','debt','status'], // 默认列 defColumns: [ { @@ -318,7 +318,6 @@ }, { title: '销售人员', dataIndex: 'salesManStr',width:120}, { title: '备注', dataIndex: 'remark',width:200}, - { title: '需要发票', dataIndex: 'needInvoiceStr',width:80}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } }