From 604ffa26f293d79e5aff9f8b88065665ed749355 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 13 Mar 2019 09:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E9=A1=BA=E5=BA=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MachiningSequenceAdjustment.js            | 12 ++++++++++
 .../MachiningSequenceAdjustment/index.vue     | 23 ++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index e4320d48..9375414f 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -69,3 +69,15 @@ export function getTable2(stepNumber) {
     }
   })
 }
+// 正在加工零件
+export function searchParts(stepNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序',
+      param: '终端编号=' + stepNumber
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 8afb2c95..6031ff66 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -3,7 +3,7 @@
 
     <el-card>
       <span>工位号:</span>
-      <el-select v-model="MachineValue" filterable size="small" style="width:220px;margin-bottom:10px" placeholder="工位号" @change="searchTable()">
+      <el-select v-model="MachineValue" filterable size="small" style="width:220px;margin-bottom:10px" placeholder="工位号" @change="searchTable();searchParts()">
         <el-option
           v-for="item in Machine"
           :key="item.value"
@@ -15,6 +15,8 @@
       </el-select>
 
       <el-button type="success" class="el-icon-refresh" size="small" style="margin: 10px 0 0 10px" @click="Refresh">刷新工位</el-button>
+      <span v-if="lengths !== 0" style="color: #53A3F7;font-size: 14px"> 加工零件： {{ Parts }};加工工序： {{ gongxu }}</span>
+      <span v-if="lengths === 0" style="color: #53A3F7;font-size: 14px"> 无正在加工零件</span>
       <el-badge :value="num" :max="99" class="item">
         <el-button size="small" type="text" @click="dialogFormVisible=true;Jurisdiction()">调序权限</el-button>
       </el-badge>
@@ -329,11 +331,14 @@
 </template>
 
 <script>
-import { getMachine, getMachine2, searchtable, getTable2, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
+import { searchParts, getMachine, getMachine2, searchtable, getTable2, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
 import { wsuri, name } from '@/utils/request'
 export default {
   data() {
     return {
+      Parts: '',
+      gongxu: '',
+      lengths: '',
       a: 1,
       b: 1,
       expands: [],
@@ -363,6 +368,7 @@ export default {
   watch: {
     MachineValue(val) {
       this.searchTable()
+      this.searchParts()
     }
   },
   created() {
@@ -371,8 +377,19 @@ export default {
     this.initWebsocket()
   },
   methods: {
+    searchParts() {
+      this.Parts = ''
+      this.gongxu = ''
+      this.lengths = ''
+      searchParts(this.MachineValue).then(response => {
+        this.lengths = response.data.length
+        if (response.data.length !== 0) {
+          this.Parts = response.data[0].零件图号_零件工艺计划
+          this.gongxu = response.data[0].工艺名称
+        }
+      })
+    },
     getRowKeys(row) {
-      console.log(row)
       return row.零件图号
     },
     selectMachine(row) {