From 5f41d263046c30356d0de9d5bd090f118ef2eab4 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Fri, 14 Dec 2018 19:50:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=A5=E7=BA=A6=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E9=87=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MarketingCenter/PerformanceBond/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 16c73912..5f19eec1 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -270,6 +270,7 @@ export default {
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
       this.listLoading1 = true
       searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
+        this.tableData2 = []
         this.listLoading1 = false
         const data = response.data
         for (let i = 0; i < data.rows.length; i++) {
@@ -283,11 +284,13 @@ export default {
     handleSizeChange(val) {
       this.PageCurrent = 1
       this.PageSize = val
+      this.tableData2 = []
       this.fetchTableData1()
     },
     // 项目信息表格翻页
     handleCurrentChange(val) {
       this.PageCurrent = val
+      this.tableData2 = []
       this.fetchTableData1()
     },
     // 履约保证金查询
@@ -315,6 +318,7 @@ export default {
           this.activeName = 'second'
         } else {
           this.$message.warning('未缴纳履约保证金')
+          this.tableData2 = []
         }
       })
     },

From 5cae4fedab28a44d16155bd2020029ab8850fda8 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 15 Dec 2018 08:49:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D?=
 =?UTF-8?q?=E8=80=83=E6=A0=B8=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/ProcessPlanning.js                | 4 ++--
 src/api/ManufacturingCenter/QuotaFormulation.js               | 2 +-
 .../ManufacturingCenter/MaterialArrivalManagement/index.vue   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index 9fb095b0..73f70ed3 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -8,7 +8,7 @@ export function initCraftmen() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17'
+      param: '考核部门编号=9'
     }
   })
 }
@@ -174,7 +174,7 @@ export function initPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17'
+      param: '考核部门编号=9'
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/QuotaFormulation.js b/src/api/ManufacturingCenter/QuotaFormulation.js
index edaacb23..939492c8 100644
--- a/src/api/ManufacturingCenter/QuotaFormulation.js
+++ b/src/api/ManufacturingCenter/QuotaFormulation.js
@@ -32,7 +32,7 @@ export function getPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17'
+      param: '考核部门编号=9'
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index e14509b8..4fe49653 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -111,7 +111,7 @@ export default {
     },
     edit() {
       if (this.arrest.length === 0) {
-        this.$message.warning('暂无数据')
+        this.$message.warning('请选择零件')
       } else {
         for (let i = 0; i < this.arrest.length; i++) {
           edit(this.arrest[i].工艺计划流水号)