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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 结算汇总({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.cwpaymentsummaryList.length==0?"添加结算汇总":"添加"}}
+
+
+
+
+
+ 票据打印汇总({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.cwpaymentlastsummaryList.length==0?"添加票据打印汇总":"添加"}}
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 供应商名称({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.cwsettlementsubjectList.length==0?"添加供应商名称":"添加"}}
+
+
+
+
+
+ 关联合同信息({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.cwsettlementcontractList.length==0?"添加关联合同信息":"添加"}}
+
+
+
+
+
+ 单据信息({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.cwsettlementaccountList.length==0?"添加单据信息":"添加"}}
+
+
+
+
+
+ 单据信息({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.cwsettlementcostList.length==0?"添加单据信息":"添加"}}
+
+
+
+
+
+ 收付方信息({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.cwsettlementpaymentreceiptList.length==0?"添加收付方信息":"添加"}}
+
+
+
+
+
+ 结算汇总({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.cwsettlementsummaryList.length==0?"添加结算汇总":"添加"}}
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置
+ 检索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{column.label}}:
+ {{item[column.prop]}}
+
+
+ {{column.label}}:
+ {{toThousands(item[column.prop],column)}}
+ {{item[column.prop]}}
+
+
+
+
+
+
+
+ 审批状态：
+
+ {{getFlowStatus(item.flowState).text}}
+
+
+
+
+
+
+ {{it.text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置
+ 检索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{column.label}}:
+ {{item[column.prop]}}
+
+
+ {{column.label}}:
+ {{toThousands(item[column.prop],column)}}
+ {{item[column.prop]}}
+
+
+
+
+
+
+
+ 审批状态：
+
+ {{getFlowStatus(item.flowState).text}}
+
+
+
+
+
+
+ {{it.text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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'"
/>
+
+