完善单据关联，带上账户和销售人员的信息

jshERP-web/src/views/bill/dialog/LinkBillList.vue

@@ -131,6 +131,8 @@
         selectType: 'list',
         linkNumber: '',
         organId: '',
+        accountId: '',
+        salesMan: '',
         discountMoney: '',
         deposit: '',
         remark: '',
@@ -285,6 +287,8 @@
             let record = this.selectBillRows[0]
             this.linkNumber = record.number
             this.organId = record.organId
+            this.accountId = record.accountId
+            this.salesMan = record.salesMan
             this.discountMoney = record.discountMoney
             this.deposit = record.changeAmount - record.finishDeposit
             this.remark = record.remark
@@ -294,7 +298,7 @@
         } else {
           if(this.selectedDetailRowKeys.length) {
             this.getSelectBillDetailRows()
-            this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discountMoney, this.deposit, this.remark, this.defaultDepotId)
+            this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discountMoney, this.deposit, this.remark, this.defaultDepotId, this.accountId, this.salesMan)
             this.close()
           } else {
             this.$message.warning('抱歉，请选择单据明细！')

jshERP-web/src/views/bill/modules/PurchaseBackModal.vue

@@ -388,7 +388,7 @@
         this.$refs.linkBillList.show('入库', '采购', '供应商', "1,2,3")
         this.$refs.linkBillList.title = "请选择采购入库"
       },
-      linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) {
+      linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId) {
         this.rowCanEdit = false
         this.materialTable.columns[1].type = FormTypes.normal
         this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
@@ -426,6 +426,7 @@
               'discountMoney': discountMoney,
               'discountLastMoney': discountLastMoney,
               'changeAmount': discountLastMoney,
+              'accountId': accountId,
               'remark': remark
             })
           })

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -441,7 +441,7 @@
         this.$refs.linkBillList.show('其它', '采购订单', '供应商', "1,3")
         this.$refs.linkBillList.title = "请选择采购订单"
       },
-      linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) {
+      linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId) {
         let that = this
         this.rowCanEdit = false
         this.materialTable.columns[1].type = FormTypes.normal
@@ -486,6 +486,7 @@
               'discountLastMoney': discountLastMoney,
               'deposit': deposit,
               'changeAmount': changeAmount,
+              'accountId': accountId,
               'remark': remark
             })
           })

jshERP-web/src/views/bill/modules/SaleBackModal.vue

@@ -398,7 +398,7 @@
         this.$refs.linkBillList.show('出库', '销售', '客户', "1,2,3")
         this.$refs.linkBillList.title = "请选择销售出库"
       },
-      linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) {
+      linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId, salesMan) {
         this.rowCanEdit = false
         this.materialTable.columns[1].type = FormTypes.normal
         this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
@@ -436,8 +436,10 @@
               'discountMoney': discountMoney,
               'discountLastMoney': discountLastMoney,
               'changeAmount': discountLastMoney,
+              'accountId': accountId,
               'remark': remark
             })
+            this.personList.value = salesMan
           })
         }
       },

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -458,7 +458,7 @@
         this.$refs.linkBillList.show('其它', '销售订单', '客户', "1,3")
         this.$refs.linkBillList.title = "请选择销售订单"
       },
-      linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) {
+      linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId, salesMan) {
         let that = this
         this.rowCanEdit = false
         this.materialTable.columns[1].type = FormTypes.normal
@@ -503,8 +503,10 @@
               'discountLastMoney': discountLastMoney,
               'deposit': deposit,
               'changeAmount': changeAmount,
+              'accountId': accountId,
               'remark': remark
             })
+            this.personList.value = salesMan
           })
           //判断后进行仓库的切换
           if(depotId) {