#25 付款拆分为付款单、付款记录2个对象

steedos-packages/finance/main/default/objects/finance_payment/fields/amount_description.field.yml

@@ -10,6 +10,6 @@ readonly: false
 required: false
 rows: 0
 searchable: false
-sort_no: 300
+sort_no: 500
 sortable: false
 type: textarea

steedos-packages/finance/main/default/objects/finance_payment/fields/billno.field.yml

@@ -1,14 +1,15 @@
 name: billno
+data_type: text
 filterable: true
+formula: report_id.billno
+formula_blank_value: zeroes
 hidden: false
 index: false
 is_name: false
 is_wide: false
 label: 单据编号
 omit: false
-readonly: false
-required: false
 searchable: false
-sort_no: 290
+sort_no: 20
 sortable: false
-type: text
+type: formula

steedos-packages/finance/main/default/objects/finance_payment/fields/currency.field.yml

@@ -11,7 +11,7 @@ readonly: false
 reference_to: currency
 required: false
 searchable: false
-sort_no: 130
+sort_no: 810
 sortable: false
 type: lookup
 visible_on: false

steedos-packages/finance/main/default/objects/finance_payment/fields/due_date.field.yml

@@ -9,6 +9,6 @@ omit: false
 readonly: false
 required: false
 searchable: false
-sort_no: 160
+sort_no: 830
 sortable: true
 type: date

steedos-packages/finance/main/default/objects/finance_payment/fields/finished.field.yml

@@ -10,6 +10,6 @@ omit: false
 readonly: false
 required: false
 searchable: false
-sort_no: 425
+sort_no: 870
 sortable: false
 type: boolean

steedos-packages/finance/main/default/objects/finance_payment/fields/id.field.yml

@@ -1,16 +1,16 @@
 name: id
 filterable: true
-formula: 'FK-{YYYY}-{0000}'
+formula: 'FKJL-{00000}'
 hidden: false
 index: false
 is_name: true
 is_wide: false
-label: 付款单编号
+label: 付款记录编号
 omit: false
 readonly: true
 visible_on: "{{global.mode ==='read' ? true : false}}"
 required: false
 searchable: false
-sort_no: 295
+sort_no: 80
 sortable: true
 type: autonumber

steedos-packages/finance/main/default/objects/finance_payment/fields/instance_state.field.yml

@@ -1,7 +1,7 @@
 name: instance_state
 defaultValue: '"draft"'
 filterable: true
-hidden: false
+hidden: true
 label: 审批状态
 omit: false
 readonly: true
@@ -20,6 +20,6 @@ options:
   - label: 已取消
     value: terminated
 searchable: true
-sort_no: 200
+sort_no: 400
 sortable: true
 type: select

steedos-packages/finance/main/default/objects/finance_payment/fields/name.field.yml

@@ -9,6 +9,6 @@ omit: false
 readonly: false
 required: false
 searchable: true
-sort_no: 100
+sort_no: 800
 sortable: false
 type: text

steedos-packages/finance/main/default/objects/finance_payment/fields/payment_date.field.yml

@@ -1,14 +1,15 @@
 name: payment_date
+data_type: date
 filterable: true
+formula: report_id.payment_date
+formula_blank_value: zeroes
 hidden: false
 index: false
 is_name: false
 is_wide: false
 label: 付款日期
 omit: false
-readonly: false
-required: true
 searchable: false
 sort_no: 130
 sortable: false
-type: date
+type: formula

steedos-packages/finance/main/default/objects/finance_payment/fields/payment_invoicefolder.field.yml

@@ -23,6 +23,6 @@ readonly: false
 reference_to: invoices
 required: false
 searchable: false
-sort_no: 290
+sort_no: 310
 sortable: false
 type: lookup

steedos-packages/finance/main/default/objects/finance_payment/fields/payment_invoicefolder_count.field.yml

@@ -10,7 +10,7 @@ omit: false
 readonly: true
 required: false
 searchable: false
-sort_no: 188
+sort_no: 320
 sortable: false
 type: number
 scale: 0

steedos-packages/finance/main/default/objects/finance_payment/fields/payment_invoicefolder_total_amount.field.yml

@@ -10,7 +10,7 @@ omit: false
 readonly: true
 required: false
 searchable: false
-sort_no: 188
+sort_no: 330
 sortable: false
 type: number
 scale: 2

steedos-packages/finance/main/default/objects/finance_payment/fields/payment_method.field.yml

@@ -12,4 +12,4 @@ options:
     value: 现金
   - label: 其他
     value: 其他
-sort_no: 558
+sort_no: 880

steedos-packages/finance/main/default/objects/finance_payment/fields/payment_sacle.field.yml

@@ -3,7 +3,7 @@ data_type: percent
 filterable: false
 formula: amount / purchase_order.amount
 formula_blank_value: zeroes
-hidden: true
+hidden: false
 index: false
 is_name: false
 is_wide: false
@@ -12,6 +12,6 @@ omit: false
 readonly: false
 required: false
 searchable: false
-sort_no: 213
+sort_no: 640
 sortable: false
 type: formula

steedos-packages/finance/main/default/objects/finance_payment/fields/payment_status.field.yml

@@ -16,6 +16,6 @@ options:
     value: unpaid
 required: false
 searchable: false
-sort_no: 415
+sort_no: 860
 sortable: false
 type: select

steedos-packages/finance/main/default/objects/finance_payment/fields/payment_type.field.yml

@@ -15,7 +15,7 @@ options:
 readonly: false
 required: false
 searchable: false
-sort_no: 159
+sort_no: 820
 sortable: false
 type: select
 visible_on: false

