From 440b5484e95e1c3b36a8365a6998666027ac9a4e Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Fri, 22 Nov 2019 17:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/WorkshopProcurement/NewArrivalList.js          | 4 ++--
 src/utils/request.js                                   | 2 +-
 src/views/WorkshopProcurement/NewArrivalList/index.vue | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js
index f067839a..ffe6a4f2 100644
--- a/src/api/WorkshopProcurement/NewArrivalList.js
+++ b/src/api/WorkshopProcurement/NewArrivalList.js
@@ -168,14 +168,14 @@ export function deleteMateriel(num1, num2, num3) {
   })
 }
 // 关联材料
-export function addMateriel(num1, num2, num3, num4, num5) {
+export function addMateriel(num1, num2, num3, num4, num5, id) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_到货单明细关联',
-      param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}&本次到货数量组=${num4}&离线采购计划明细流水号组=${num5}`
+      param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}&本次到货数量组=${num4}&离线采购计划明细流水号组=${num5}&考勤编号=${id}`
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 2cb92ad8..fc41e22d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index b433fe3f..c857a632 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/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 => {