From 4fe3e9e52e75aff20572529be267c71d3b9563d3 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 18 Mar 2020 13:45:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/CreatePickingList/index.vue              | 1 -
 src/views/PurchasingCenter/PurchaseSituationSearch/index.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 5bf8e4b3..34caf125 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -22,7 +22,6 @@
           </el-select>
           <el-input v-model="Name" placeholder="物料名称、规格、型号" clearable style="width: 200px" size="small"/>
           <el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=300;pageCurrent1=1;pageSize1=300;pageCurrent2=1;pageSize2=300;pageCurrent4=1;pageSize4=20;searchTable()">查询</el-button>
-          <el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
           <el-switch
             v-model="PickingValue"
             active-color="#13ce66"
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 7ae762cf..a8f7566f 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -679,7 +679,6 @@ export default {
             })
           }
         }
-        console.log(response.data.total, this.total1, 898989)
         this.loading1 = false
       }).catch(() => {
         this.loading1 = false

From 715298cf6c297d1bec188bd6c57bfd9a21db03ec Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 18 Mar 2020 14:13:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=98=E7=92=90=E7=8F=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Assembly/AssemblyExecution/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 10e9ebb9..66bad913 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();searchTable2()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -318,7 +318,7 @@ export default {
       ComponentStateUpdate(row.计划流水号, 3).then(response => {
         this.searchTable1()
         row.buttonStatus = 1
-        // this.searchTable2()
+        this.searchTable2()
       })
     },
     // 取消结束部装
@@ -326,7 +326,7 @@ export default {
       ComponentStateUpdate(row.计划流水号, 4).then(response => {
         this.searchTable1()
         row.buttonStatus = 2
-        // this.searchTable2()
+        this.searchTable2()
       })
     },
     initProject() {

From 8151bd6393b5cd0bf708e1ea07cb562269abe3ab Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 18 Mar 2020 17:47:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=98=E7=92=90=E7=8F=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Assembly/AssemblyExecution/index.vue      |  4 ++--
 src/views/Assembly/ColdWorkPlanExecution/index.vue  | 12 ++++++------
 src/views/Assembly/MakeAssemblyPlan/index.vue       | 12 +++++++++---
 src/views/Assembly/MakeColdWorkPlan/index.vue       |  4 ++--
 src/views/Assembly/MakeElectricalAssembly/index.vue |  4 ++--
 src/views/Assembly/MakePaintPlan/index.vue          |  4 ++--
 src/views/Assembly/PaintPlanExecution/index.vue     |  6 +++---
 7 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 66bad913..ad60e67c 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -125,9 +125,9 @@
             <el-button v-if="scope.row.调试状态===2" size="small" type="text" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button>
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top" style="margin-left: 10px">
               <div style="display: inline-block">
-                <el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-if="scope.row.edit" type="text" size="small" @click="confirmEdit(scope.row)">确定</el-button>
                 <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
-                <el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
+                <el-button v-if="scope.row.edit" type="text" size="small" @click="cancel(scope.row)">取消</el-button>
               </div>
             </el-tooltip>
           </template>
diff --git a/src/views/Assembly/ColdWorkPlanExecution/index.vue b/src/views/Assembly/ColdWorkPlanExecution/index.vue
index aa6cc977..69096f03 100644
--- a/src/views/Assembly/ColdWorkPlanExecution/index.vue
+++ b/src/views/Assembly/ColdWorkPlanExecution/index.vue
@@ -87,9 +87,9 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button v-if="!scope.row.isEditing" type="text" size="small" @click="editTable2(scope.row)"/>
-                <el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button>
-                <el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button>
+                <el-button v-if="!scope.row.isEditing" type="text" size="small" icon="el-icon-edit-outline" @click="editTable2(scope.row)"/>
+                <el-button v-if="scope.row.isEditing" type="text" size="small" @click="submitTable2(scope.row)">确定</el-button>
+                <el-button v-if="scope.row.isEditing" type="text" size="small" @click="cancelTable2(scope.row)">取消</el-button>
               </div>
             </el-tooltip>
             <el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>
@@ -203,9 +203,7 @@ export default {
       if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
         this.check2 = 1
         searchTable2(this.machineNumberValue, 3).then(response => {
-          console.log(response.data, 111)
-          this.tableData2 = response.data
-          this.tableData2.map(v => {
+          response.data.map(v => {
             this.$set(v, 'isEditing', false)
             this.$set(v, '原实际工时', '')
             this.$set(v, '原修补工时', '')
@@ -219,6 +217,8 @@ export default {
             }
             return v
           })
+          this.tableData2 = response.data
+          console.log(this.tableData2, 111)
         })
       } else { this.check2 = 0 }
     },
diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue
index 89cd429c..6258d4dc 100644
--- a/src/views/Assembly/MakeAssemblyPlan/index.vue
+++ b/src/views/Assembly/MakeAssemblyPlan/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row style="margin-top: 10px; margin-bottom: 10px">
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -198,7 +198,12 @@ export default {
       })
     },
     confirmEdit(row) {
-      editData(row.计划流水号, row.组件流水号, row.组号, row.任务名称, row.计划工时).then(response => {
+      console.log(row, 999)
+      let obj = {}
+      obj = this.groupNum.find((item) => { // 这里的userList就是上面遍历的数据源
+        return item.value === row.组件流水号// 筛选出匹配数据
+      })
+      editData(row.计划流水号, row.组件流水号, obj.label, row.任务名称, row.计划工时).then(response => {
         if (response.data[0].result === '1') {
           row.edit = false
           this.tableData2 = []
@@ -244,7 +249,8 @@ export default {
       })
     },
     addTable() {
-      if (this.machineNumberValue !== '') {
+      console.log(this.machineNumberValue, 888)
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
         addData(this.machineNumberValue, 1).then(response => {
           console.log(response)
           if (response.data[0].result === '1') {
diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue
index 8b8b816d..ff6f19cd 100644
--- a/src/views/Assembly/MakeColdWorkPlan/index.vue
+++ b/src/views/Assembly/MakeColdWorkPlan/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row style="margin-top: 10px; margin-bottom: 10px">
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -250,7 +250,7 @@ export default {
       })
     },
     addTable() {
-      if (this.machineNumberValue !== '') {
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
         addData(this.machineNumberValue, 3).then(response => {
           console.log(response)
           if (response.data[0].result === '1') {
diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue
index 3b41ae67..2f8aa9bd 100644
--- a/src/views/Assembly/MakeElectricalAssembly/index.vue
+++ b/src/views/Assembly/MakeElectricalAssembly/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row style="margin-top: 10px; margin-bottom: 10px">
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -238,7 +238,7 @@ export default {
       })
     },
     addTable() {
-      if (this.machineNumberValue !== '') {
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
         addData(this.machineNumberValue, 2).then(response => {
           console.log(response)
           if (response.data[0].result === '1') {
diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue
index c8b948a5..3ac3c793 100644
--- a/src/views/Assembly/MakePaintPlan/index.vue
+++ b/src/views/Assembly/MakePaintPlan/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row style="margin-top: 10px; margin-bottom: 10px">
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -238,7 +238,7 @@ export default {
       })
     },
     addTable() {
-      if (this.machineNumberValue !== '') {
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
         addData(this.machineNumberValue, 4).then(response => {
           console.log(response)
           if (response.data[0].result === '1') {
diff --git a/src/views/Assembly/PaintPlanExecution/index.vue b/src/views/Assembly/PaintPlanExecution/index.vue
index 5466eb08..889dbb57 100644
--- a/src/views/Assembly/PaintPlanExecution/index.vue
+++ b/src/views/Assembly/PaintPlanExecution/index.vue
@@ -87,9 +87,9 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button v-if="!scope.row.isEditing" type="text" size="small" @click="editTable2(scope.row)"/>
-                <el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button>
-                <el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button>
+                <el-button v-if="!scope.row.isEditing" type="text" size="small" icon="el-icon-edit-outline" @click="editTable2(scope.row)"/>
+                <el-button v-if="scope.row.isEditing" type="text" size="small" @click="submitTable2(scope.row)">确定</el-button>
+                <el-button v-if="scope.row.isEditing" type="text" size="small" @click="cancelTable2(scope.row)">取消</el-button>
               </div>
             </el-tooltip>
             <el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>