Merge remote-tracking branch 'origin/develop' into develop

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){

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){

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) {