From 28c383c1d9d2c7a60f16975d430fd4ead435c761 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Feb 2019 16:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BB=B6=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/utils/request.js b/src/utils/request.js
index c4edcdbc..f2e82b1c 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://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.106: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/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index da432e2d..ae7686dd 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -5,14 +5,11 @@
       <el-input v-model="Partpaint" clearable size="small" style="width:200px" />
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
       <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" @click="Empty()">清空</el-button>
+      <el-button type="primary" size="small" class="el-icon-success" style="margin: 0 0 0 10px" @click="Innumber">入库</el-button>
     </el-card>
+
     <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        border
-        size="mini"
-        style="width: 100%;height: 650px" >
+      <el-table v-loading="listLoading" :data="tableData" border size="mini" style="width: 100%" height="650px">
         <el-table-column
           label="序号"
           align="center"
@@ -33,7 +30,6 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-
         <el-table-column label="计划数量" align="center" min-width="100">
           <template slot-scope="scope" align="center">
             <el-input v-model="tableData[scope.$index].plannumber" readonly size="small"/>
@@ -71,9 +67,8 @@
             <el-input v-model="tableData[scope.$index].note" clearable size="small"/>
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="150">
+        <el-table-column label="操作" min-width="100" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" class="el-icon-success" @click="Innumber">入库</el-button>
             <el-button
               :disabled="scope.row.是否禁用"
               size="mini"
@@ -82,10 +77,9 @@
               @click="handleDelete(scope.$index, scope.row)">移除</el-button>
           </template>
         </el-table-column>
-
       </el-table>
-
     </el-card>
+
   </div>
 </template>
 
@@ -188,17 +182,21 @@ export default {
     },
     // 扫描查询
     getscantable() {
-      if (this.partNumber === '') {
+      if (this.partNumber === '' || this.partNumber === null) {
         this.$message.error('请输入零件号')
       } else {
         this.listLoading = true
         searchTable(this.partNumber).then(response => {
           if (response.data.length === 0) {
             this.listLoading = false
-            this.$message.warning('无此零件')
-          } else if (response.data[0].剩余数量 === 0) {
-            this.$message.warning('该零件已入库完毕')
-          } else {
+            this.$message.warning('该零件未加工完成')
+          } else if (response.data[0].考核状态 === 8) {
+            this.listLoading = false
+            this.$message.warning('该零件已入库')
+          } else if (response.data[0].考核状态 === 9) {
+            this.listLoading = false
+            this.$message.warning('该零件已出库')
+          } else if (response.data[0].考核状态 === 7) {
             for (let i = 0; i < this.tableData.length; i++) {
               if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) {
                 this.ace = this.ace + 1