From cadfb7f8a923dcc89117b52429449e538ae97784 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 12 May 2020 13:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SelfMadePartsWarehouseOut/index.vue       | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
index d51023ef..23c0952a 100644
--- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
+++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
@@ -2,27 +2,20 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <!--        <el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">-->
-        <!--          <el-option-->
-        <!--            v-for="item in entryName"-->
-        <!--            :key="item.value"-->
-        <!--            :label="item.label"-->
-        <!--            :value="item.value"/>-->
-        <!--        </el-select>-->
-        <!--        <el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">-->
-        <!--          <el-option-->
-        <!--            v-for="item in machineTool"-->
-        <!--            :key="item.value"-->
-        <!--            :label="item.label"-->
-        <!--            :value="item.value"/>-->
-        <!--        </el-select>-->
-        <!--        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;margin: 10px 10px 0px 10px">-->
-        <!--          <el-option-->
-        <!--            v-for="item in groupNumber"-->
-        <!--            :key="item.value"-->
-        <!--            :label="item.label"-->
-        <!--            :value="item.value"/>-->
-        <!--        </el-select>-->
+        <el-select v-model="machineToolValue" placeholder="机床号" size="small" filterable clearable style="width: 150px" @change="searchGroupList">
+          <el-option
+            v-for="item in machineTool"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;">
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin-left: 0px"/>
         <el-button type="primary" icon="el-icon-search" size="small" plain style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
         <el-button type="warning" size="small" style="margin: 15px 0 0 10px" plain @click="wareHousing">出库</el-button>
@@ -125,8 +118,6 @@
 </template>
 
 <script>
-// import { url } from '@/utils/request'
-// import axios from 'axios'
 import { initProject, searchmachine, searchgroup, searchdata, warehousing, selectdepartment, selectleaders } from '@/api/Inventory/SelfMadePartsWarehouseOut'
 export default {
   data() {
@@ -162,8 +153,8 @@ export default {
     }
   },
   created() {
-    this.fetchData()
-    this.searchData()
+    this.SearchMachine()
+    // this.searchData()
   },
   methods: {
     searchData() {
@@ -173,6 +164,7 @@ export default {
       const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1
       const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1
       searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
+        console.log(response.data)
         if (response.data.rows.length !== 0) {
           for (let i = 0; i < response.data.rows.length; i++) {
             this.tableData.push({
@@ -227,16 +219,14 @@ export default {
       this.machineTool = []
       this.groupNumberValue = ''
       this.groupNumber = []
-      if (this.entryNameValue) {
-        searchmachine(this.entryNameValue, 1).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machineTool.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      }
+      searchmachine(0, 0).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineTool.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
     },
     // 查询组号
     searchGroupList() {