From 6a3374a2df77034c82b1cf803b6932b1e8674966 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 15 Feb 2019 09:50:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/InventoryCheck/index.vue | 54 +++++++++-----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index fb609a94..44903572 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -37,14 +37,7 @@
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchBasciPartinfo()">基本件查询</el-button><br>
       </el-card>
         <el-card v-show="basicshow">
-          <el-table
-            v-loading="listLoading"
-            :data="tableDataBasic"
-            size="mini"
-            border
-            style="width: 100%;"
-            height="200"
-            @row-click="searchBasicPartRecord">
+          <el-table v-loading="listLoading" :data="tableDataBasic" size="mini" border style="width: 100%;" height="200" @row-click="searchBasicPartRecord">
             <el-table-column
               label="序号"
               align="center"
@@ -321,21 +314,6 @@
           </el-table>
         </el-card>
       </el-tab-pane>
-      <!--编辑零件数量对话框-->
-      <el-dialog :visible.sync="dialogFormVisible" title="盘点修改" center width="380px">
-        <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
-          <el-form-item label="零件数量" prop="Number" label-width="100px" size="small">
-            <el-input v-model="form2.Number" size="small" placeholder="零件数量" style="width: 200px"/>
-          </el-form-item>
-          <el-form-item label="修改原因" prop="AlterReason" label-width="100px">
-            <el-input v-model="form2.AlterReason" size="small" placeholder="修改原因" style="width: 200px"/>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="callOff2('form2')">取消</el-button>
-          <el-button type="primary" @click="submitChannge()">确 定</el-button>
-        </div>
-      </el-dialog>
       <el-tab-pane label="采购" name="second">
         <el-card v-show="purchaseshow">
           <el-radio-group
@@ -1150,6 +1128,21 @@
         </el-card>
       </el-tab-pane>
     </el-tabs>
+    <!--编辑零件数量对话框-->
+    <el-dialog :visible.sync="dialogFormVisible" title="盘点修改" center width="380px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
+        <el-form-item label="零件数量" prop="Number" label-width="100px" size="small">
+          <el-input v-model="form2.Number" size="small" placeholder="零件数量" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="修改原因" prop="AlterReason" label-width="100px">
+          <el-input v-model="form2.AlterReason" size="small" placeholder="修改原因" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff2('form2')">取消</el-button>
+        <el-button type="primary" @click="submitChannge()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1570,12 +1563,12 @@ export default {
         } else {
           this.$message.error('添加失败')
         }
-        this.form = {}
+        this.form.safeNumber = ''
       })
     },
     // 重置表单
     callOff(formName) {
-      this.form = {}
+      this.form.safeNumber = ''
       this.dialogFormVisible2 = false
       this.$refs[formName].resetFields()
     },
@@ -1734,7 +1727,8 @@ export default {
       })
     },
     AlterNumber(row) {
-      this.form2 = []
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
       this.project = row.项目流水号
       this.machinenumber = row.机床流水号
       this.partnumber = row.组件流水号
@@ -1753,7 +1747,8 @@ export default {
       this.material = row.材料
     },
     AlterBasicNumber(row) {
-      this.form2 = []
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
       this.project = row.项目流水号
       this.machinenumber = row.机床流水号
       this.partnumber = row.组件流水号
@@ -1764,12 +1759,12 @@ export default {
       this.receive = row.收件信息id
       this.materiallocate = row.物料与货位对照流水号
       this.materialType = row.零件类型
-      this.dialogFormVisible = true
       this.name = row.零件名称
       this.mode = row.物料规格
       this.picture = row.零件图号
       this.type = row.物料型号
       this.material = row.材料
+      this.dialogFormVisible = true
     },
     submitChannge() {
       CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate, this.name, this.mode, this.picture, this.type, this.material).then(response => {
@@ -1784,7 +1779,8 @@ export default {
     },
     callOff2() {
       this.dialogFormVisible = false
-      this.form2 = {}
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
     }
   }
 }