From f0ecf2b7c2446ebf60eba2a02d8ad316e84dd95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 28 May 2022 22:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=B8=AD=E9=87=8D=E5=A4=8D=E5=95=86=E5=93=81=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=89=B9=E6=AC=A1=E5=8F=91=E8=B4=A7=E9=81=87=E5=88=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/modules/PurchaseInModal.vue    | 4 +++-
 jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue | 4 +++-
 jshERP-web/src/views/bill/modules/SaleOutModal.vue       | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 636529ca..c3c63897 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -280,7 +280,8 @@
             { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
             { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
+            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },
         confirmLoading: false,
@@ -425,6 +426,7 @@
               info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
               info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
             }
+            info.linkId = info.id
             allTaxLastMoney += info.taxLastMoney
             listEx.push(info)
             this.changeColumnShow(info)
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index b2f8f5b5..6d9bea28 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -212,7 +212,8 @@
             { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
             { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input}
+            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input},
+            { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },
         confirmLoading: false,
@@ -334,6 +335,7 @@
               info.taxLastMoney = info.allPrice
               discountLastMoney += info.allPrice
             }
+            info.linkId = info.id
           }
           this.$nextTick(() => {
             this.form.setFieldsValue({
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 19d88ee5..9b6538f6 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -284,7 +284,8 @@
             { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
             { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
             { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
-            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
+            { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
+            { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
           ]
         },
         confirmLoading: false,
@@ -431,6 +432,7 @@
               info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
               info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
             }
+            info.linkId = info.id
             allTaxLastMoney += info.taxLastMoney
             listEx.push(info)
             this.changeColumnShow(info)