From b1d4a538017c40f750e51ade853ecb47b3e66d01 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 5 Sep 2025 17:40:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=88=E7=BB=93=E8=B4=A6=E6=88=B7=E6=89=B9=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BD=91=E7=82=B9=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmisBaseTools/EmisSiteSelectTreePicker2.vue | 7 ++++++- .../emis/emisCustomerUser/batchUpdateForm.vue | 15 ++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue b/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue index ecfcb731..4bf32b9e 100644 --- a/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue +++ b/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue @@ -195,6 +195,11 @@ import { data } from "jquery"; required: false, default:false }, + openSiteSelectTreeForm:{ + type: [Boolean], + required: false, + default:true + }, }, data() { return { @@ -338,7 +343,7 @@ import { data } from "jquery"; // this.dataTree = this.handleTree(response.rows,'siteCode','province'); // 设置选中的key this.$nextTick(() => { - if(this.selectSiteCodeStr != null){ + if(this.selectSiteCodeStr != null && this.openSiteSelectTreeForm ){ this.$refs.tree.setCheckedKeys(this.checkList); } }) diff --git a/src/views/emis/emisCustomerUser/batchUpdateForm.vue b/src/views/emis/emisCustomerUser/batchUpdateForm.vue index 7115f61e..db3bbbb7 100644 --- a/src/views/emis/emisCustomerUser/batchUpdateForm.vue +++ b/src/views/emis/emisCustomerUser/batchUpdateForm.vue @@ -92,7 +92,7 @@ - + @@ -111,7 +111,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; -import EmisSiteSelectTreePicker from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue'; +import EmisSiteSelectTreePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue'; import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue'; import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue'; import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; @@ -131,7 +131,7 @@ export default { CountryPicker, EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker, EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2, - EmisSiteSelectTreePicker, + EmisSiteSelectTreePicker2, EmpNamePicker3, EmpNamePicker4, }, @@ -177,8 +177,10 @@ export default { }, onSelectSiteTreeCheckChange(item){ this.openSiteSelectTreeForm=false; - this.form.bizSiteName=item.selectSiteNameStr; - this.form.bizSite=item.selectSiteCodeStr; + if(item!=null){ + this.form.bizSiteName=item.selectSiteNameStr; + this.form.bizSite=item.selectSiteCodeStr; + } // console.log(item) }, // 取消按钮 @@ -274,6 +276,9 @@ export default { this.$modal.msgSuccess("无变动，无需修改"); } }, + onCancelSelectSiteTree(){ + this.openSiteSelectTreeForm=false; + }, } }; From 3c825fb10302fd7d11f809e164faafc5e0d71f92 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 8 Sep 2025 14:54:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue b/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue index d30a7adf..923cb1f8 100644 --- a/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue +++ b/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue @@ -4,10 +4,10 @@
- + - + From 9be70fa9069795235cbcc8d72bd99a3ac1924edd Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 9 Sep 2025 10:58:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9A=E5=88=B6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisSettlePayRecord/index.vue | 32 +++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue index 887378f7..7f23dcd2 100644 --- a/src/views/emis/emisSettlePayRecord/index.vue +++ b/src/views/emis/emisSettlePayRecord/index.vue @@ -125,6 +125,17 @@ v-hasPermi="['emis:emisSettlePayRecord:export']" >导出 + + 定制导出 +
@@ -141,15 +152,15 @@ - + + - + @@ -187,8 +198,11 @@ - - + + + + + @@ -806,6 +820,14 @@ export default { dateTimeChange(value){ this.dateTimeRange=value; }, + //定制导出 + handleCustomExport(){ + let settleBillNo = this.selectList[0].settleBillNo; + //获取选中 + this.download('emis/emisSettlePayRecord/customExport', { + 'settleBillNo':settleBillNo + }, `定制收款明细列表.xlsx`) + }, } };