From 5b5a47359287b01a97d09760b5c51a2f86a28516 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 30 Dec 2019 15:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E9=9B=B6=E4=BB=B6=E5=88=B0?=
 =?UTF-8?q?=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Outsourcing/OutsourcingTaskQuery.js          | 4 ++--
 src/utils/request.js                                 | 2 +-
 src/views/Outsourcing/OutsourcingTaskQuery/index.vue | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js
index ac006459..9fc5abcd 100644
--- a/src/api/Outsourcing/OutsourcingTaskQuery.js
+++ b/src/api/Outsourcing/OutsourcingTaskQuery.js
@@ -156,14 +156,14 @@ export function deleteData1(Number) {
   })
 }
 // 零件到货
-export function Arrival(Number) {
+export function Arrival(Number, Num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间生产管理_外协零件_到货',
-      param: `外协加工任务单明细流水号组=${Number}`
+      param: `外协加工任务单明细流水号组=${Number}&工艺计划流水号组=${Num}`
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..2cb92ad8 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.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index f5164e9c..1b1e433b 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -167,6 +167,7 @@ export default {
   },
   data() {
     return {
+      工艺计划流水号: [],
       OutsouringNumber: [],
       wancheng: '',
       gongxulsh: [],
@@ -529,6 +530,7 @@ export default {
     getProcedure(row) {
       for (let i = 0; i < row.length; i++) {
         getprocedure(row[i].工艺计划流水号, row[i].单件是否外协).then(response => {
+          this.List3[i].外协工序 = ''
           this.procedure[i] = ''
           for (let j = 0; j < response.data.length; j++) {
             this.procedure[i] = this.procedure[i] + ' ' + response.data[j].工艺名称简称
@@ -597,13 +599,15 @@ export default {
     },
     handleSelectionChange(val) {
       this.OutsouringNumber = []
+      this.工艺计划流水号 = []
       for (let i = 0; i < val.length; i++) {
         this.OutsouringNumber.push(val[i].外协加工任务单明细流水号)
+        this.工艺计划流水号.push(val[i].工艺计划流水号)
       }
     },
-    getSpareParts() { // 选入零件
+    getSpareParts() {
       if (this.OutsouringNumber.length !== 0) {
-        Arrival(this.OutsouringNumber).then(response => {
+        Arrival(this.OutsouringNumber, this.工艺计划流水号).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('到货成功')
             this.contrast = 3000000000000