steedos-packages/finance/main/default/objects/finance_payment/fields/report_id.field.yml

@@ -0,0 +1,18 @@
+name: report_id
+filterable: true
+hidden: false
+index: false
+is_name: false
+is_wide: false
+label: 付款单
+omit: false
+readonly: false
+reference_to: finance_payment_reports
+required: true
+searchable: false
+sort_no: 10
+sortable: true
+type: master_detail
+create: false
+write_requires_master_read: true
+

steedos-packages/finance/main/default/objects/finance_payment/fields/taxrate.field.yml

@@ -11,7 +11,7 @@ readonly: false
 reference_to: tax_rates
 required: false
 searchable: false
-sort_no: 170
+sort_no: 850
 sortable: false
 type: lookup
 visible_on: false

steedos-packages/finance/main/default/objects/finance_payment/fields/ticket_information.field.yml

@@ -16,7 +16,7 @@ options:
 readonly: false
 required: false
 searchable: false
-sort_no: 160
+sort_no: 840
 sortable: false
 type: select
 visible_on: false

steedos-packages/finance/main/default/objects/finance_payment/finance_payment.object.yml

@@ -15,7 +15,7 @@ enable_tasks: false
 enable_workflow: true
 icon: orders
 is_enable: true
-label: 付款
+label: 付款记录
 version: 2
 form:
   initialValues: !!js/function |

steedos-packages/finance/main/default/objects/finance_payment/listviews/all.listview.yml

@@ -6,9 +6,9 @@ columns:
     wrap: false
   - field: amount
     wrap: false
-  - field: supplier
+  - field: purchase_order
     wrap: false
-  - field: supplier_bank
+  - field: report_id
     wrap: false
   - field: billno
     wrap: false

steedos-packages/finance/main/default/objects/finance_payment/listviews/recent.listview.yml

@@ -6,9 +6,9 @@ columns:
     wrap: false
   - field: amount
     wrap: false
-  - field: supplier
+  - field: purchase_order
     wrap: false
-  - field: supplier_bank
+  - field: report_id
     wrap: false
   - field: billno
     wrap: false

steedos-packages/finance/main/default/objects/finance_payment_reports/buttons/payment.button.js

@@ -0,0 +1,18 @@
+module.exports = {
+
+    payment: function() {
+        Steedos.CTR.financePayment(this.record);
+    },
+    paymentVisible: function(object_name, record_id, record_permissions) {
+        // 如果是财务管理员则显示出该按钮
+        var record = Creator.getObjectRecord(object_name, record_id);
+        var userId = Steedos.userId();
+        var roles = Creator.USER_CONTEXT.user.roles;
+        if (record && ((roles.includes("finance_manager") || roles.includes("admin")))) {
+            // return true;
+            return false;
+        }
+        return false;
+    }
+
+}

steedos-packages/finance/main/default/objects/finance_payment_reports/buttons/payment.button.yml

@@ -0,0 +1,5 @@
+name: payment
+is_enable: true
+label: 编辑付款信息
+'on': record_only
+visible: false

steedos-packages/finance/main/default/objects/finance_payment_reports/fields/amount.field.yml

@@ -0,0 +1,25 @@
+name: amount
+create: true
+data_type: number
+filterable: false
+generated: false
+hidden: false
+index: false
+is_name: false
+is_wide: false
+label: 付款金额
+multiple: false
+precision: 18
+primary: false
+readonly: false
+scale: 2
+searchable: false
+show_as_qr: false
+sort_no: 130
+sortable: false
+summary_field: amount
+summary_object: finance_payment
+summary_type: sum
+type: summary
+unique: false
+write_requires_master_read: false

steedos-packages/finance/main/default/objects/finance_payment_reports/fields/amount_description.field.yml

@@ -0,0 +1,15 @@
+name: amount_description
+filterable: false
+hidden: false
+index: false
+is_name: false
+is_wide: true
+label: 备注
+omit: false
+readonly: false
+required: false
+rows: 0
+searchable: false
+sort_no: 300
+sortable: false
+type: textarea

steedos-packages/finance/main/default/objects/finance_payment_reports/fields/billno.field.yml

@@ -0,0 +1,14 @@
+name: billno
+filterable: true
+hidden: false
+index: false
+is_name: false
+is_wide: false
+label: 单据编号
+omit: false
+readonly: false
+required: false
+searchable: false
+sort_no: 220
+sortable: false
+type: text

steedos-packages/finance/main/default/objects/finance_payment_reports/fields/company_id.field.yml

@@ -0,0 +1,16 @@
+name: company_id
+filterable: true
+hidden: false
+index: false
+is_name: false
+is_wide: false
+label: 所属单位
+multiple: false
+omit: false
+readonly: false
+reference_to: company
+required: true
+searchable: false
+sort_no: 288
+sortable: false
+type: lookup

steedos-packages/finance/main/default/objects/finance_payment_reports/fields/currency.field.yml

@@ -0,0 +1,17 @@
+name: currency
+filterable: false
+hidden: true
+index: false
+is_name: false
+is_wide: false
+label: 币种
+multiple: false
+omit: false
+readonly: false
+reference_to: currency
+required: false
+searchable: false
+sort_no: 810
+sortable: false
+type: lookup
+visible_on: false

steedos-packages/finance/main/default/objects/finance_payment_reports/fields/due_date.field.yml

@@ -0,0 +1,14 @@
+name: due_date
+filterable: false
+hidden: true
+index: false
+is_name: false
+is_wide: false
+label: 计划付款日期
+omit: false
+readonly: false
+required: false
+searchable: false
+sort_no: 830
+sortable: true
+type: date