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

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -88,7 +88,7 @@ export default {
     this.tabValue = this.list[0].name;
   },
   beforeRouteLeave(to, from, next) {
-    const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "ProjectAddEit", "OtherAddEit"];
+    const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"];
     // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
     if (toName.includes(to.name)) {
       this.$store.commit("SET_ACCESS_STANDARD_REG_TABS", this.tabValue);

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -198,6 +198,9 @@
                   <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">
                     查看
                   </el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="'91ed4c216c019e869aad04baf7bc7db4'">
+                    发起确认流程
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -891,6 +894,9 @@ export default {
         case "查看":
           this.handlePreview(command[0]);
           break;
+        case "发起确认流程":
+          this.handleProcess(command[0]);
+          break;
       }
     },
     /**
@@ -1394,19 +1400,15 @@ export default {
         }
       });
     },
-    // 关联
-    handleRelation(row) {
-      this.row = row;
-      this.rowId = this.row.id;
-      this.getSearchInforList();
-      this.getRelectiontTable();
-      this.showModelRelation = true;
-      this.$nextTick(() => {
-        this.relationTableHeight = $(".demo-drawer-content").height() - 52 - 60;
-        window.onresize = function() {
-          this.relationTableHeight = $(".demo-drawer-content").height() - 52 - 60;
-        }.bind(this);
-      });
+    // 发起确认流程
+    handleProcess(row) {
+      // 项目清单确认流程
+      this.$router.push({
+        name:'xmqdqrStep1-4',
+        query: {
+          row
+        }
+      })
     },
     // 关联里面条件查询的下拉列表数据获取
     getSearchInforList() {