Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

+/*
+ * @Description: 字典接口
+ * @Autor: renchao
+ * @LastEditTime: 2023-05-16 16:06:51
+ */
+import request from '@/utils/request'
+let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
+
+/**
+ * @description: 获取登记簿全部字段
+ * @author: renchao
+ */
+ export function getFieldList (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/SysDjbFieldDO/getFieldList',
+    method: 'get',
+    params
+  })
+}
+/**
+ * @description: 获取登记簿打印字段
+ * @author: renchao
+ */
+ export function getFieldListByQlxx (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/SysDjbFieldDO/getFieldListByQlxx',
+    method: 'get',
+    params
+  })
+}
+/**
+ * @description: 保存登记簿打印字段
+ * @param {*} data
+ * @author: renchao
+ */
+ export function save (bsmMb,data) {
+  return request({
+    url: SERVER.SERVERAPI + `/rest/sys/SysDjbFieldDO/save/${bsmMb}`,
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * @description: 获取登记簿打印字段
+ * @author: renchao
+ */
+//  export function getQllxList () {
+//   return request({
+//     url: SERVER.SERVERAPI + '/rest/sys/SysDjbFieldDO/getQllxList',
+//     method: 'get'
+//   })
+// }

@@ -67,7 +67,7 @@
   import { datas, sendThis } from "../javascript/selecBdcql.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { selectQlxx } from "@/api/ywsq.js";
-  import { startBusinessFlow } from "@/api/workFlow.js";
+  import { startBusinessFlow,startTogetherFlow } from "@/api/workFlow.js";
   import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js";
   export default {
     mixins: [table, jump],
@@ -126,8 +126,37 @@
           this.$alert("请至少选择一条数据");
           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) => {
@@ -135,15 +164,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)
@@ -154,6 +183,8 @@
         }).catch(() => {
           this.loading = false
         })
+        }
+        
       },
       /**
        * @description: handleSelectionChange

@@ -92,10 +92,10 @@ export function queueDjywmc (djywbm, djqxbm) {
         case "C40100": //一并申请首次
             vm = "selectYbsc";
             break;
-        case "C40300": //一并申请变更
-        case "C40400": //一并申请注销
-            vm = "selectYbbg";
-            break;
+        // case "C40300": //一并申请变更
+        // case "C40400": //一并申请注销
+        //     vm = "selectYbbg";
+        //     break;
         case "C04372": //一并国有房屋变更
         case "C04371": //一并国有房屋转移
             vm = "selectYbgybg";