From d22d9908ee97b125f03ce206d7a9b1730186db5e Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Fri, 31 May 2019 13:38:54 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E7=BB=86=E8=85=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/ProcessingStatus.js        |  2 +-
 .../ManufacturingCenter/ProcessingStatus/index.vue     |  4 ++--
 .../ManufacturingCenter/ProjectPlanningQuery/index.vue | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/api/ManufacturingCenter/ProcessingStatus.js
index 9892821f..aa1e8c88 100644
--- a/src/api/ManufacturingCenter/ProcessingStatus.js
+++ b/src/api/ManufacturingCenter/ProcessingStatus.js
@@ -66,7 +66,7 @@ export function getExport(num) {
     method: 'post',
     data: {
       type: '3',
-      name: `select 机床流水号,组件流水号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
+      name: `select 机床流水号,机床图号,组件流水号,组号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
 from (  select 工艺计划流水号,min(工序顺序) as 待加工工序顺序
 		from 车间生产管理工艺_零件工序_视图
 		where 完成日期_短 is null and 考核状态 = 6
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index c8271a02..73b88622 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -398,8 +398,8 @@ export default {
       getExport(this.Group).then(res => {
         console.log(res.data)
         import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = ['图号及规格', '制品名称', '计划数', '材料', '当前工序名']
-          const filterVal = ['零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称']
+          const tHeader = ['机床', '组号', '图号及规格', '制品名称', '计划数', '材料', '当前工序名']
+          const filterVal = ['机床图号', '组号', '零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称']
           const list = res.data
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel({
diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
index f0b7c63c..e6b8c119 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
@@ -176,7 +176,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>
@@ -216,7 +216,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>
@@ -261,7 +261,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>
@@ -306,7 +306,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>
@@ -351,7 +351,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>

From c39dcf2fd1e0b06bd4edfa133f18770550a3d860 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 31 May 2019 13:51:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/StatusQuery.js    |  2 +-
 .../ManufacturingCenter/StatusQuery/index.vue | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index e27efdec..2811ed77 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -50,7 +50,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
+      name: '车间生产管理工艺_零件工艺计划_零件状态_查询数据',
       param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
       pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 2b25c733..ccc7bf22 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -83,15 +83,16 @@
         </el-table-column>
         <el-table-column align="center" label="投产时间" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.传递时间 }}
+            {{ scope.row.传递时间 ? scope.row.传递时间 : '—' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="零件状态" min-width="960px">
           <template slot-scope="scope">
-            <el-steps id="StatusQuery" :active="scope.row.考核状态" finish-status="success" simple>
+            <el-steps id="StatusQuery" :active="scope.row.零件状态码" finish-status="success" simple>
+              <el-step title="分配" />
               <el-step title="投产" />
-              <el-step title="工艺定额" />
-              <!--<el-step title="定额" />-->
+              <el-step title="工艺" />
+              <el-step title="定额" />
               <el-step title="平衡" />
               <el-step title="完成" />
               <el-step title="入库" />
@@ -351,12 +352,10 @@ export default {
       }
       this.loading0 = true
       searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
-          if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
-            response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
-          }
-        }
+        response.data.rows.map(v => {
+          this.$set(v, '零件状态码', v.考核状态 ? parseInt(v.考核状态) - 2 : 0)
+          v.传递时间 = v.传递时间.split(' ')[0]
+        })
         this.loading0 = false
         this.tableData = response.data.rows
         this.total = parseInt(response.data.total)

From 0e67e0f63859fd0b1ce9dd0d463b2044396bf75b Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 31 May 2019 13:57:01 +0800
Subject: [PATCH 3/5] fixed bug

---
 src/views/Assembly/DeliveryApplication/index.vue    | 2 +-
 src/views/ManufacturingCenter/StatusQuery/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue
index 8ed12e58..d58a4363 100644
--- a/src/views/Assembly/DeliveryApplication/index.vue
+++ b/src/views/Assembly/DeliveryApplication/index.vue
@@ -13,7 +13,7 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-<!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
+        <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
       </el-row>
     </el-card>
     <el-card>
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index ccc7bf22..217c0221 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -354,7 +354,7 @@ export default {
       searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
         response.data.rows.map(v => {
           this.$set(v, '零件状态码', v.考核状态 ? parseInt(v.考核状态) - 2 : 0)
-          v.传递时间 = v.传递时间.split(' ')[0]
+          v.传递时间 = v.传递时间 ? v.传递时间.split(' ')[0] : ''
         })
         this.loading0 = false
         this.tableData = response.data.rows

From 278f4b8c45d7824e73e85aaa741ee36e39a9806f Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 31 May 2019 13:58:21 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=A5=B7=E5=91=8A=E6=88=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Assembly/DeliveryApplication/index.vue       |  2 +-
 .../OutsourcingStockArrival/index.vue                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue
index 8ed12e58..d58a4363 100644
--- a/src/views/Assembly/DeliveryApplication/index.vue
+++ b/src/views/Assembly/DeliveryApplication/index.vue
@@ -13,7 +13,7 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-<!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
+        <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
       </el-row>
     </el-card>
     <el-card>
diff --git a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
index 60d4cd65..7295005b 100644
--- a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
@@ -94,6 +94,11 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
+        <el-table-column label="原材料名称" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.原材料名称 }}
+          </template>
+        </el-table-column>
         <el-table-column label="材料" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.材料 }}
@@ -109,11 +114,6 @@
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="请购重量" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.重量 }}
-          </template>
-        </el-table-column>
         <el-table-column label="备注" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.备注1 }}

