From 6bd5eb565a532ffaf2031de221d99382da3015f7 Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Tue, 20 Nov 2018 10:54:46 +0800
Subject: [PATCH] lx1120

---
 src/views/Inventory/PickingList/index.vue | 46 +++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 2e3d5444..544e7aee 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -434,14 +434,14 @@ import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
-      ProjectValue: ' ',
+      ProjectValue: null,
       Project: [],
-      ProjectValue_check: 1,
-      MachineValue: ' ',
+      ProjectValue_check: 0,
+      MachineValue: null,
       Machine: [],
-      MachineValue_check: 1,
-      GroupNumValue: ' ',
-      GroupNumValue_check: 1,
+      MachineValue_check: 0,
+      GroupNumValue: null,
+      GroupNumValue_check: 0,
       GroupNum: [],
       tableDataBasic: [],
       tableDataPurchase: [],
@@ -572,14 +572,14 @@ export default {
     searchPartinfo() {
       this.tableDataPurchase = []
       this.tableDataBasic = []
-      if (this.ProjectValue === ' ') {
-        this.ProjectValue_check = 0
+      if (this.ProjectValue !== null && this.ProjectValue !== '') {
+        this.ProjectValue_check = 1
       }
-      if (this.MachineValue === ' ') {
-        this.MachineValue_check = 0
+      if (this.MachineValue !== null && this.MachineValue !== '') {
+        this.MachineValue_check = 1
       }
-      if (this.GroupNumValue === ' ') {
-        this.GroupNumValue_check = 0
+      if (this.GroupNumValue !== null && this.GroupNumValue !== '') {
+        this.GroupNumValue_check = 1
       }
       this.listLoading = true
       this.listLoading1 = true
@@ -604,23 +604,23 @@ export default {
       })
     },
     handleSizeChange(val) {
-      this.PageCurrent = 1
-      this.PageSize = val
-      this.searchPartinfo()
-    },
-    handleCurrentChange(val) {
-      this.PageCurrent = val
-      this.searchPartinfo()
-    },
-    handleSizeChange1(val) {
       this.PageCurrent1 = 1
       this.PageSize1 = val
       this.searchPartinfo()
     },
-    handleCurrentChange1(val) {
+    handleCurrentChange(val) {
       this.PageCurrent1 = val
       this.searchPartinfo()
     },
+    handleSizeChange1(val) {
+      this.PageCurrent = 1
+      this.PageSize = val
+      this.searchPartinfo()
+    },
+    handleCurrentChange1(val) {
+      this.PageCurrent = val
+      this.searchPartinfo()
+    },
     handleSizeChangex(val) {
       this.PageCurrentx = 1
       this.PageSizex = val
@@ -791,7 +791,7 @@ export default {
       } else {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
               } else {