From 04baa2756e0484d1945c4109598e11b0e7bcf7fb Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 16 Aug 2019 17:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopMenu/index.vue       | 6 ++++++
 src/views/orderauthor/author/draft.vue | 3 ++-
 src/views/orderauthor/order/draft.vue  | 9 +++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/PopMenu/index.vue b/src/components/PopMenu/index.vue
index b6cc9acb8..3636f2484 100644
--- a/src/components/PopMenu/index.vue
+++ b/src/components/PopMenu/index.vue
@@ -70,6 +70,7 @@
             <el-button
               v-else
               class="dsp-block"
+              id="testId"
               type="text"
               :disabled="checkIfDisabled(item)"
               @click="item.handler"
@@ -169,6 +170,11 @@ export default {
 		},
 		close() {
 			this.show = false;
+			// 关闭时立即影藏popover组件
+            const popoverList = document.getElementsByClassName('el-popover');
+            for (let i = 0; i < popoverList.length ; i++){
+                popoverList[i].style.display = 'none';
+            }
 		},
 		checkIfDisabled(menuObj) {
 			return menuObj.disabled === true;
diff --git a/src/views/orderauthor/author/draft.vue b/src/views/orderauthor/author/draft.vue
index 6aa0355c2..822de9b96 100644
--- a/src/views/orderauthor/author/draft.vue
+++ b/src/views/orderauthor/author/draft.vue
@@ -63,6 +63,7 @@ export default {
 		},
 
 		rules() {
+		    const _this = this;
 			const baseRules = {
 				userId: [
 					{ required: true, message: this.$t('orderAuthor.userNameInput'), trigger: 'blur' }
@@ -83,7 +84,7 @@ export default {
 							if (Number.isInteger(Number(value)) && Number(value) >= 0) {
 								callback();
 							} else {
-								callback(new Error(this.$t('orderAuthor.amountInputError')));
+								callback(new Error(_this.$t('orderAuthor.amountInputError')));
 							}
 						},
 						trigger: 'blur'
diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue
index 2702a22f1..daef73392 100644
--- a/src/views/orderauthor/order/draft.vue
+++ b/src/views/orderauthor/order/draft.vue
@@ -177,11 +177,12 @@
                         { prop: 'payWays', label: this.$t('orderAuthor.paymentMethod'), type: 'select', required: false, disabled: this.payTypeIsDisabled, show: this.isShowPayType, options: this.PayTypeList },
                         { prop: 'payStatus', label: this.$t('orderAuthor.paymentStatus'), type: 'select', required: false, disabled: this.payStatusDisabled, show: this.isShowPayStatus, options: this.PayStatusTypeList },
                     ]
-                }
+                };
                 return form
             },
 
             rules() {
+                const _this = this;
                 let baseRules = {
                     organizationId: [
                         { required: true, message: this.$t('orderAuthor.organizationInput'), trigger: 'blur' }
@@ -215,7 +216,7 @@
                                 if (Number.isInteger(Number(value)) && Number(value) > 0) {
                                     callback();
                                 } else {
-                                    callback(new Error(this.$t('orderAuthor.amountInputError')));
+                                    callback(new Error(_this.$t('orderAuthor.amountInputError')));
                                 }
                             },
                             trigger: 'blur',
@@ -232,7 +233,7 @@
                                         callback();
                                     }
                                 } else {
-                                    callback(new Error(this.$t('orderAuthor.totalPriceInputError2')));
+                                    callback(new Error(_this.$t('orderAuthor.totalPriceInputError2')));
                                 }
                             },
                             trigger: 'blur',
@@ -245,7 +246,7 @@
                                 if (Number.isInteger(Number(value)) && Number(value) > 0) {
                                     callback();
                                 } else {
-                                    callback(new Error(this.$t('orderAuthor.monthAmountInputError')));
+                                    callback(new Error(_this.$t('orderAuthor.monthAmountInputError')));
                                 }
                             },
                             trigger: 'blur',