Merge branch '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'
+//   })
+// }

@@ -16,7 +16,7 @@
 
     <el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header">
       <el-tab-pane label="基本信息" name="1"></el-tab-pane>
-      <el-tab-pane label="银行信息" name="2"></el-tab-pane>
+      <el-tab-pane label="银行机构" name="2"></el-tab-pane>
       <el-tab-pane label="企业信息" name="3"></el-tab-pane>
     </el-tabs>
 

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-09-01 10:17:27
+ */
+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        prop: "sqrmc",
+        label: "姓名/名称",
+      },
+      {
+        prop: "zjzl",
+        label: "证件种类",
+        render: (h, scope) => {
+          return (
+            <el-select
+              class="width100"
+              clearable
+              value={scope.row[scope.column.property]}
+              onChange={(val) => {
+                scope.row[scope.column.property] = val;
+              }}
+            >
+              {vm.dictData["A30"].map((option) => {
+                return (
+                  <el-option
+                    label={option.dname}
+                    value={option.dcode}
+                  ></el-option>
+                );
+              })}
+            </el-select>
+          );
+        },
+      },
+      {
+        prop: "zjh",
+        label: "证件号",
+      },
+      {
+        prop: "frmc",
+        label: "法人名称",
+      },
+      {
+        prop: "txdz",
+        label: "地址",
+      },
+      {
+        prop: "dh",
+        label: "联系电话",
+      },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" onClick={() => { this.handleDelete(scope.row) }}>删除</el-button>
+            </div>
+          )
+        }
+      }
+    ]
+  }
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}

 <!--
- * @Description: 
+ * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 08:59:04
+ * @LastEditTime: 2023-09-04 16:59:15
 -->
 <template>
-  <div class='yhjgba'>
-    <el-empty description="正在开发"></el-empty>
+  <div class="from-clues">
+    <!-- 表单部分 -->
+    <div class="from-clues-header">
+      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="80px">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="姓名/名称">
+              <el-input placeholder="姓名/名称" v-model="queryForm.sqrmc" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="证件号">
+              <el-input placeholder="证件号" v-model="queryForm.zjh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14" class="btnColRight">
+            <el-form-item>
+              <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="from-clues-content">
+      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="280"
+        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        :column="tableData.columns" :data="tableData.data">
+      </lb-table>
+    </div>
   </div>
 </template>
 <script>
-
+  import table from "@/utils/mixin/table"
+  import { datas, sendThis } from "./data"
   export default {
+    name: "cwrz",
     components: {},
+    mixins: [table],
+    mounted () {
+      sendThis(this);
+    },
+    computed: {
+    },
     data () {
       return {
-      }
+        queryForm: {
+          sqrmc: "",
+          zjh: "",
+        },
+        pageData: {
+          current: 1,
+          size: 10,
+        },
+        tableData: {
+          total: 0,
+          columns: datas.columns(),
+          data: [],
+        },
+      };
+    },
+    methods: {
+      /**
+       * @description: queryClick
+       * @author: renchao
+       */
+      queryClick () {
+      },
+      handleSearch () { },
+      handleDelete () { }
     }
   }
 </script>
-<style scoped lang='scss'>
-</style>
\ No newline at end of file
+<style scoped lang="scss">
+  @import "~@/styles/public.scss";
+</style>
+

@@ -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";