修改一并申请规则

@@ -59,7 +59,7 @@
   import { datas, sendThis } from "../javascript/selectFwsyq.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { selectFwsyq } from "@/api/ywsq.js";
-  import { startBusinessFlow } from "@/api/workFlow.js";
+  import { startBusinessFlow,startTogetherFlow  } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {
@@ -107,8 +107,37 @@
           this.$message.error("请至少选择一条数据");
           return;
         }
-        this.loading = true
-        startBusinessFlow({
+        this.loading = true;
+         if(this.sqywInfo.sqfl=='1'){
+          startBusinessFlow({
+                    bsmSqyw: this.sqywInfo.bsmSqyw,
+                    bdcdysz: this.bdcdysz,
+                  }).then((res) => {
+                    this.loading = false
+                    if (res.code == 200) {
+                      this.$message({
+                        showClose: true,
+                        message: "发起申请成功",
+                        type: "success",
+                      });
+                      if (!this.isJump) {
+                        this.jump(res.result, this.sqywInfo.djywbm);
+                      } else {
+                        store.dispatch('user/refreshPage', true);
+                      }
+                      this.$popupCacel()
+                    } else {
+                      if (res.result && res.result.length > 0) {
+                        ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+                      } else {
+                        ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+                      }
+                    }
+                  }).catch(() => {
+                    this.loading = false
+                  })
+         }else{
+            startTogetherFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
         }).then((res) => {
@@ -116,15 +145,15 @@
           if (res.code == 200) {
             this.$message({
               showClose: true,
-              message: "发起申请成功",
-              type: "success",
-            });
+              message: '发起申请成功',
+              type: 'success'
+            })
             if (!this.isJump) {
-              this.jump(res.result, this.sqywInfo.djywbm);
+              this.jump(res.result, this.sqywInfo.djywbm)
             } else {
               store.dispatch('user/refreshPage', true);
+              this.$popupCacel()
             }
-            this.$popupCacel()
           } else {
             if (res.result && res.result.length > 0) {
               ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
@@ -135,6 +164,8 @@
         }).catch(() => {
           this.loading = false
         })
+         }
+        
       },
       /**
        * @description: handleSelectionChange

-export function queueDjywmc (djywbm, djqxbm) {
+export function queueDjywmc(djywbm, djqxbm) {
     console.log(djywbm, 'djywbm');
     if (djqxbm == "A0320099" || djqxbm == "A0330099") {
         return "selectJsydsyqSplitMerge";
@@ -92,12 +92,14 @@ export function queueDjywmc (djywbm, djqxbm) {
         case "C40100": //一并申请首次
             vm = "selectYbsc";
             break;
-        // case "C40300": //一并申请变更
-        // case "C40400": //一并申请注销
-        //     vm = "selectYbbg";
-        //     break;
-        //case "C04372": //一并国有房屋变更
+        case "C40300": //一并申请变更
+        case "C40400": //一并申请注销
+            vm = "selectYbbg";
+            break;
         case "C04371": //一并国有房屋转移
+            vm = "selectFwsyq";
+            break;
+        case "C04372": //一并国有房屋变更        
             vm = "selectYbgybg";
             break;
         case "A11100"://林地使用权首次
@@ -115,7 +117,7 @@ export function queueDjywmc (djywbm, djqxbm) {
         case "A12300"://森林林木登记
         case "A12400"://森林林木变更
             vm = "selectSllmqt";
-                break;
+            break;
         default:
             vm = "selecBdcql";
             break;