From 4a5fe7dae6797c6e67e87ce77682df9ea8a32e05 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 31 May 2019 16:45:41 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/StatusQuery.js    |  2 +-
 .../ManufacturingCenter/StatusQuery/index.vue | 38 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index 2811ed77..e27efdec 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -50,7 +50,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_零件状态_查询数据',
+      name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
       param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
       pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 217c0221..1f6f39b1 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -50,28 +50,28 @@
       <el-table
         v-loading="loading0"
         :data="tableData"
-        style="width: 100%;max-height: 610px"
-        height="610"
+        style="width: 100%;max-height: 600px"
+        height="600"
         size="mini"
         highlight-current-row
         border>
-        <el-table-column align="center" label="序号" type="index" width="50px"/>
-        <el-table-column align="center" label="机床图号" width="100px">
+        <el-table-column align="center" label="序号" type="index" width="60px"/>
+        <el-table-column align="center" label="机床图号" width="170px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="组号" width="60px">
+        <el-table-column align="center" label="组号" width="140px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件图号" width="150px">
+        <el-table-column align="center" label="零件图号" width="200px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件名称" width="100px">
+        <el-table-column align="center" label="零件名称" width="180px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -81,15 +81,14 @@
             {{ scope.row.投产总数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投产时间" width="100px">
+        <el-table-column align="center" label="投产时间" width="130px">
           <template slot-scope="scope">
-            {{ scope.row.传递时间 ? scope.row.传递时间 : '—' }}
+            {{ scope.row.传递时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件状态" min-width="960px">
+        <el-table-column align="center" label="零件状态" width="750px">
           <template slot-scope="scope">
-            <el-steps id="StatusQuery" :active="scope.row.零件状态码" finish-status="success" simple>
-              <el-step title="分配" />
+            <el-steps :active="scope.row.考核状态" finish-status="success" simple>
               <el-step title="投产" />
               <el-step title="工艺" />
               <el-step title="定额" />
@@ -352,10 +351,12 @@ export default {
       }
       this.loading0 = true
       searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
-        response.data.rows.map(v => {
-          this.$set(v, '零件状态码', v.考核状态 ? parseInt(v.考核状态) - 2 : 0)
-          v.传递时间 = v.传递时间 ? v.传递时间.split(' ')[0] : ''
-        })
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
+          if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
+            response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
+          }
+        }
         this.loading0 = false
         this.tableData = response.data.rows
         this.total = parseInt(response.data.total)
@@ -490,8 +491,3 @@ export default {
     margin: 10px 0 10px 10px;
   }
 </style>
-<style>
-  #StatusQuery {
-    padding: 8px 30px;
-  }
-</style>