From be33541753fe57ff89c427862dd53ab8e0d9cebe Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 17 Apr 2020 14:23:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=89=93=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionPlanQuery.js                    | 13 +++++
 .../ProductionPlanQuery/index.vue             | 53 ++++++++++++++-----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProductionPlanQuery.js b/src/api/ManufacturingCenter/ProductionPlanQuery.js
index 8951b484..168c1295 100644
--- a/src/api/ManufacturingCenter/ProductionPlanQuery.js
+++ b/src/api/ManufacturingCenter/ProductionPlanQuery.js
@@ -30,3 +30,16 @@ export function searchtable() {
     }
   })
 }
+export function repulse(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '车间生产管理工艺_生产计划_打回零件',
+      param: `工艺计划流水号=${num}`
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
index 61342a02..a756e038 100644
--- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
@@ -23,7 +23,6 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"/>
             <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
-            <!--<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;loginsession()">session</el-button>-->
             <el-tooltip :open-delay="1200" effect="dark" content="只查询加急的零件" placement="top">
               <el-checkbox v-model="all" size="small">加急</el-checkbox>
             </el-tooltip>
@@ -33,7 +32,7 @@
       </div>
     </div>
     <el-card>
-      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1090px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
+      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1180px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
         <el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -85,6 +84,11 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" width="90px" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="repulse(scope.row)">打回</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
@@ -102,7 +106,7 @@
 </template>
 
 <script>
-import { searchMachine, searchtable } from '@/api/ManufacturingCenter/ProductionPlanQuery'
+import { searchMachine, searchtable, repulse } from '@/api/ManufacturingCenter/ProductionPlanQuery'
 export default {
   data() {
     return {
@@ -124,17 +128,6 @@ export default {
     this.projectChange()
   },
   methods: {
-    loginsession() {
-      this.$axios({
-        methods: 'post',
-        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=1222',
-        data: {
-          userName: '0000'
-        }
-      }).then(res => {
-        console.log(res, 9999)
-      })
-    },
     projectChange() {
       this.machineName = []
       this.machineNameValue = ''
@@ -200,6 +193,38 @@ export default {
         this.$message.warning('请输入筛选条件')
       }
     },
+    repulse(row) {
+      if (row.考核状态 >= 6) {
+        this.$confirm('该零件已在加工中，请去零件报废页处理该零件', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log(1)
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消打回'
+          })
+        })
+      } else {
+        this.$confirm('确定打回该零件?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          repulse(row.工艺计划流水号).then(response => {
+            this.searchTable()
+            this.$message.success('打回成功')
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消打回'
+          })
+        })
+      }
+    },
     tableRowClassName({ row }) {
       if (row.是否加急 === '1') {
         return 'UrgentItem'