From 4eaf4f3c5810ec5d425a278cb3201d45160673d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= Date: Tue, 4 Jun 2024 15:14:08 +0800 Subject: [PATCH] =?UTF-8?q?6.4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visualPortal/components/HTodo/index.vue | 3 +- jnpf-app/pages/scm/form/bom/index.vue | 4 +- .../form/businessLine1/produceLineIndex.vue | 2 +- .../form/businessLine1/workshopLineIndex.vue | 2 +- .../scm/form/businessOrder/purchaseIndex.vue | 4 +- .../scm/form/businessOrder/saleIndex.vue | 4 +- jnpf-app/pages/scm/form/contractL/index.vue | 2 +- jnpf-app/pages/scm/form/cwCost/index.vue | 4 +- .../pages/scm/form/cwpaymentreceipt/index.vue | 20 +- .../pages/scm/form/cwsettlement/index.vue | 4 +- .../scm/form/energyConsumption/index.vue | 4 +- .../pages/scm/form/productWarehouse/index.vue | 4 +- .../scm/form/subjectbasic/customerIndex.vue | 4 +- .../scm/form/subjectbasic/serviceIndex.vue | 4 +- .../scm/form/subjectbasic/supplierIndex.vue | 4 +- .../scm/form/warehousingInspection/index.vue | 4 +- .../scm/form/warehousingReportloss/index.vue | 4 +- .../src/main/java/jnpf/util/GatewayWhite.java | 1 + .../mapper/scm/CwpaymentreceiptMapper.xml | 28 +- .../resources/templates/export/paymentDoc.ftl | 339 ++++++++++++++++++ .../resources/templates/export/simsun.ttc | Bin 0 -> 18214472 bytes jnpf-java-boot/jnpf-scm/jnpf-scm-biz/pom.xml | 53 +++ .../jnpf/mapper/CwpaymentreceiptMapper.java | 5 + .../CwsettlementpaymentreceiptMapper.java | 4 + .../jnpf/service/CwpaymentreceiptService.java | 3 + .../impl/CwpaymentreceiptServiceImpl.java | 176 ++++++++- .../src/main/java/jnpf/util/ExportPdf.java | 74 ++++ .../CwpaymentreceiptController.java | 11 + .../cwpaymentreceipt/PaymentdocMessage.java | 57 +++ jnpf-java-boot/jnpf-scm/pom.xml | 22 ++ .../views/extend/cwpaymentreceipt/index.vue | 11 +- 31 files changed, 816 insertions(+), 45 deletions(-) create mode 100644 jnpf-java-boot/jnpf-admin/src/main/resources/templates/export/paymentDoc.ftl create mode 100644 jnpf-java-boot/jnpf-admin/src/main/resources/templates/export/simsun.ttc create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/util/ExportPdf.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwpaymentreceipt/PaymentdocMessage.java diff --git a/jnpf-app/components/visualPortal/components/HTodo/index.vue b/jnpf-app/components/visualPortal/components/HTodo/index.vue index 21db3c68..0290de37 100644 --- a/jnpf-app/components/visualPortal/components/HTodo/index.vue +++ b/jnpf-app/components/visualPortal/components/HTodo/index.vue @@ -9,7 +9,7 @@ :style="{'background-color':item.iconColor||item.iconBgColor || '#008cff'}"> + :style="{'color':option.valueFontColor,'font-weight':option.valueFontWeight?700:400}" v-if="item.fullName != '已办事宜'"> + label-align="left" :label-width="labelwidth" class="jnpf-form"> + label-align="left" :label-width="labelwidth" class="jnpf-form"> @@ -1100,7 +1100,7 @@ "label": "fullName", "value": "id" }, - labelwidth: 100 * 1.5, + labelwidth: 210 * 1.5, menuId: '', jurisdictionType: '', ruleList: { diff --git a/jnpf-app/pages/scm/form/businessOrder/saleIndex.vue b/jnpf-app/pages/scm/form/businessOrder/saleIndex.vue index f8e26458..dee4af4b 100644 --- a/jnpf-app/pages/scm/form/businessOrder/saleIndex.vue +++ b/jnpf-app/pages/scm/form/businessOrder/saleIndex.vue @@ -1,7 +1,7 @@