From a4cdb602a033f28c1edde385909002a65844ea11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 29 Sep 2021 10:53:52 +0800
Subject: [PATCH 1/2] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue | 6 +++++-
 src/pages/processCenter/pages/creatProcess/xmpg/step1.vue   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 75aaf9e36..d19b26aaf 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -779,11 +779,15 @@ export default {
       if (this.dataList.length < 1) {
         this.satisfyFlag = false
         this.$message.warning("请添加产品线信息");
+      }else{
+        this.satisfyFlag = true
       }
       this.dataList.forEach(item => {
-        if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+        if (!item.distributePerson) {
           this.satisfyFlag = false
           this.$message.warning("请选择分发责任人");
+        }else{
+          this.satisfyFlag = true
         }
       });
       if(this.satisfyFlag){
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 9d5bbc2ab..46e7792e5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -752,11 +752,15 @@ export default {
       if (this.dataList.length < 1) {
         this.satisfyFlag = false
         this.$message.warning("请添加产品线信息");
+      }else {
+        this.satisfyFlag = true
       }
       this.dataList.forEach(item => {
-        if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+        if (!item.distributePerson) {
           this.satisfyFlag = false
           this.$message.warning("请选择分发责任人");
+        }else {
+          this.satisfyFlag = true
         }
       });
       if(this.satisfyFlag){

From 5dd1ab5b7a99035a8a480be82a9d9017bd718f17 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 29 Sep 2021 11:12:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=B1=9E=E6=80=A7=E8=8F=9C=E5=8D=95=E4=BE=9D=E7=84=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 6ecccb894..d351f035e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2872,12 +2872,14 @@ export default {
       this.$set(data, 'showDel', false)
     },
     treeClick(treeNode) {
+      console.log("hello")
       this.selectSarMenu = treeNode
       this.standCommonlySearch.menuId = treeNode.id
       this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
       this.sarStandardsSearch.page = 1
       this.standCommonlySearch.page = 1
-      this.getDomesticStandardTable(this.tableFlag)
+      //搜索后点击属性菜单依然显示搜索条件的数据
+      this.getDomesticStandardTable(this.standCommonlySearch)
     },
     // 点击搜索按钮
     searchBtnClick(standCommonlySearch) {