From b3ef8975f4528bcac5cae848fed1699fd7334238 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Fri, 4 Jan 2019 20:55:56 +0800
Subject: [PATCH 01/23] bug

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 558460f9..58be7fc5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.0.2:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间

From 0713f0f364875f7221a0a3e97d3a040cffd89639 Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Sat, 5 Jan 2019 09:03:27 +0800
Subject: [PATCH 02/23] xl

---
 src/utils/request.js                      | 2 +-
 src/views/Inventory/PickingList/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index cdf4a490..491b6cb5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,7 +21,7 @@ const service = axios.create({
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
 
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 8ab14017..a3241d84 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -296,7 +296,7 @@
         </el-table-column>
         <el-table-column label="备注" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.入库备注 }}
+            {{ scope.row.备注 }}
           </template>
         </el-table-column>
         <el-table-column label="零件类型" align="center" min-width="80">

From c06aea2bc2a7dd01a3a3c63b01e2520a3772b53c Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Sat, 5 Jan 2019 09:56:39 +0800
Subject: [PATCH 03/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContractInformationManagement.js          |  4 +-
 .../ContractInformationManagement/index.vue   | 51 +++----------------
 2 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 59a2ae6c..833d38f6 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -20,14 +20,14 @@ export function initMarketingManager() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index b42916d2..af06e319 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -9,9 +9,11 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
+      <span style="margin-left: 10px">机床型号：</span>
+      <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
       <span style="margin-left: 10px">销售经理：</span>
       <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
-      <span style="margin-left: 10px">开始日期：</span>
+      <span style="margin-left: 10px">时间区间：</span>
       <el-date-picker
         v-model="startTime"
         style="width: 200px;"
@@ -19,7 +21,7 @@
         size="small"
         type="date"
         placeholder="请选择开始日期"/>
-      <span style="margin-left: 10px">结束日期：</span>
+      <span>-</span>
       <el-date-picker
         v-model="endTime"
         style="width: 200px;"
@@ -357,46 +359,6 @@
       </div>
     </el-dialog>
 
-    <!--<el-dialog title="人员信息" :visible.sync="dialogFormVisiblePeople" center width="750px">-->
-    <!--<div style="height: 500px">-->
-    <!--<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">-->
-    <!--<el-tree-->
-    <!--:data="dataPeople"-->
-    <!--node-key="id"-->
-    <!--style="width: 150px;float: left"-->
-    <!--height="400"-->
-    <!--accordion-->
-    <!--@node-click="handleNodeClick"-->
-    <!--&gt;-->
-    <!--</el-tree>-->
-    <!--</div>-->
-    <!--<el-table :data="ListPeople" highlight-current-row height="400" @row-click="handleChange" style="width: 400px;float: left;margin-left: 30px">-->
-    <!--<el-table-column label="考勤编号" align="center" >-->
-    <!--<template slot-scope="scope">-->
-    <!--{{scope.row.考勤编号}}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="姓名" align="center" >-->
-    <!--<template slot-scope="scope">-->
-    <!--{{scope.row.姓名}}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="性别" align="center">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{scope.row.性别}}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="工作岗位" align="center">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{scope.row.岗位名称}}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--</el-table>-->
-    <!--</div>-->
-    <!--<el-button style="margin-left: 260px" @click="offName">取消</el-button>-->
-    <!--<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>-->
-    <!--</el-dialog>-->
-
     <!--新增机床对话框-->
     <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="25%">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
