Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/WorkshopProcurement/NewArrivalList/index.vue

@@ -526,6 +526,7 @@ export default {
       'sidebar',
       'avatar',
       'name',
+      'userId',
       'id' // 人员编号
     ])
   },
@@ -838,6 +839,7 @@ export default {
       })
     },
     searchTable5(row) {
+      console.log(this.userId, this.id)
       this.disable = row.是否关联
       console.log(this.disable)
       this.tableData6 = []
@@ -984,7 +986,7 @@ export default {
           this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
           this.本次到货数量组.push(v.未到货数量)
         })
-        addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组).then(response => {
+        addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.userId).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('关联成功')
             searchMateriel(this.采购计划流水号).then(response => {