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

---
 .../CreatePreparationBill.js                  | 14 ++++-
 .../CreatePreparationBill/index.vue           | 22 +++++++-
 .../ProcessPlanning/index.vue                 | 55 +++----------------
 3 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js
index d27a4851..480d68fd 100644
--- a/src/api/ManufacturingCenter/CreatePreparationBill.js
+++ b/src/api/ManufacturingCenter/CreatePreparationBill.js
@@ -25,7 +25,7 @@ export function searchtable2(num1) {
     }
   })
 }
-// 更改打印状态
+// 自家备料
 export function edit(num1) {
   return request({
     url: '',
@@ -37,3 +37,15 @@ export function edit(num1) {
     }
   })
 }
+// 外购备料
+export function edit2(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料单导出_状态更改',
+      param: '工艺计划流水号=' + num1
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index fe0d40b5..3b43f3b0 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -7,7 +7,8 @@
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
         <el-checkbox v-model="all" size="mini">查询全部</el-checkbox>
         <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button>
-        <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">导出完成</el-button>
+        <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
+        <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">外购备料</el-button>
       </el-row>
     </el-card>
 
@@ -104,7 +105,7 @@
 </template>
 
 <script>
-import { searchtable, searchtable2, edit } from '@/api/ManufacturingCenter/CreatePreparationBill'
+import { searchtable, searchtable2, edit, edit2 } from '@/api/ManufacturingCenter/CreatePreparationBill'
 import { exportExcelMethod } from './exportExcel'
 import $ from 'jquery'
 export default {
@@ -196,6 +197,23 @@ export default {
         }
       }
     },
+    edit2() {
+      if (this.tableData2.length === 0) {
+        this.$message.warning('暂无数据')
+      } else {
+        this.a = 0
+        for (let i = 0; i < this.tableData2.length; i++) {
+          edit2(this.tableData2[i].工艺计划流水号).then(response => {
+            this.a += parseInt(response.data[0].result)
+            if (this.a === this.tableData2.length) {
+              this.pageSize = 10
+              this.pageCurrent = 1
+              this.searchTable()
+            }
+          })
+        }
+      }
+    },
     downLoad(tableid) {
       if (this.tableData2.length === 0) {
         this.$message.warning('暂无数据')
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index 136a33b1..4c6e958b 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -2,24 +2,12 @@
   <div class="app-container">
 
     <el-card>
-      <el-radio-group
-        v-model="radio"
-        size="small"
-        style="margin: 10px;"
-        @change="CraftmenValue = '';checked = false;
-                 partNumValue = '';typeValue = '';partName = '';
-                 material = '';materialName = '';spec = '';batchNum = '';
-                 searchParts()">
+      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="CraftmenValue = '';checked = false;partNumValue = '';typeValue = '';partName = '';material = '';materialName = '';spec = '';batchNum = '';searchParts()">
         <el-radio v-model="radio" :label="1">未编制</el-radio>
         <el-radio v-model="radio" :label="2">已编制</el-radio>
       </el-radio-group>
       <span>工艺员:</span>
-      <el-select
-        v-model="CraftmenValue"
-        placeholder="工艺员"
-        size="small"
-        style="width:100px"
-        @change="clearDetail();searchParts()">
+      <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();searchParts()">
         <el-option
           v-for="item in Craftmen"
           :key="item.value"
@@ -27,14 +15,7 @@
           :value="item.value"/>
       </el-select>
       <span>零件号:</span>
-      <el-select
-        v-model="partNumValue"
-        filterable
-        clearable
-        placeholder="零件号"
-        size="small"
-        @clear="clearDetail"
-        @change="searchParts();searchDetail()">
+      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchParts();searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
@@ -227,19 +208,8 @@
 
     <el-dialog :visible.sync="dialogMaterial" title="材质选择" center width="400px">
       <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin: 0 0 10px 10px"
-        @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
-      </el-button>
-      <el-table
-        :data="tableMaterial"
-        size="mini"
-        highlight-current-row
-        border
-        @row-click="selectMaterial">
+      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
+      <el-table :data="tableMaterial" size="mini" highlight-current-row border @row-click="selectMaterial">
         <el-table-column align="center" label="材质名称">
           <template slot-scope="scope">
             {{ scope.row.材料 }}
@@ -452,19 +422,8 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog
-      :visible.sync="dialogFormVisible3"
-      title="工艺定额人员"
-      center
-      style="min-height: 300px">
-      <el-table
-        :data="tableData3"
-        size="mini"
-        style="width: 97%;max-height: 300px"
-        height="300"
-        highlight-current-row
-        border
-        @row-click="selectPerson">
+    <el-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
+      <el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
         <el-table-column align="center" label="考勤编号" width="150">
           <template slot-scope="scope">
             {{ scope.row.考勤编号 }}