@@ -586,6 +548,8 @@ export default {
       time6: '',
       time7: '',
       time8: '',
+      machine: '',
+      machine_check: '',
       disabledTime: false,
       dialogTimeVisible: false,
       executionProgressIDdisabled: false,
@@ -745,11 +709,12 @@ export default {
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
       this.ExecutionProgressShow = false
       this.uploader = false
       this.ExecutionProgress = null
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading'])
     },
     fetchExecutionProgressdata(row) {
       this.projectNum = row.项目流水号

From 28d713d4accd88118b1d08857644d4ad3f1153fd Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Sat, 5 Jan 2019 10:03:47 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?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/utils/request.js                                            | 2 +-
 .../MarketingCenter/ContractInformationManagement/index.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 491b6cb5..cdf4a490 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,7 +21,7 @@ const service = axios.create({
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
 
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index af06e319..63e0e470 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -57,7 +57,7 @@
                   {{ scope.row.机床名称 }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作" fixed="right" width="250px" align="center">
+              <el-table-column label="操作" fixed="right" width="200px" align="center">
                 <template slot-scope="scope">
                   <el-button
                     size="mini"

From ed1d897aab1eee2b52a858c04e81c6f6f64f9f45 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 5 Jan 2019 11:33:09 +0800
Subject: [PATCH 05/23] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                |  4 +---
 .../PartWorkCraftSelect_rdlc/index.vue              | 13 +++++++------
 .../ManufacturingCenter/ProcessingStatus/index.vue  |  1 +
 .../ProcessingStatusEdit/index.vue                  |  1 +
 .../ProductionCapacityBalance/index.vue             |  1 +
 .../Outsourcing/InterBudgetaryBudgets/index.vue     |  1 +
 .../OutsourcingPaymentPlanManagement/index.vue      |  1 +
 src/views/Outsourcing/PreorderAssociation/index.vue |  1 +
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 491b6cb5..69fb2138 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,9 +19,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-
-  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 9112c622..f4b54e5f 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -701,7 +701,13 @@ export default {
   }
 }
 </script>
-
+<style>
+  td{
+    width: 100px;
+    height: 30px;
+    text-align:center;
+  }
+</style>
 <style scoped>
   span{
     margin: 10px 0 10px 10px;
@@ -713,9 +719,4 @@ export default {
     max-height: 250px;
     overflow: auto;
   }
-  td{
-    width: 100px;
-    height: 30px;
-    text-align:center;
-  }
 </style>
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 9574c768..80dc229d 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -373,6 +373,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.getTableData()
   },
   methods: {
     // 查询供应商名称
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index 1981fda5..6a326aa4 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -437,6 +437,7 @@ export default {
   created() {
     this.fetchData()
     this.fetchData3()
+    this.getTableData()
   },
   methods: {
     handleCurrentChange2(row) { // 获取当前行人员信息
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 84e4b9e3..cad79f87 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -729,6 +729,7 @@ export default {
   created() {
     this.fetchData()
     this.Selection1()
+    this.getTable()
   },
   methods: {
     // TABLE每行颜色
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index 5595bd25..099172ed 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -205,6 +205,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchPartNum()
   },
   methods: {
     radioChange() {
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 9a2be09f..40a0e54a 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -423,6 +423,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable()
   },
   methods: {
     getSummaries(param) {
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 03764682..baeb5eb9 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -166,6 +166,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable()
   },
   methods: {
     fetchData() {

From 90c459364b05033cfda4258f348fc3ffc369418f Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Sat, 5 Jan 2019 18:56:09 +0800
Subject: [PATCH 06/23] lx

---
 src/api/Inventory/ExchangePart.js             |  6 +++---
 src/api/Inventory/InboundCard.js              |  2 +-
 src/utils/request.js                          |  2 +-
 src/views/Inventory/DirectPart/index.vue      |  2 +-
 src/views/Inventory/ExchangePart/index.vue    |  7 ++++---
 src/views/Inventory/OfflinePartOut/index.vue  |  5 +++++
 src/views/Inventory/OfflinePurchase/index.vue |  6 ------
 src/views/Inventory/PickingList/index.vue     | 10 +++++-----
 src/views/Inventory/SubstitutePart/index.vue  | 13 ++++---------
 9 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/api/Inventory/ExchangePart.js b/src/api/Inventory/ExchangePart.js
index 9565acdb..ba5d4098 100644
--- a/src/api/Inventory/ExchangePart.js
+++ b/src/api/Inventory/ExchangePart.js
@@ -96,15 +96,15 @@ export function dropExchangeList(PickingListNumberx) {
     }
   })
 }
-// 删除交换单
-export function editExchangeList(data1, data2, data3, data4) {
+// 交换单修改
+export function editExchangeList(data1, data2, data3, data4, data5) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_交换件_交换单修改',
-      param: '交换单流水号=' + data1 + '&交换单编号=' + data2 + '&交换数量=' + data3 + '&备注=' + data4
+      param: '交换单流水号=' + data1 + '&交换单编号=' + data2 + '&交换数量=' + data3 + '&领料单流水号=' + data4 + '&备注=' + data5
     }
   })
 }
diff --git a/src/api/Inventory/InboundCard.js b/src/api/Inventory/InboundCard.js
index 6bd7ba98..616a0857 100644
--- a/src/api/Inventory/InboundCard.js
+++ b/src/api/Inventory/InboundCard.js
@@ -142,7 +142,7 @@ export function addInboundCardDetail(data1, data2, data3, data4, data5, data6, d
   })
 }
 
-// 入库单明细查询
+// 入库单明细删除
 export function deleteInboundCardDetail(data1) {
   return request({
     url: '',
diff --git a/src/utils/request.js b/src/utils/request.js
index 491b6cb5..1f855b84 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,8 +20,8 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
 
-  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  // baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue
index 4a91ec3c..b2a12d23 100644
--- a/src/views/Inventory/DirectPart/index.vue
+++ b/src/views/Inventory/DirectPart/index.vue
@@ -367,7 +367,7 @@ export default {
       this.dialogFormVisible1 = true
       this.directPartNumber = row.直达件流水号
       this.form.DirectNumber = row.到货数量
-      this.PeopleValue = parseInt(row.领用人员流水号)
+      this.form.getPeople = parseInt(row.领用人员流水号)
       this.form.DirectNote = row.备注
     },
     // 修改直达件
diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue
index ca27a4bd..c7d97afa 100644
--- a/src/views/Inventory/ExchangePart/index.vue
+++ b/src/views/Inventory/ExchangePart/index.vue
@@ -250,7 +250,7 @@
         <el-form-item label="交换数量" prop="ExchangeNumberx" label-width="100px">
           <el-input v-model="form.ExchangeNumberx" size="small" placeholder="请输入交换数量" style="width: 200px"/>
         </el-form-item>
-        <el-form-item label="领料单" prop="ExchangeNumberx" label-width="100px">
+        <el-form-item label="领料单" prop="PickingListNumber" label-width="100px">
           <el-select v-model="PickingListNumber" filterable clearable size="small" placeholder="领料单号" style="width: 200px;margin-right:10px" @change="searchGroupList()">
             <el-option
               v-for="item in PickingList"
@@ -266,7 +266,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff('form')">取消</el-button>
         <el-button v-show="title==='交换'" type="primary" @click="addListDetailinfor('form')">确 定</el-button>
-        <el-button v-show="title==='编辑'" type="primary" @click="submitEdit(scope.$index, scope.row, 'form')">确定</el-button>
+        <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -553,12 +553,13 @@ export default {
       this.exchangeListNumber = row.交换单流水号
       this.form.ExchangeNumber = row.交换单编号
       this.form.ExchangeNumberx = row.交换数量
+      this.PickingListNumber = parseInt(row.领料单流水号)
       this.form.ExchangeNote = row.备注
       this.title = '编辑'
       this.dialogFormVisible = true
     },
     submitEdit() {
-      this.editTable(editExchangeList, [this.exchangeListNumber, this.form.ExchangeNumber, this.form.ExchangeNumberx, this.form.ExchangeNote], 'form', function() { this.getExchangeTable(); this.dialogFormVisible = false })
+      this.editTable(editExchangeList, [this.exchangeListNumber, this.form.ExchangeNumber, this.form.ExchangeNumberx, this.PickingListNumber, this.form.ExchangeNote], 'form', function() { this.getExchangeTable(); this.dialogFormVisible = false })
     }
   }
 }
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index 0ba61882..5cb89e64 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -141,6 +141,11 @@
             {{ scope.row.出库时间 }}
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
   </div>
diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue
index b6cf9afc..e1d78972 100644
--- a/src/views/Inventory/OfflinePurchase/index.vue
+++ b/src/views/Inventory/OfflinePurchase/index.vue
@@ -133,12 +133,6 @@
     </el-card>
     <el-card>
       <el-table v-loading="" :data="tableData2" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="请购单状态" align="center" width="80" fixed="left">
-          <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.是否传递)===0" type="warning" size="small">未传递</el-tag>
-            <el-tag v-if="parseInt(scope.row.是否传递)===1" type="primary" size="small">已传递</el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="请购单编号" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.请购单编号 }}
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index a3241d84..36c46677 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -522,7 +522,7 @@ export default {
       partMachineName: '', // 机床名称
       partGroupNumber: '', // 分组流水号
       partGroupName: '', // 分组名称
-      form: {
+      form: { // 基本件出库
         OutNumber: '', // 出库数量
         outNote: '' // 出库备注
       },
@@ -530,7 +530,7 @@ export default {
         OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
         outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
       },
-      form2: {
+      form2: { // 外购件出库
         OutNumber: '', // 出库数量
         outNote: '' // 出库备注
       },
@@ -538,7 +538,7 @@ export default {
         OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
         outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
       },
-      form3: {
+      form3: { // 车间采购出库
         OutNumber: '', // 出库数量
         outNote: '' // 出库备注
       },
@@ -876,7 +876,7 @@ export default {
     },
     // 增加外购件领料单明细
     addListDetailinfor(row) {
-      this.form = []
+      this.form2 = []
       this.outType = 2
       this.partProjectNumber = row.项目流水号
       this.partProjectName = row.项目名称
@@ -925,7 +925,7 @@ export default {
     },
     // 增加车间采购领料单明细
     addWorkshopDetailinfor(row) {
-      this.form = []
+      this.form3 = []
       this.outType = 3
       console.log(row)
       this.partProjectNumber = row.项目流水号
diff --git a/src/views/Inventory/SubstitutePart/index.vue b/src/views/Inventory/SubstitutePart/index.vue
index 01e92836..cd20b9c3 100644
--- a/src/views/Inventory/SubstitutePart/index.vue
+++ b/src/views/Inventory/SubstitutePart/index.vue
@@ -128,10 +128,10 @@
           </div>
         </el-col>
         <el-col :span="2">
-          <div style="margin: 0px 15px">
+          <div style="margin: 0px 25px">
             <el-button size="small" type="warning" icon="el-icon-edit" @click="addSub()" >替换件</el-button>
           </div>
-          <div style="margin: 10px 15px">
+          <div style="margin: 10px 29px">
             <el-button size="small" type="primary" icon="el-icon-edit" @click="exchange()" >替换</el-button>
           </div>
         </el-col>
@@ -158,11 +158,6 @@
                   {{ scope.row.物料型号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="数量" align="center" min-width="80">
-                <template slot-scope="scope">
-                  {{ scope.row.数量 }}
-                </template>
-              </el-table-column>
               <el-table-column label="物料规格" align="center" min-width="80">
                 <template slot-scope="scope">
                   {{ scope.row.物料规格 }}
@@ -192,7 +187,7 @@
         </div>
       </el-dialog>
       <!--选择替换件-->
-      <el-dialog :visible.sync="dialogFormVisible2" title="新增替换件" center width="600px">
+      <el-dialog :visible.sync="dialogFormVisible2" title="被替换件" center width="600px" height="600px">
         <el-form :rules="rules" label-position="left">
           <el-form-item label="物料名称" prop="ContractNumberValue" label-width="150px" size="mini">
             <el-input v-model="materialName" size="small" placeholder="物料名称" style="width: 200px"/>
@@ -203,7 +198,7 @@
             border
             size = "mini"
             style="width: 100%;"
-            height="100">
+            height="200px">
             <el-table-column
               label="序号"
               align="center"

From 8cfc758d6b3f0d1a1d55578d77a55a068c356514 Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Sat, 5 Jan 2019 18:56:58 +0800
Subject: [PATCH 07/23] lx

---
 src/utils/request.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 1f855b84..cdf4a490 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,8 +20,8 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
 
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  // baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
+  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间

From ec13e61f741b3d5adb0bd60772d20f6ebafb2668 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 7 Jan 2019 09:31:38 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatePreparationBill/index.vue           | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index cdb8bb53..38eb9858 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -103,14 +103,18 @@ export default {
   },
   methods: {
     exportTable() {
-      const htmlNode = $('#BL').html()
-      const body = $('body')
-      body.children().hide()
-      const printNode = $(htmlNode)
-      body.append(printNode)
-      window.print()
-      body.children().not('script').show()
-      printNode.remove()
+      if (this.tableData2.length === 0) {
+        this.$message.warning('暂无数据')
+      } else {
+        const htmlNode = $('#BL').html()
+        const body = $('body')
+        body.children().hide()
+        const printNode = $(htmlNode)
+        body.append(printNode)
+        window.print()
+        body.children().not('script').show()
+        printNode.remove()
+      }
     },
     // 查询表格数据
     searchTable() {

From c10f541196b418376a8812d0618b1e7c95dc60de Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Mon, 7 Jan 2019 11:50:09 +0800
Subject: [PATCH 09/23] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          | 14 ++--
 .../DeliveryManagement/index.vue              | 83 +++++++++++++------
 2 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index cdf4a490..3dcf1281 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,13 +7,13 @@ export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket`
 export const name = `OP8888`
 
 // 创建axios实例
-export const readFile = `http://192.168.1.212:8411/webpage/file/` // invoice
-export const readImg = `http://192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond
-export const upload = `http://192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement
-export const upload2 = `http://192.168.1.212:8411/submit/upload2.ashx` // delivery
-export const upload3 = `http://192.168.1.212:8411/submit/upload3.ashx` // performancebond
-export const uploadInvoiceScan = `http://192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice
-export const download = `http://192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement
+export const readFile = `192.168.1.212:8411/webpage/file/` // invoice
+export const readImg = `192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond
+export const upload = `192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement
+export const upload2 = `192.168.1.212:8411/submit/upload2.ashx` // delivery
+export const upload3 = `192.168.1.212:8411/submit/upload3.ashx` // performancebond
+export const uploadInvoiceScan = `192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice
+export const download = `192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement
 const service = axios.create({
 
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index b6523571..379ddb83 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -318,11 +318,19 @@
           <el-button :disabled="btnDel" type="danger" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 50px" @click="delCargoBox()">删除</el-button>
           <el-popover
             placement="right"
-            width="80"
+            width="200"
             trigger="hover"
           >
-            <canvas v-show="show" id="canvas"/>
-            <el-button slot="reference">追溯码</el-button>
+            <div ref="imageWrapper">
+              <img :src="dataURL">
+              <slot>
+                <div v-show="show" style="text-align: center">
+                  <canvas id="canvas"/>
+                  <span>{{ containerNumber }}</span>
+                </div>
+              </slot>
+            </div>
+            <el-button slot="reference" @click="toImage">追溯码</el-button>
           </el-popover>
           <hr style="border:none;border-top:2px solid rgb(228, 231, 237)" >
           <el-table
@@ -547,49 +555,51 @@
               <col style="width: 100px">
             </colgroup>
             <tr>
-              <th class="tg-v15n" colspan="8" style="font-size: 30px">江苏高精机电装备有限公司</th>
+              <th class="tg-v15n" colspan="11" style="font-size: 30px">江苏高精机电装备有限公司</th>
               <th class="tg-c3ow" rowspan="2" style="text-align: center; line-height: 17px"><img id="img" alt="" src="http://123.206.50.60:8412/#/searchBoxDetails/index?id="></th>
             </tr>
             <tr>
-              <td class="tg-uys7" colspan="8" style="text-align: center;font-size: 20px">{{ 装箱单名称 }}发货单</td>
+              <td class="tg-uys7" colspan="11" style="text-align: center;font-size: 20px">{{ 装箱单名称 }}发货单</td>
             </tr>
             <tr>
               <td class="tg-c3ow">发货单号</td>
-              <td class="tg-c3ow" colspan="2">{{ 发货单号 }}</td>
+              <td class="tg-c3ow" colspan="3">{{ 发货单号 }}</td>
               <td class="tg-c3ow">收货人</td>
-              <td class="tg-c3ow" colspan="2">{{ 收货人 }}</td>
+              <td class="tg-c3ow" colspan="3">{{ 收货人 }}</td>
               <td class="tg-c3ow">联系电话</td>
-              <td class="tg-c3ow" colspan="2">{{ 联系电话 }}</td>
+              <td class="tg-c3ow" colspan="3">{{ 联系电话 }}</td>
             </tr>
             <tr>
               <td class="tg-c3ow">收货地址</td>
-              <td class="tg-c3ow" colspan="2">{{ 收货地址 }}</td>
+              <td class="tg-c3ow" colspan="3">{{ 收货地址 }}</td>
               <td class="tg-c3ow">委托车辆</td>
-              <td class="tg-c3ow" colspan="2">{{ 委托车辆 }}</td>
+              <td class="tg-c3ow" colspan="3">{{ 委托车辆 }}</td>
               <td class="tg-c3ow">发货日期</td>
-              <td class="tg-c3ow" colspan="2">{{ 发货日期 }}</td>
+              <td class="tg-c3ow" colspan="3">{{ 发货日期 }}</td>
             </tr>
             <tr>
               <td class="tg-c3ow">序号</td>
-              <td class="tg-c3ow">代号</td>
+              <td class="tg-c3ow" colspan="2">货箱号</td>
               <td class="tg-c3ow" colspan="2">名称</td>
+              <td class="tg-c3ow">代号</td>
               <td class="tg-c3ow">规格</td>
               <td class="tg-c3ow">数量</td>
-              <td class="tg-c3ow" colspan="2">备注</td>
+              <td class="tg-c3ow" colspan="3">备注</td>
               <td class="tg-c3ow">确认</td>
             </tr>
             <tr v-for="(list, index) in table" :key="index">
               <td class="tg-c3ow">{{ index + 1 }}</td>
-              <td class="tg-c3ow">{{ list.代号 }}</td>
+              <td class="tg-c3ow" colspan="2">{{ list.货箱号 }}</td>
               <td class="tg-c3ow" colspan="2">{{ list.名称 }}</td>
+              <td class="tg-c3ow">{{ list.代号 }}</td>
               <td class="tg-c3ow">{{ list.规格 }}</td>
               <td class="tg-c3ow">{{ list.数量 }}</td>
-              <td class="tg-c3ow" colspan="2">{{ list.备注 }}</td>
+              <td class="tg-c3ow" colspan="3">{{ list.备注 }}</td>
               <td class="tg-c3ow"/>
             </tr>
             <tr>
-              <td class="tg-c3ow" colspan="7">本清单一式两份：一份请收货人清点货物；一份请签收人签收后交还司机带回本公司。请签收人在货物卸车后立即清点！</td>
-              <td class="tg-c3ow">签收人签字：</td>
+              <td class="tg-c3ow" colspan="9">本清单一式两份：一份请收货人清点货物；一份请签收人签收后交还司机带回本公司。请签收人在货物卸车后立即清点！</td>
+              <td class="tg-c3ow" colspan="2">签收人签字：</td>
               <td class="tg-c3ow"/>
             </tr>
           </table>
@@ -610,7 +620,7 @@ import $ from 'jquery'
 import { selectDelivery, submitRremove, searchCargoBoxDetailed, submitMoveInto, delCargoBox, addCargoBox, searchCargoBox, editInvoice, delInvoice, addInvoice, editAdress, addAdress, deleteAdress, citySearch, provinceSearch, addressSearch, searchParts, searchHost, searchSparePart, searchProjectName, searchPackingList, searchFile, searchInvoice } from '@/api//MarketingCenter/DeliveryManagement'
 import QRCode from 'qrcode'
 import { upload2, readImg } from '@/utils/request'
-
+import html2Canvas from 'html2canvas'
 export default {
   components: {
     elInput
@@ -624,6 +634,7 @@ export default {
       table: [],
       canvas: [],
       show: false,
+      show1: false,
       num: '',
       DeliveryVisiable: false,
       fileList: [],
@@ -635,6 +646,8 @@ export default {
       发货日期: '',
       装箱单名称: '',
       运输状态: '',
+      containerNumber: '',
+      dataURL: '',
       a: 1, // 嵌套表格交换变量
       b: 1, // 嵌套表格交换变量
       flag1: '', // 发货单旗帜变量
@@ -883,7 +896,6 @@ export default {
     },
     // 显示编辑发货单对话框
     showEditInvoice(row) {
-      console.log(row)
       this.dialogFormVisible1 = true
       this.form1.收货地址 = row.省份 + row.市名 + row.详细地址
       this.form1.车辆牌号 = row.车辆牌号
@@ -1081,7 +1093,6 @@ export default {
       if (row.规格 === null) { this.goodsSpecifications = '' } else { this.goodsSpecifications = row.规格 }
       if (row.数量 === null) { this.goodsNumber = '' } else { this.goodsNumber = row.数量 }
       if (row.备注 === null) { this.goodsRemark = '' } else { this.goodsRemark = row.备注 }
-      console.log(this.Spare, this.goodsCodeName, this.goodsName, this.goodsSpecifications, this.goodsNumber, this.goodsRemark)
     },
     // 选择文件
     choiceFile(row) {
@@ -1101,7 +1112,6 @@ export default {
       this.goodsSpecifications = ''
       if (row.数量 === null) { this.goodsNumber = '' } else { this.goodsNumber = row.数量 }
       if (row.备注 === null) { this.goodsRemark = '' } else { this.goodsRemark = row.备注 }
-      console.log(this.Spare, this.goodsCodeName, this.goodsName, this.goodsSpecifications, this.goodsNumber, this.goodsRemark)
     },
     // 选择部件
     choiceParts(row) {
@@ -1121,7 +1131,6 @@ export default {
       if (row.规格 === null) { this.goodsSpecifications = '' } else { this.goodsSpecifications = row.规格 }
       if (row.数量 === null) { this.goodsNumber = '' } else { this.goodsNumber = row.数量 }
       if (row.备注 === null) { this.goodsRemark = '' } else { this.goodsRemark = row.备注 }
-      console.log(this.Spare, this.goodsCodeName, this.goodsName, this.goodsSpecifications, this.goodsNumber, this.goodsRemark)
     },
     choiceGoods(row) {
       this.maxNum = row.数量
@@ -1157,6 +1166,13 @@ export default {
       })
     },
     searchCargoBoxDetailed() {
+      this.货箱号 = ''
+      this.dataURL = ''
+      for (let i = 0; i < this.cargoBox.length; i++) {
+        if (this.cargoBoxValue === this.cargoBox[i].value) {
+          this.containerNumber = this.cargoBox[i].label
+        }
+      }
       this.tableData6Loading = true
       searchCargoBoxDetailed(this.cargoBoxValue).then(response => {
         this.tableData6Loading = false
@@ -1199,7 +1215,6 @@ export default {
     },
     useqrcode() {
       this.show = true
-      console.log(this.cargoBoxValue)
       // 生成的二维码内容，可以添加变量
       this.QueryDetail = this.cargoBoxValue.toString()
       var canvas = document.getElementById('canvas')
@@ -1213,6 +1228,8 @@ export default {
     },
     clear() {
       this.show = false
+      this.货箱号 = ''
+      this.dataURL = ''
     },
     async getFileList() {
       const { data } = await request({
@@ -1279,7 +1296,6 @@ export default {
       this.invoiceNum = row.发货单编号
       this.DeliveryVisiable = true
       selectDelivery(this.invoiceNum).then(response => {
-        console.log(response)
         this.table = response.data
         this.装箱单名称 = response.data[0].装箱单名称
         this.发货单号 = response.data[0].发货单号
@@ -1324,6 +1340,23 @@ export default {
     },
     callOffDownLoadDelivery() {
       this.DeliveryVisiable = false
+    },
+    toImage() {
+      this.show = false
+      html2Canvas(this.$refs.imageWrapper, {
+        backgroundColor: '#FFFFFF'
+      }).then((canvas) => {
+        const dataURL = canvas.toDataURL('image/jpeg')
+        this.dataURL = dataURL
+      }).then(() => {
+        // var oCanvas = document.getElementById('canvas')
+        var save_url = this.dataURL
+        var a = document.createElement('a')
+        document.body.appendChild(a)
+        a.href = save_url
+        a.download = this.containerNumber
+        a.click()
+      })
     }
   }
 }
@@ -1335,7 +1368,7 @@ export default {
     height: auto!important;
   }
   #canvas{
-    width: 120px !important;
+    width: 170px !important;
     height: auto!important;
   }
   #img{

From cff99e7321605059806c40a601198ec8c31e7932 Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Mon, 7 Jan 2019 20:29:21 +0800
Subject: [PATCH 10/23] lx

---
 src/api/Inventory/InventoryCheck.js          | 4 ++--
 src/views/Inventory/InventoryCheck/index.vue | 2 +-
 src/views/Inventory/SubPartCome/index.vue    | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/api/Inventory/InventoryCheck.js b/src/api/Inventory/InventoryCheck.js
index 53802841..620d6d3e 100644
--- a/src/api/Inventory/InventoryCheck.js
+++ b/src/api/Inventory/InventoryCheck.js
@@ -68,7 +68,7 @@ export function searchPurchasePartOut(teampart) {
     data: {
       type: '1',
       name: '库存管理_库存盘点_外购件出库记录',
-      param: '组件零件流水号=' + teampart
+      param: '采购合同明细流水号=' + teampart
     }
   })
 }
@@ -167,7 +167,7 @@ export function searchBasicPartOut(craftNumber) {
     method: 'post',
     data: {
       type: '1',
-      name: 'dbo.库存管理_库存盘点_基本件出库记录',
+      name: '库存管理_库存盘点_基本件出库记录',
       param: '工艺计划流水号=' + craftNumber
     }
   })
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index a0d29766..fb609a94 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -1690,7 +1690,7 @@ export default {
         this.HouseDataBasicIn = response.data
         this.listLoading7 = false
       })
-      searchPurchasePartOut(this.TeamPartNumber).then(response => {
+      searchPurchasePartOut(this.ContractDetailValue).then(response => {
         this.HouseDataBasicOut = response.data
         this.listLoading8 = false
       })
diff --git a/src/views/Inventory/SubPartCome/index.vue b/src/views/Inventory/SubPartCome/index.vue
index 3f2571e1..2982689f 100644
--- a/src/views/Inventory/SubPartCome/index.vue
+++ b/src/views/Inventory/SubPartCome/index.vue
@@ -40,6 +40,11 @@
             {{ scope.row.替换数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="申请人" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
         <el-table-column label="申请时间" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.申请时间 }}

From 80d303dbf70bb72440a01c57d19b8fe56b2f3dfe Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 10 Jan 2019 16:19:35 +0800
Subject: [PATCH 11/23] =?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            |  43 +++-
 .../MachiningSequenceAdjustment/index.vue     | 199 ++++++++++++++----
 2 files changed, 194 insertions(+), 48 deletions(-)

diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index 2cbc42e0..dc57f8fb 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -1,13 +1,48 @@
 import request from '@/utils/request'
-// 初始化 项目名称
-export function searchtable() {
+// 初始化 工位
+export function getMachine() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_项目名称_查询数据',
-      param: '考核状态=5=int'
+      name: '车间生产管理工艺_加工顺序调整_查询工位'
+    }
+  })
+}
+export function searchtable(num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_记录零件待加工显示',
+      param: 'MES终端编号=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 调序
+export function Order(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: 'MES_机加工MES_待加工区列表_排序',
+      param: 'MES终端编号=' + num1 + '&排序ID=' + num2 + '&排序类型=' + num3
+    }
+  })
+}
+// 调序权限
+export function JurisdictionControl(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_加工顺序调整_更改权限',
+      param: 'MES终端号=' + num1 + '&变更类型=' + num2
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index ef2b8b5c..bfffdf24 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -2,7 +2,18 @@
   <div class="app-container">
 
     <el-card>
-      <el-button type="success" class="el-icon-search" size="small">查询</el-button>
+      <span>工位号:</span>
+      <el-select v-model="MachineValue" size="small" filterable placeholder="工位号" style="width: 180px;">
+        <el-option
+          v-for="item in Machine"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </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>
+      </el-badge>
     </el-card>
 
     <el-card>
@@ -12,58 +23,45 @@
           align="center"
           type="index"
           width="50"/>
-        <el-table-column label="外协厂家名称" align="center" width="280px">
+        <el-table-column label="零件名称" align="center" width="310px">
           <template slot-scope="scope">
-            {{ scope.row.外协厂家名称 }}
+            {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家简称" align="center" width="110px">
+        <el-table-column label="零件图号" align="center" width="330px">
           <template slot-scope="scope">
-            {{ scope.row.外协厂家简称 }}
+            {{ scope.row.零件图号_短 }}
           </template>
         </el-table-column>
-        <el-table-column label="地址" align="center" width="280px">
+        <el-table-column label="待加工工序" align="center">
           <template slot-scope="scope">
-            {{ scope.row.地址 }}
+            {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="联系人" align="center" width="120px">
+        <el-table-column label="操作" width="300" align="center" fixed="right">
           <template slot-scope="scope">
-            {{ scope.row.联系人 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="电话" align="center" width="140px">
-          <template slot-scope="scope">
-            {{ scope.row.电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="传真" align="center" width="120px">
-          <template slot-scope="scope">
-            {{ scope.row.传真 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="设备情况" align="center" width="230px">
-          <template slot-scope="scope">
-            {{ scope.row.设备情况 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" width="150px">
-          <template slot-scope="scope">
-            {{ scope.row.备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="200px" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              class="el-icon-edit"
-              @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              class="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            <div>
+              <el-button
+                size="mini"
+                icon="el-icon-arrow-up"
+                type="primary"
+                @click="upOne(scope.row)"/>
+              <el-button
+                size="mini"
+                icon="el-icon-arrow-down"
+                type="primary"
+                @click="downOne(scope.row)"/>
+              <el-button
+                size="mini"
+                icon="el-icon-upload2"
+                type="primary"
+                @click="TOP(scope.row)"/>
+              <el-button
+                size="mini"
+                icon="el-icon-download"
+                type="primary"
+                @click="Down(scope.row)"/>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -80,14 +78,50 @@
       </div>
     </el-card>
 
+    <el-dialog :visible.sync="dialogFormVisible" width="60%">
+      <el-table :data="gridData" height="500" size="mini" border>
+        <el-table-column property="date" label="工位号" width="300" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.MES终端号 }}
+          </template>
+        </el-table-column>
+        <el-table-column property="name" label="调序权限" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.调序权限===1" type="success" size="small">已开放</el-tag>
+            <el-tag v-else type="info" size="small">未开放</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column property="date" label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.调序权限===0"
+              size="mini"
+              type="success"
+              @click="JurisdictionControl1(scope.row)">开启</el-button>
+            <el-button
+              v-if="scope.row.调序权限===1"
+              size="mini"
+              type="danger"
+              @click="JurisdictionControl2(scope.row)">关闭</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import {} from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
+import { getMachine, searchtable, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
 export default {
   data() {
     return {
+      num: 0,
+      count: 0,
+      dialogFormVisible: false,
+      gridData: [],
+      Machine: [],
+      MachineValue: '',
       loading0: false,
       tableData: [], // 表格数据
       pageSize: 10,
@@ -96,8 +130,80 @@ export default {
     }
   },
   created() {
+    this.Jurisdiction()
+    this.fetchData()
   },
   methods: {
+    // 初始化获取工位
+    fetchData() {
+      this.MachineValue = ''
+      this.Machine = []
+      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终端号
+          })
+        }
+      })
+    },
+    searchTable() {
+      if (this.MachineValue !== '' && this.MachineValue !== null) {
+        this.loading0 = true
+        searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => {
+          this.tableData = response.data.rows
+          this.total = response.data.total
+        }).then(() => {
+          this.loading0 = false
+        })
+      } else {
+        this.$message.error('请选择工位')
+      }
+    },
+    Jurisdiction() {
+      this.count = 0
+      getMachine().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 }
+        }
+        this.num = this.count
+      })
+    },
+    JurisdictionControl1(row) {
+      JurisdictionControl(row.MES终端号, 1).then(response => {
+        this.Jurisdiction()
+      })
+    },
+    JurisdictionControl2(row) {
+      JurisdictionControl(row.MES终端号, 2).then(response => {
+        this.Jurisdiction()
+      })
+    },
+    // 上移
+    upOne(row) {
+      Order(this.MachineValue, row.工序流水号, '上移').then(response => {
+        this.searchTable()
+      })
+    },
+    // 下移
+    downOne(row) {
+      Order(this.MachineValue, row.工序流水号, '下移').then(response => {
+        this.searchTable()
+      })
+    },
+    // 置顶
+    TOP(row) {
+      Order(this.MachineValue, row.工序流水号, '置顶').then(response => {
+        this.searchTable()
+      })
+    },
+    // 置底
+    Down(row) {
+      Order(this.MachineValue, row.工序流水号, '置底').then(response => {
+        this.searchTable()
+      })
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1
@@ -119,4 +225,9 @@ export default {
   .el-input{
     width: 210px;
   }
+  .item {
+    float: right;
+    margin-top: 10px;
+    margin-right: 40px;
+  }
 </style>

From e5c6fb8cee9b3abfe052f206a421cc2478c8e37e Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 10 Jan 2019 16:37:26 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatePreparationBill/index.vue           | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 38eb9858..7e1b5ea0 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -33,6 +33,21 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
+        <el-table-column label="数量" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.批次数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="材料" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.原材料规格 }}
+          </template>
+        </el-table-column>
         <el-table-column label="备料" align="center">
           <template slot-scope="scope">
             {{ scope.row.工艺要求 }}
@@ -52,25 +67,34 @@
       </div>
     </el-card>
 
-    <div v-show="false" id="BL">
+    <div id="BL">
       <table border cellspacing="0px" style="table-layout: fixed; width: 600px;">
         <colgroup>
-          <col style="width: 100px">
-          <col style="width: 150px">
+          <col style="width: 120px">
+          <col style="width: 180px">
+          <col style="width: 110px">
+          <col style="width: 110px">
+          <col style="width: 110px">
           <col style="width: 450px">
         </colgroup>
         <tr>
-          <th height="60px">GAOJING</th>
-          <th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th>
+          <th colspan="2" height="60px">GAOJING</th>
+          <th colspan="4" height="60px"><span style="font-weight:bold">备料单</span></th>
         </tr>
         <tr>
           <td align="center">零件名称</td>
           <td align="center">零件图号</td>
+          <td align="center">材料</td>
+          <td align="center">原材料规格</td>
+          <td align="center">批次数量</td>
           <td align="center">备料</td>
         </tr>
         <tr v-for="(list, index) in tableData2" :key="index">
           <td align="center">{{ list.零件名称 }}</td>
           <td align="center">{{ list.零件图号 }}</td>
+          <td align="center">{{ list.材料 }}</td>
+          <td align="center">{{ list.原材料规格 }}</td>
+          <td align="center">{{ list.批次数量 }}</td>
           <td>{{ list.工艺要求 }}</td>
         </tr>
       </table>
@@ -141,7 +165,10 @@ export default {
               零件名称: this.Data[i].零件名称,
               零件图号: this.Data[i].零件图号,
               备料打印: this.Data[i].备料打印,
-              工艺要求: response.data[0].工艺要求
+              工艺要求: response.data[0].工艺要求,
+              材料: this.Data[i].材料,
+              原材料规格: this.Data[i].原材料规格,
+              批次数量: this.Data[i].批次数量
             })
           })
           this.loading = false

From 67bf516af52e9ee610524e4852012a3cc973cabc Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 10 Jan 2019 16:38:29 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/CreatePreparationBill/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 7e1b5ea0..0073eb2c 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -67,7 +67,7 @@
       </div>
     </el-card>
 
-    <div id="BL">
+    <div v-show="false" id="BL">
       <table border cellspacing="0px" style="table-layout: fixed; width: 600px;">
         <colgroup>
           <col style="width: 120px">

From 94d17148d260e7d626c779a513af242f04676941 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 15:51:02 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E5=88=B6=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/ProcessPlanning.js    | 12 +++
 .../ProcessPlanning/index.vue                 | 91 +++++++++++++++++--
 .../UnqualifiedTreatment/index.vue            |  2 -
 3 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index be639a9b..e2f5e2d7 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -382,3 +382,15 @@ export function searchRecord(num) {
     }
   })
 }
+// 重量拷贝
+export function WeightCopy(num, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_重量拷贝_工艺计划流水号',
+      param: '工艺计划流水号=' + num + '&重量信息=' + num2
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index 676e867a..f5f1df50 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -34,7 +34,7 @@
         placeholder="零件号"
         size="small"
         @clear="clearDetail"
-        @change="searchParts">
+        @change="searchParts();searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
@@ -59,10 +59,40 @@
           <el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
         </el-input>
         <span>规格:</span>
-        <el-input v-show="false" v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
+        <el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
         <span>投产总数量:</span>
         <el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
       </div>
+      <div>
+        <el-row>
+          <el-col :span="4">
+            <span>物料类型:</span>
+            <el-select v-model="materielValue" size="small" style="margin-top: 20px;width:100px" placeholder="物料类型" @change="clear()">
+              <el-option
+                v-for="item in materiel"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col v-show="materielValue==='1'" :span="20">
+            <span>长:</span>
+            <el-input-number v-model="Length" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>宽:</span>
+            <el-input-number v-model="Width" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>高:</span>
+            <el-input-number v-model="height1" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
+          </el-col>
+          <el-col v-show="materielValue==='2'" :span="20">
+            <span>直径:</span>
+            <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>高:</span>
+            <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation2()">计算重量</el-button>
+          </el-col>
+        </el-row>
+      </div>
     </el-card>
 
     <el-card>
@@ -490,6 +520,7 @@
 <script>
 import '@/icon/iconfont.css'
 import {
+  WeightCopy,
   initCraftmen,
   getPartnames1,
   getPartnames2,
@@ -531,6 +562,21 @@ export default {
   },
   data() {
     return {
+      Result1: '',
+      Result2: '',
+      Length: '',
+      Width: '',
+      height1: '',
+      diameter: '',
+      height2: '',
+      materiel: [{
+        value: '1',
+        label: '方'
+      }, {
+        value: '2',
+        label: '柱'
+      }],
+      materielValue: '1',
       total: 0,
       pageCurrent: 1,
       pageSize: 10,
@@ -626,6 +672,37 @@ export default {
     this.getList()
   },
   methods: {
+    clear() {
+      this.Length = ''
+      this.Width = ''
+      this.height1 = ''
+      this.diameter = ''
+      this.height2 = ''
+    },
+    // 长宽高计算
+    Calculation1() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        this.Result1 = '  长:' + this.Length + '  宽:' + this.Width + '  高:' + this.height1 + '  重量:' + parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
+        WeightCopy(this.partNumValue, this.Result1).then(response => {
+          console.log(response.data)
+        }).then(() => {
+          this.searchDetail()
+        })
+      }
+    },
+    // 直径高计算
+    Calculation2() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        this.Result2 = Math.pow(parseInt(this.diameter) / 2, 2) * parseFloat(this.height2) * Math.PI
+        this.Result2 = this.Result2.toFixed(2)
+        console.log(this.Result2)
+        console.log(Math.PI)
+      }
+    },
     clearDetail() {
       this.checked = false
       this.partNumValue = ''
@@ -785,10 +862,9 @@ export default {
         this.isShow = true
       }
     },
-    searchDetail() { // 查主表和上面显示的信息
-      if (this.partNumValue === '' || this.partNumValue === null) {
-        this.$message.error('请选择零件作为查询对象')
-      } else {
+    // 查主表和上面显示的信息
+    searchDetail() {
+      if (this.partNumValue !== '' && this.partNumValue !== null) {
         this.loading0 = true
         detailInfo(this.partNumValue).then(response => {
           if (response.data.length !== 0) {
@@ -963,7 +1039,8 @@ export default {
         }
       })
     },
-    processCopy1() { // 完艺工艺拷贝
+    // 完艺工艺拷贝
+    processCopy1() {
       this.dialogFormVisible1 = false
       if (this.partNumValue === '') {
         this.$message.error('请在主界面选择一个零件作为被拷贝对象')
diff --git a/src/views/Outsourcing/UnqualifiedTreatment/index.vue b/src/views/Outsourcing/UnqualifiedTreatment/index.vue
index 545948fc..74f89877 100644
--- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue
+++ b/src/views/Outsourcing/UnqualifiedTreatment/index.vue
@@ -128,8 +128,6 @@
 
     </el-dialog>
 
-    <dialog :visible="true"/>
-
   </div>
 </template>
 

From 0ae58d70d5271f0baec1a965b2505537a6599d08 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 15:53:19 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E5=88=B6=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                    | 2 +-
 src/views/ManufacturingCenter/ProcessPlanning/index.vue | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 3337ad5e..f11fbd58 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index f5f1df50..34b51dc5 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -686,8 +686,6 @@ export default {
       } else {
         this.Result1 = '  长:' + this.Length + '  宽:' + this.Width + '  高:' + this.height1 + '  重量:' + parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
         WeightCopy(this.partNumValue, this.Result1).then(response => {
-          console.log(response.data)
-        }).then(() => {
           this.searchDetail()
         })
       }

From 31f6ddd8b4484ee391ff74bb0a468070d2463976 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 15:53:56 +0800
Subject: [PATCH 16/23] 11

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index f11fbd58..3337ad5e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间

From 79c8ea1d5f9ce2650db147355c1f9d4f637ef7a6 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 15:59:25 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E5=88=B6=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/ProcessPlanning/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index 34b51dc5..ac10d562 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -564,6 +564,7 @@ export default {
     return {
       Result1: '',
       Result2: '',
+      Result3: '',
       Length: '',
       Width: '',
       height1: '',
@@ -684,7 +685,7 @@ export default {
       if (this.partNumValue === '' || this.partNumValue === null) {
         this.$message.error('请先选择一个零件')
       } else {
-        this.Result1 = '  长:' + this.Length + '  宽:' + this.Width + '  高:' + this.height1 + '  重量:' + parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
+        this.Result1 = '长:' + this.Length + '  宽:' + this.Width + '  高:' + this.height1 + '  重量:' + parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
         WeightCopy(this.partNumValue, this.Result1).then(response => {
           this.searchDetail()
         })
@@ -697,8 +698,10 @@ export default {
       } else {
         this.Result2 = Math.pow(parseInt(this.diameter) / 2, 2) * parseFloat(this.height2) * Math.PI
         this.Result2 = this.Result2.toFixed(2)
-        console.log(this.Result2)
-        console.log(Math.PI)
+        this.Result3 = '直径:' + this.diameter + '  高:' + this.height2 + '  重量:' + this.Result2
+        WeightCopy(this.partNumValue, this.Result3).then(response => {
+          this.searchDetail()
+        })
       }
     },
     clearDetail() {

From 2013c675e4097007d77b94336b194778b6479266 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 16:06:21 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E5=88=B6=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/ProcessPlanning/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index ac10d562..fa078a74 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -1133,10 +1133,11 @@ export default {
         }
       }
     },
-    confirmSelect() { // 确定选择主表的工艺名称及要求
+    // 确定选择主表的工艺名称及要求
+    confirmSelect() {
       this.tableData[this.index].工艺编号 = this.processN1
       this.tableData[this.index].工艺名称 = this.processNameValue
-      this.str = this.str + ' ' + this.processRequestValue
+      this.str = this.str + this.processRequestValue
       this.tableData[this.index].工艺要求 = this.str
       this.dialogFormVisible2 = false
       selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {

From 94af6a9e9d054552081f8640c086b8bdde8cda16 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 17:03:35 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8A=95=E4=BA=A7?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E8=89=BA=E4=BB=BB=E5=8A=A1=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/InitialProduction.js  |  6 ++--
 .../ProcessTaskAssignment.js                  |  6 ++--
 .../InitialProduction/index.vue               | 31 +++++++---------
 .../ProcessTaskAssignment/index.vue           | 36 ++++++-------------
 4 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js
index d9442abe..20649ab8 100644
--- a/src/api/ManufacturingCenter/InitialProduction.js
+++ b/src/api/ManufacturingCenter/InitialProduction.js
@@ -13,14 +13,14 @@ export function getEntryNameValue() {
   })
 }
 // 机床名称
-export function getToolNum(num) {
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
-      param: '项目流水号=' + num + '=int&是否传递=1=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=1'
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
index 2a897c9b..95fa4391 100644
--- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js
+++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
@@ -24,14 +24,14 @@ export function getProject0() {
   })
 }
 // 获取机床图号（全部）
-export function getGraphNum(num) {
+export function getGraphNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
-      param: '项目流水号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0'
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 6d16fc7c..dff9fd8a 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -11,26 +11,20 @@
               <el-radio :label="1">整改件投产</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="项目名称" style="margin-top:28px">
-            <el-select v-model="entryNameValue" filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
-              <el-option
-                v-for="item in entryName"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="机床号">
-            <el-select v-model="toolNumValue" filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
+          <el-form-item label="机床号" style="margin-top:28px">
+            <el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床号" @change="typeChange1()">
               <el-option
                 v-for="item in toolNum"
                 :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-form-item>
-          <el-form-item label="机床组号">
-            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
+          <el-form-item label="分组">
+            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组">
               <el-option
                 v-for="item in Num"
                 :key="item.value"
@@ -434,7 +428,7 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.getCurrentTime()
     this.getNowTime()
   },
@@ -505,15 +499,14 @@ export default {
       })
     },
     typeChange() {
-      this.toolNumValue = ''
-      this.toolNum = []
       this.NumValue = ''
       this.Num = []
-      getToolNum(this.entryNameValue).then(response => {
+      getToolNum().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.toolNum.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
           })
         }
       })
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index ba2098b1..923a8cf8 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -5,34 +5,19 @@
         <el-radio :label="1">当天</el-radio>
         <el-radio :label="2">全部</el-radio>
       </el-radio-group>
-      <span>项目名称:</span>
-      <el-select
-        v-loading="loading"
-        v-model="projectNameValue"
-        element-loading-text="拼命加载中"
-        element-loading-spinner="el-icon-loading"
-        filterable
-        clearable
-        size="small"
-        placeholder="请选择项目名称"
-        style="width: 200px;margin-right:10px"
-        @change="getGraphNum()">
-        <el-option
-          v-for="item in projectName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床图号:</span>
-      <el-select v-model="graphNumValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="getGroupNum()">
+      <el-select v-model="graphNumValue" filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
         <el-option
           v-for="item in graphNum"
           :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>
       <span>组号:</span>
-      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
+      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
         <el-option
           v-for="item in GroupNum"
           :key="item.value"
@@ -168,7 +153,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.getGraphNum()
     this.initPerson()
   },
   methods: {
@@ -221,16 +206,15 @@ export default {
     getGraphNum() { // 获取下拉图号
       this.tableData = []
       this.total = 0
-      this.graphNum = []
-      this.graphNumValue = ''
       this.GroupNumValue = ''
       this.GroupNum = []
       if (this.radio === 2) { // 全部
-        getGraphNum(this.projectNameValue).then(response => {
+        getGraphNum().then(response => {
           for (let i = 0; i < response.data.length; i++) {
             this.graphNum.push({
               label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
+              value: response.data[i].机床流水号,
+              value2: response.data[i].项目名称
             })
           }
         })

From 785a76e857634d6673dc4787adc3f65f0b675b61 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 17:11:07 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E5=B9=B3=E8=A1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionCapacityBalance.js              |  4 +--
 .../ProductionCapacityBalance/index.vue       | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProductionCapacityBalance.js b/src/api/ManufacturingCenter/ProductionCapacityBalance.js
index 560946b5..65c9d804 100644
--- a/src/api/ManufacturingCenter/ProductionCapacityBalance.js
+++ b/src/api/ManufacturingCenter/ProductionCapacityBalance.js
@@ -18,8 +18,8 @@ export function getToolNum(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
-      param: '项目流水号=' + num + '=int&是否传递=2=int&考核状态=5=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=5=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index cad79f87..38eba64d 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -4,26 +4,20 @@
     <el-card>
       <div style="margin-top: -10px;">
         <el-row>
-          <span>项目名称:</span>
-          <el-select v-model="entryNameValue" size="small" filterable clearable placeholder="项目名称" @change="typeChange()">
-            <el-option
-              v-for="item in entryName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-
           <span>机床号:</span>
-          <el-select v-model="toolNumValue" size="small" filterable clearable placeholder="机床号" @change="typeChange1()" >
+          <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
             <el-option
               v-for="item in toolNum"
               :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>
 
-          <span>机床组号:</span>
-          <el-select v-model="NumValue" size="small" filterable clearable placeholder="机床组号">
+          <span>分组:</span>
+          <el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
             <el-option
               v-for="item in Num"
               :key="item.value"
@@ -727,7 +721,7 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.Selection1()
     this.getTable()
   },
@@ -990,7 +984,8 @@ export default {
         for (let i = 0; i < response.data.length; i++) {
           this.toolNum.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
           })
         }
       })

From 33319826e3e15baf14f2476efe5f37f7cfdd53b3 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Jan 2019 17:52:08 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/ProcessingStatus.js   |  8 +--
 .../ProductionCapacityBalance.js              |  4 +-
 .../ProcessingStatus/index.vue                | 59 +++++++------------
 3 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/api/ManufacturingCenter/ProcessingStatus.js
index e445996c..c3140183 100644
--- a/src/api/ManufacturingCenter/ProcessingStatus.js
+++ b/src/api/ManufacturingCenter/ProcessingStatus.js
@@ -11,15 +11,15 @@ export function getNames() {
     }
   })
 }
-
-export function getMachines(gongyi) {
+// 机床名称
+export function getMachines() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + gongyi + '=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/ProductionCapacityBalance.js b/src/api/ManufacturingCenter/ProductionCapacityBalance.js
index 65c9d804..4d63337f 100644
--- a/src/api/ManufacturingCenter/ProductionCapacityBalance.js
+++ b/src/api/ManufacturingCenter/ProductionCapacityBalance.js
@@ -11,8 +11,8 @@ export function getEntryNameValue() {
     }
   })
 }
-// 项目名称
-export function getToolNum(num) {
+// 机床名称
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 80dc229d..144c8ffd 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -2,42 +2,30 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="project" size="small" filterable clearable placeholder="项目名称" style="width: 180px;" @change="getMachine">
-          <el-option
-            v-for="item in projects"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床号:</span>
-        <el-select v-model="Machine" size="small" clearable placeholder="机床号" style="width: 180px;" @change="getGroup">
+        <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
           <el-option
             v-for="item in Machines"
             :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>
         <span>组号:</span>
-        <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 180px;">
+        <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
           <el-option
             v-for="item in Groups"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-      </el-row>
-      <el-row>
-        <el-select v-show="false" v-model="part" size="small" placeholder="是否外协">
-          <el-option
-            v-for="item in parts"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>零件图号:</span>
         <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
+      </el-row>
+      <el-row style="margin-top:10px;">
         <span>进度颜色：</span>
         <span style="background-color: red">拖期</span>
         <span style="background-color: yellow">即将拖期</span>
@@ -372,7 +360,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.getMachine()
     this.getTableData()
   },
   methods: {
@@ -394,16 +382,15 @@ export default {
       this.Machines = []
       this.Group = ''
       this.Groups = []
-      if (this.project !== '') {
-        getMachines(this.project).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machines.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      }
+      getMachines().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machines.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
+          })
+        }
+      })
     },
     getGroup() {
       this.Group = ''
@@ -420,11 +407,7 @@ export default {
     // 按条件查询
     getTableData() {
       this.listLoading1 = true
-      if (this.project === '') {
-        this.checkbox_project = false
-      } else {
-        this.checkbox_project = true
-      }
+      this.checkbox_project = false
       if (this.Machine === '') {
         this.checkbox_Machine = false
       } else {
@@ -456,7 +439,7 @@ export default {
       this.colorCode = [[]]
       this.realDate = [[]]
       this.length = 0
-      getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.part, this.pageCurrent, this.pageSize).then(response => {
+      getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.pageCurrent, this.pageSize).then(response => {
         this.length = parseInt(response.data.total)
         for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组
           this.零件图号.push(response.data.rows[i].零件图号)
@@ -471,7 +454,7 @@ export default {
         }
         if (this.零件图号.length !== 0) {
           for (let i = 0; i < this.零件图号.length; i++) {
-            getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], this.part).then(response => {
+            getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], 1).then(response => {
               this.liushuihao = response.data[0].工艺计划流水号
               for (let k = 0; k < response.data.length; k++) {
                 if (response.data[k].工艺计划流水号 === this.liushuihao) {

From 2364cb7806ef1ee9600f3b6c75dcdcd94d3afa3b Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Sat, 12 Jan 2019 09:03:22 +0800
Subject: [PATCH 22/23] bug

---
 src/api/MarketingCenter/ComprehensiveInquiryMS.js          | 4 ++--
 src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/api/MarketingCenter/ComprehensiveInquiryMS.js b/src/api/MarketingCenter/ComprehensiveInquiryMS.js
index 55e5258e..92319fb9 100644
--- a/src/api/MarketingCenter/ComprehensiveInquiryMS.js
+++ b/src/api/MarketingCenter/ComprehensiveInquiryMS.js
@@ -31,14 +31,14 @@ export function SelectMarketingManager(code) {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 83ecf558..397ed59d 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -9,6 +9,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
+      <span style="margin-left: 10px">机床型号：</span>
+      <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
       <span style="margin-left: 10px">销售经理：</span>
       <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
       <span style="margin-left: 10px">开始日期：</span>
@@ -660,6 +662,8 @@ export default {
       MarketingManagerValue: '',
       peopleid_check: '',
       startTime: '',
+      machine: '',
+      machine_check: '',
       startTime_check: null,
       endTime: '',
       endTime_check: null,
@@ -722,8 +726,9 @@ export default {
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading'])
       this.tableDataInvoiceRecord = []
       this.tableDataContractCapitalManagement = []
       this.tableDataSafetyMargin = []

From 4bf0efbaa83919a7b3b84888a22f55e406125971 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 12 Jan 2019 15:15:07 +0800
Subject: [PATCH 23/23] =?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

---
 .../ProcessingStatusEdit.js                   |  6 ++--
 .../ProcessingStatusEdit/index.vue            | 36 ++++++++-----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index ab5fd66c..539d1ef1 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -11,14 +11,14 @@ export function getNames() {
   })
 }
 
-export function getMachines(gongyi) {
+export function getMachines() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + gongyi + '=int'
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index 6a326aa4..fc808831 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -3,21 +3,16 @@
 
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="project" size="small" filterable clearable placeholder="项目名称" @change="getMachine">
-          <el-option
-            v-for="item in projects"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床号:</span>
-        <el-select v-model="Machine" size="small" clearable placeholder="机床号" @change="getGroup">
+        <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
           <el-option
             v-for="item in Machines"
             :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>
         <span>组号:</span>
         <el-select v-model="Group" size="small" clearable placeholder="组号">
@@ -435,7 +430,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.getMachine()
     this.fetchData3()
     this.getTableData()
   },
@@ -483,16 +478,15 @@ export default {
       this.Machines = []
       this.Group = ''
       this.Groups = []
-      if (this.project !== '') {
-        getMachines(this.project).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machines.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      }
+      getMachines().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machines.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
+          })
+        }
+      })
     },
     getGroup() {
       this.Group = ''