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

---
 .../MachiningSequenceAdjustment.js              | 13 ++++++++++++-
 .../MachiningSequenceAdjustment/index.vue       | 17 +++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index dc57f8fb..fd4e90f5 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -1,6 +1,17 @@
 import request from '@/utils/request'
-// 初始化 工位
+// 初始化 人员和工位
 export function getMachine() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_加工顺序调整_查询工位及人员'
+    }
+  })
+}
+// 获取工位
+export function getMachine2() {
   return request({
     url: '',
     method: 'post',
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 71ecd628..1e6d2726 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -3,13 +3,17 @@
 
     <el-card>
       <span>工位号:</span>
-      <el-select v-model="MachineValue" size="small" filterable placeholder="工位号" style="width: 180px;" @change="searchTable()">
+      <el-select v-model="MachineValue" filterable size="small" style="width:220px;margin-bottom:10px" placeholder="工位号" @change="searchTable()">
         <el-option
           v-for="item in Machine"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :value="item.value">
+          <div style="float: left">{{ item.label }}</div>
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+        </el-option>
       </el-select>
+
       <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="searchTable();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
       <el-badge :value="num" :max="99" class="item">
         <el-button size="small" type="text" @click="dialogFormVisible=true;Jurisdiction()">调序权限</el-button>
@@ -112,7 +116,7 @@
 </template>
 
 <script>
-import { getMachine, searchtable, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
+import { getMachine, getMachine2, searchtable, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
 export default {
   data() {
     return {
@@ -146,8 +150,9 @@ export default {
       getMachine().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.Machine.push({
-            label: response.data[i].MES终端号,
-            value: response.data[i].MES终端号
+            label: response.data[i].终端编号,
+            value: response.data[i].终端编号,
+            value2: response.data[i].姓名
           })
         }
       }).then(() => {
@@ -169,7 +174,7 @@ export default {
     },
     Jurisdiction() {
       this.count = 0
-      getMachine().then(response => {
+      getMachine2().then(response => {
         this.gridData = response.data
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].调序权限 === '1') { this.count = this.count + 1 }

From 3ad0916f165ba2a3ecc723657ae5ae175d5ddfc1 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 2 Mar 2019 16:49:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/ProcessingStatusEdit.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index 913bdf76..967b1234 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -17,8 +17,7 @@ export function getMachines() {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询',
-      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
+      name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询_MESWORK'
     }
   })
 }