From 471f615edcd887732082bcc776b8b381f12920b5 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Tue, 14 May 2024 14:30:18 +0800 Subject: [PATCH 1/8] =?UTF-8?q?app=E5=95=86=E5=93=81=E5=8F=8A=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/jnpf/jnpf-checkbox/index.vue | 36 +++++++++++---- jnpf-app/components/jnpf/jnpf-radio/index.vue | 31 +++++++++++-- .../pages/scm/form/productWarehouse/index.vue | 46 ++++++------------- 3 files changed, 68 insertions(+), 45 deletions(-) diff --git a/jnpf-app/components/jnpf/jnpf-checkbox/index.vue b/jnpf-app/components/jnpf/jnpf-checkbox/index.vue index 8347c82a..306b3d10 100644 --- a/jnpf-app/components/jnpf/jnpf-checkbox/index.vue +++ b/jnpf-app/components/jnpf/jnpf-checkbox/index.vue @@ -2,20 +2,36 @@ - - {{ item[props.label] }} - + + - - {{ item[props.label] }} - + + @@ -52,6 +68,10 @@ disabled: { type: Boolean, default: false + }, + showOnly: { + type: Boolean, + default: false } }, data() { diff --git a/jnpf-app/components/jnpf/jnpf-radio/index.vue b/jnpf-app/components/jnpf/jnpf-radio/index.vue index 0e50ab7f..abf82e12 100644 --- a/jnpf-app/components/jnpf/jnpf-radio/index.vue +++ b/jnpf-app/components/jnpf/jnpf-radio/index.vue @@ -2,17 +2,34 @@ - - {{ item[props.label] }} - + + - + + + @@ -47,6 +64,10 @@ disabled: { type: Boolean, default: false + }, + showOnly: { + type: Boolean, + default: false } }, data() { diff --git a/jnpf-app/pages/scm/form/productWarehouse/index.vue b/jnpf-app/pages/scm/form/productWarehouse/index.vue index 2c474d94..01dc4bd3 100644 --- a/jnpf-app/pages/scm/form/productWarehouse/index.vue +++ b/jnpf-app/pages/scm/form/productWarehouse/index.vue @@ -4,10 +4,7 @@ label-align="right" :label-width="labelwidth" class="jnpf-form"> - - + 商品类型 @@ -15,16 +12,13 @@ prop="productTypeId"> + :props="productTypeIdProps" :options="productTypeIdOptions" :showOnly="true"> - - + 基本信息 @@ -104,10 +98,7 @@ - - + 商品特性 @@ -148,11 +139,14 @@ + 供应链/财务信息 + + - - + 单位/价格信息 @@ -303,10 +294,7 @@ - - + 销售信息 @@ -333,10 +321,7 @@ - - + 库存信息 @@ -397,10 +382,7 @@ - - + 适配业务范围 @@ -411,7 +393,7 @@ :disabled="judgeWrite('jnpf_jg_product_business_jnpf_businessLineId')" @change="changeData('jnpf_jg_product_business_jnpf_businessLineId',-1)" optionType="default" direction="horizontal" :props="jnpf_jg_product_business_jnpf_businessLineIdProps" - :options="jnpf_jg_product_business_jnpf_businessLineIdOptions"> + :options="jnpf_jg_product_business_jnpf_businessLineIdOptions" :showOnly="true"> @@ -745,7 +727,7 @@ "multiple": false, "children": "" }, - labelwidth: 120 * 1.5, + labelwidth: 130 * 1.5, menuId: '', jurisdictionType: '', ruleList: { From ced3b31b7f17eedbfdb532886adcfa31cbefb63e Mon Sep 17 00:00:00 2001 From: mhsnet Date: Tue, 14 May 2024 15:18:52 +0800 Subject: [PATCH 2/8] =?UTF-8?q?app=20=E5=90=88=E5=90=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jnpf-app/pages/scm/form/contractL/index.vue | 211 ++++++++++++++------ 1 file changed, 151 insertions(+), 60 deletions(-) diff --git a/jnpf-app/pages/scm/form/contractL/index.vue b/jnpf-app/pages/scm/form/contractL/index.vue index 9403ba6b..f3dc6037 100644 --- a/jnpf-app/pages/scm/form/contractL/index.vue +++ b/jnpf-app/pages/scm/form/contractL/index.vue @@ -4,10 +4,8 @@ label-align="right" :label-width="labelwidth" class="jnpf-form"> - - + + 合同类型 @@ -17,16 +15,14 @@ :left-icon-style="{'color':'#a0acb7'}" prop="contractType"> + :props="contractTypeProps" :options="contractTypeOptions" :showOnly="true"> - - + + 基本信息 @@ -115,10 +111,8 @@ - - + + 主体信息 @@ -147,18 +141,14 @@ - - + + 财务信息 - - + + 合同信息 @@ -208,10 +198,8 @@ - - + + 交货和运输信息 @@ -252,10 +240,8 @@ - - + + 合同条款信息 @@ -485,14 +471,128 @@ - - + + 商品明细 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + % + + + + + + + + + + + + + + + + + @@ -614,10 +714,8 @@ - - + + 费用条款 @@ -668,10 +766,8 @@ - - + + 付款节点 @@ -743,7 +839,7 @@ + prop="totalAmount" label-position="top" label-align="left"> @@ -752,7 +848,7 @@ + label="大写金额（人民币）" prop="amountCapitalization" label-position="top" label-align="left"> @@ -761,10 +857,8 @@ - - + + 其他信息 @@ -777,8 +871,7 @@ - + @@ -787,15 +880,13 @@ - - + + 附件信息 + label="合同附件" prop="contractAppendices" label-position="top" label-align="left"> + label="附属文件" prop="ancillaryDocuments" label-position="top" label-align="left"> + label="关联交易合同（二级）" prop="transactionAppendices" label-position="top" label-align="left"> + label="关联交易合同（三级）" prop="transactionAppendices2" label-position="top" label-align="left"> Date: Tue, 14 May 2024 15:22:45 +0800 Subject: [PATCH 3/8] =?UTF-8?q?app=20=E5=90=88=E5=90=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jnpf-app/pages/scm/form/contractL/index.vue | 114 -------------------- 1 file changed, 114 deletions(-) diff --git a/jnpf-app/pages/scm/form/contractL/index.vue b/jnpf-app/pages/scm/form/contractL/index.vue index f3dc6037..3070b5d1 100644 --- a/jnpf-app/pages/scm/form/contractL/index.vue +++ b/jnpf-app/pages/scm/form/contractL/index.vue @@ -592,120 +592,6 @@ - From d85fdf53aea4ef6ca13b06157ff364d9d2db537d Mon Sep 17 00:00:00 2001 From: mhsnet Date: Tue, 14 May 2024 15:41:28 +0800 Subject: [PATCH 4/8] =?UTF-8?q?app=20=E5=90=88=E5=90=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jnpf-app/pages/scm/form/contractL/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jnpf-app/pages/scm/form/contractL/index.vue b/jnpf-app/pages/scm/form/contractL/index.vue index 3070b5d1..9d878fa1 100644 --- a/jnpf-app/pages/scm/form/contractL/index.vue +++ b/jnpf-app/pages/scm/form/contractL/index.vue @@ -160,6 +160,7 @@ + @@ -1223,7 +1225,7 @@ "multiple": false, "children": "" }, - labelwidth: 160 * 1.5, + labelwidth: 180 * 1.5, menuId: '', jurisdictionType: '', ruleList: { From a8f8cf1afbe64dc8e34f26354d81f7fe3ad425f3 Mon Sep 17 00:00:00 2001 From: "XI_TENG\\xixi_" <971623072> Date: Tue, 14 May 2024 16:40:18 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/scm/warehousing/warehousingoutbound/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue index 3736bb5e..1aaddbb9 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue @@ -87,13 +87,13 @@ - + - + From 7f9ae8f86a6784072c3b8160718a0f3ed3a69cc0 Mon Sep 17 00:00:00 2001 From: vayne Date: Tue, 14 May 2024 16:51:25 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=92=8C=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/form/businessOrder/purchaseIndex.vue | 17 +++++++++-------- .../service/impl/ReceiptOrderServiceImpl.java | 3 +-- .../impl/WarehousingOutboundServiceImpl.java | 1 + .../impl/WarehousingStorageServiceImpl.java | 2 +- .../controller/YunguanInterfaceController.java | 1 + .../src/views/scm/publicPopup/VoucherBox.vue | 2 +- .../purchaseCenter/receiptVoucher/index.vue | 18 +++++------------- .../purchaseCenter/returnCargoOrder/form.vue | 4 ++-- .../scm/saleCenter/deliveryOrder/form.vue | 8 ++++++++ .../views/scm/saleCenter/receiptOrder/form.vue | 8 ++++++++ .../scm/saleCenter/returnCargoOrder/form.vue | 12 ++++++------ 11 files changed, 43 insertions(+), 33 deletions(-) diff --git a/jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue b/jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue index dea7a1c0..0a93bb8b 100644 --- a/jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue +++ b/jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue @@ -293,20 +293,21 @@ - - ({{i+1}}) - 删除 - + :required="requiredList['settlementinfoList-subjectBasicId']" label="供应商名称"> + + @@ -1117,7 +1118,7 @@ expectArriveDateStart: [], createOrderDate: [], deliveryType: [], - contractId: [], + contractId: [{ "dataType": "varchar", "defaultValue": "", "field": "businessLineId", "fieldName": "", "id": "PneOdw1", "jnpfKey": "popupSelect", "relationField": "businessLineId", "required": "0" }], currency: [], saleMode: [], correlatedOrderId: [], diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java index 9433782f..3bb24f85 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java @@ -489,10 +489,9 @@ public class ReceiptOrderServiceImpl extends ServiceImpl - diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue index 60478f1c..6e0333d3 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue @@ -558,20 +558,16 @@ export default { }) return } - if (this.multipleSelectionItem.length > 1) { - this.$message({ - type: 'error', - message: '只能选择一条数据', - duration: 1500, - }) - return - } const selectData = this.multipleSelectionItem let stateFlag = true + let isSaleFlag = true selectData.forEach(function (item) { if (item.flowState != 2) { stateFlag = false; } + if (item.isSaleDeliveryVoucher == '2') { + isSaleFlag = false + } }); if (!stateFlag) { this.$message({ @@ -581,14 +577,10 @@ export default { }) return } - let isSaleFlag = false - selectData.every(function (item) { - isSaleFlag = item.isSaleDeliveryVoucher == '1' - }) if (!isSaleFlag) { this.$message({ type: 'error', - message: '订单已生成销售发货凭证', + message: '凭证已生成销售发货凭证', duration: 1500, }) return diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue index f1b0fa75..8852e709 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue @@ -1303,7 +1303,6 @@ export default { initVoucherList(list) { for (let i = 0; i < list.length; i++) { const e = list[i]; - debugger let item = { voucherId: e.voucherId, voucherCode: e.voucherCode, @@ -1342,7 +1341,6 @@ export default { if (this.dataForm.deliveryProductRelationList.length == 0) { this.dataForm.deliveryProductRelationList.push(productEntity); } else { - debugger const product = this.dataForm.deliveryProductRelationList.find(item => item.id == productEntity.id) if (product) { product.netWeight = this.jnpf.floatAdd(product.netWeight, productEntity.netWeight) @@ -1350,6 +1348,7 @@ export default { product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight) product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight) product.receivedQuantity = this.jnpf.floatAdd(product.receivedQuantity, productEntity.receivedQuantity) + product.deliveryNum = this.jnpf.floatAdd(product.deliveryNum, productEntity.deliveryNum) } else { this.dataForm.deliveryProductRelationList.push(productEntity) } @@ -1551,6 +1550,7 @@ export default { target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight) target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight) target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight) + target.deliveryNum = this.jnpf.floatSub(target.deliveryNum, productNetWeight) } this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1); }).catch(() => { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue index 46c29abb..b9c2afdc 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue @@ -1223,6 +1223,14 @@ export default { }, //选择凭证弹窗 choiceVoucher() { + if (!this.dataForm.businessId) { + this.$message({ + type: "error", + message: "请先选择销售订单", + duration: 1500 + }); + return; + } this.voucherBoxVisible = true let excludeIdList = []; for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue index 22539d3c..b8d42eac 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue @@ -1193,6 +1193,14 @@ export default { }, //选择凭证弹窗 choiceVoucher() { + if (!this.dataForm.businessId) { + this.$message({ + type: "error", + message: "请先选择退货订单", + duration: 1500 + }); + return; + } this.voucherBoxVisible = true let excludeIdList = []; for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue index c0ced638..11f9ace1 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue @@ -1273,7 +1273,6 @@ export default { businessType: '5', } this.dataForm.deliveryVoucherRelationList.push(item) - debugger let productEntity = {} e.warehousingOutboundProductEntityList.forEach(item => { debugger @@ -1299,6 +1298,7 @@ export default { product.grossWeight = this.jnpf.floatAdd(product.grossWeight, productEntity.grossWeight) product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight) product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight) + product.deliveryNum = this.jnpf.floatAdd(product.deliveryNum, productEntity.deliveryNum) } else { this.dataForm.deliveryProductRelationList.push(productEntity) } @@ -1489,22 +1489,22 @@ export default { this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', { type: 'warning' }).then(() => { - const delObj = scope.row.list[0] - var productId = delObj.id - var unit = delObj.unit + const delObj = scope.row + var storageProductId = delObj.storageProductId var productNetWeight = delObj.netWeight var productGrossWeight = delObj.grossWeight var productTareWeight = delObj.tareWeight var productBuckleWeight = delObj.buckleWeight - const target = this.dataForm.deliveryProductRelationList.find(e => e.id == productId && e.deliveryUnit == unit) + const target = this.dataForm.deliveryProductRelationList.find(e => e.id == storageProductId) if (target.netWeight == productNetWeight) { - const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == productId && e.deliveryUnit == unit) + const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == storageProductId) this.dataForm.deliveryProductRelationList.splice(idx, 1) } else { target.netWeight = this.jnpf.floatSub(target.netWeight, productNetWeight) target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight) target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight) target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight) + target.deliveryNum = this.jnpf.floatSub(target.deliveryNum, productNetWeight) } this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1); }).catch(() => { From 9161c10f9d4487983c49e980b75a313e7cb0c297 Mon Sep 17 00:00:00 2001 From: vayne Date: Tue, 14 May 2024 16:59:21 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=87=AD=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/jnpf/controller/VoucherController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java index df8e3110..52e13aed 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java @@ -35,7 +35,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Base64Util; -import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; From 164fcc8de1a35dc477d52a64c2daa2be14c55971 Mon Sep 17 00:00:00 2001 From: "XI_TENG\\xixi_" <971623072> Date: Tue, 14 May 2024 17:01:03 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jnpf-app/pages.json | 12 + .../pages/scm/form/cwpaymentreceipt/index.vue | 1075 ++++++++ .../pages/scm/form/cwsettlement/index.vue | 2167 +++++++++++++++++ .../scm/index/cwpaymentreceipt/index.vue | 539 ++++ .../pages/scm/index/cwsettlement/index.vue | 539 ++++ jnpf-app/pages/workFlow/flowBefore/form.vue | 16 +- .../src/main/resources/application-dev.yml | 2 +- 7 files changed, 4348 insertions(+), 2 deletions(-) create mode 100644 jnpf-app/pages/scm/form/cwpaymentreceipt/index.vue create mode 100644 jnpf-app/pages/scm/form/cwsettlement/index.vue create mode 100644 jnpf-app/pages/scm/index/cwpaymentreceipt/index.vue create mode 100644 jnpf-app/pages/scm/index/cwsettlement/index.vue diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json index f21ba353..8f6069c9 100644 --- a/jnpf-app/pages.json +++ b/jnpf-app/pages.json @@ -496,6 +496,18 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "cwpaymentreceipt/index", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "cwsettlement/index", + "style": { + "navigationBarTitleText": "" + } } ] }, diff --git a/jnpf-app/pages/scm/form/cwpaymentreceipt/index.vue b/jnpf-app/pages/scm/form/cwpaymentreceipt/index.vue new file mode 100644 index 00000000..50c54a1b --- /dev/null +++ b/jnpf-app/pages/scm/form/cwpaymentreceipt/index.vue @@ -0,0 +1,1075 @@ + + + + \ No newline at end of file diff --git a/jnpf-app/pages/scm/form/cwsettlement/index.vue b/jnpf-app/pages/scm/form/cwsettlement/index.vue new file mode 100644 index 00000000..7dcb2304 --- /dev/null +++ b/jnpf-app/pages/scm/form/cwsettlement/index.vue @@ -0,0 +1,2167 @@ + + + + \ No newline at end of file diff --git a/jnpf-app/pages/scm/index/cwpaymentreceipt/index.vue b/jnpf-app/pages/scm/index/cwpaymentreceipt/index.vue new file mode 100644 index 00000000..91b62d0b --- /dev/null +++ b/jnpf-app/pages/scm/index/cwpaymentreceipt/index.vue @@ -0,0 +1,539 @@ + + + + diff --git a/jnpf-app/pages/scm/index/cwsettlement/index.vue b/jnpf-app/pages/scm/index/cwsettlement/index.vue new file mode 100644 index 00000000..04b9854a --- /dev/null +++ b/jnpf-app/pages/scm/index/cwsettlement/index.vue @@ -0,0 +1,539 @@ + + + + diff --git a/jnpf-app/pages/workFlow/flowBefore/form.vue b/jnpf-app/pages/workFlow/flowBefore/form.vue index 4b0b841c..ce17b462 100644 --- a/jnpf-app/pages/workFlow/flowBefore/form.vue +++ b/jnpf-app/pages/workFlow/flowBefore/form.vue @@ -86,6 +86,16 @@ @eventReceiver="eventReceiver" v-if="config.formEnCode === 'costCode'" /> + +