修改一并申请规则

@@ -59,7 +59,7 @@
   import { datas, sendThis } from "../javascript/selectFwsyq.js";
   import { datas, sendThis } from "../javascript/selectFwsyq.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { selectFwsyq } from "@/api/ywsq.js";
   import { selectFwsyq } from "@/api/ywsq.js";
-  import { startBusinessFlow } from "@/api/workFlow.js";
+  import { startBusinessFlow,startTogetherFlow  } from "@/api/workFlow.js";
   export default {
   export default {
     mixins: [table, jump],
     mixins: [table, jump],
     props: {
     props: {
@@ -107,7 +107,8 @@
           this.$message.error("请至少选择一条数据");
           this.$message.error("请至少选择一条数据");
           return;
           return;
         }
         }
-        this.loading = true
+        this.loading = true;
+         if(this.sqywInfo.sqfl=='1'){
           startBusinessFlow({
           startBusinessFlow({
                     bsmSqyw: this.sqywInfo.bsmSqyw,
                     bsmSqyw: this.sqywInfo.bsmSqyw,
                     bdcdysz: this.bdcdysz,
                     bdcdysz: this.bdcdysz,
@@ -135,6 +136,36 @@
                   }).catch(() => {
                   }).catch(() => {
                     this.loading = false
                     this.loading = false
                   })
                   })
+         }else{
+            startTogetherFlow({
+          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
+        })
+         }
+        
       },
       },
       /**
       /**
        * @description: handleSelectionChange
        * @description: handleSelectionChange

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