diff --git a/jnpf-app/App.vue b/jnpf-app/App.vue
index 71ef1873..241d020c 100644
--- a/jnpf-app/App.vue
+++ b/jnpf-app/App.vue
@@ -228,4 +228,19 @@
@import "@/assets/iconfont/custom/iconfont.css";
@import "@/assets/scss/common.scss";
@import "@/assets/scss/components.scss";
+ .page-testa{
+ .uni-input-wrapper {
+ color: #303133 !important;
+ font-size: 16px !important;
+ }
+ .u-input__input {
+ color: #303133 !important;
+ font-size: 16px !important;
+ }
+ .u-form-item {
+ color: #303133 !important;
+ font-size: 16px !important;
+ }
+ }
+
\ No newline at end of file
diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue
index 269c52ce..9c52f139 100644
--- a/jnpf-app/pages/index/portal.vue
+++ b/jnpf-app/pages/index/portal.vue
@@ -366,6 +366,7 @@
url: '/api/scm/BusinessEnterpriseRelational/getHomePage',
method: 'get'
}).then(res => {
+ debugger
let _info = res.data[0];
this.homeInfo = _info;
}).catch(() => {})
diff --git a/jnpf-app/pages/scm/form/paymentApplication/index.vue b/jnpf-app/pages/scm/form/paymentApplication/index.vue
index ed65fedc..8d250cc8 100644
--- a/jnpf-app/pages/scm/form/paymentApplication/index.vue
+++ b/jnpf-app/pages/scm/form/paymentApplication/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -47,13 +47,20 @@
-
+
+
+
+
+
+
+
@@ -191,6 +198,7 @@
contractId: "",
payee: '',
payer: '',
+ payer2: '',
applyAmount: 0,
caseStatus: "1",
remark: '',
@@ -686,6 +694,13 @@
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
+ if(this.dataForm.payer && this.dataForm.payer != ''){
+ var aa = this.dataForm.payer.split("/");
+ aa.reverse();
+ var str = aa.join('/');
+ this.dataForm.payer2 = str;
+ }
+
this.isEdit = true
this.dataAll()
if(!_dataAll.paymentapplicationsettlementList){
@@ -707,4 +722,26 @@
page {
background-color: #f0f2f6;
}
+ /* .uni-input-wrapper {
+ color: #303133 !important;
+ font-size: 16px !important;
+ }
+ .u-input__input {
+ color: #303133 !important;
+ font-size: 16px !important;
+ } */
+
+
\ No newline at end of file
diff --git a/jnpf-app/pages/workFlow/flowBefore/index.vue b/jnpf-app/pages/workFlow/flowBefore/index.vue
index a31f3884..77e4b79d 100644
--- a/jnpf-app/pages/workFlow/flowBefore/index.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/index.vue
@@ -648,9 +648,6 @@
}
setTimeout(() => {
this.$nextTick(() => {
- console.log('aaaaaaaaaaa', this.$refs.child);
- console.log('bbbbbbbbbbb', this.$refs.child.$refs.form);
- console.log('ccccccccccc', this.$refs.child.$refs.form.init);
if (!this.$refs.child || !this.$refs.child.$refs.form || !this.$refs
.child.$refs.form.init) {
uni.showToast({
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
index 9313c98b..8882ef15 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
@@ -1093,19 +1093,19 @@ public class CwsettlementServiceImpl extends ServiceImpl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1372,6 +1460,32 @@
+
+
+ *开票商品名称
+
+
+
+
+
+
+
+
+ *摘要
+
+
+
+
+
+
@@ -1859,6 +1973,15 @@ export default {
settlableAmount: 0,
applyAmount: 0,
remark: undefined,
+ invoiceDate: undefined,
+ invoiceCnt: undefined,
+ invoiceNo: undefined,
+ invoiceType: undefined,
+ attribute11: undefined,
+ invoiceAmount: undefined,
+ glDate: undefined,
+ description: undefined,
+ annexCnt: undefined,
cwsettlementsubjectList: [],
cwsettlementcontractList: [],
cwsettlementaccountList: [],
@@ -2177,6 +2300,17 @@ export default {
"label": "fullName",
"value": "id"
},
+ invoiceTypeOptions: [{
+ "fullName": "红冲发票",
+ "id": "1"
+ },{
+ "fullName": "标准发票",
+ "id": "2"
+ }],
+ invoiceTypeProps: {
+ "label": "fullName",
+ "value": "id"
+ },
costBearingMianOptions: [{
"fullName": "甲方",
"id": "1"