Merge branch 'dev'

 {
   "TITLE": "不动产登记系统",
-  "SERVERAPI": "/bdcdj-th",
+  "SERVERAPI": "/bdcdj",
   "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0",
   "adapter": "dysqs-630222",
   "gaopaiyi": "jy"

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 15:56:28
+ * @LastEditTime: 2024-01-22 16:30:18
 -->
 <template>
   <div class="from-clues">
@@ -171,6 +171,9 @@
        * @author: renchao
        */
       handleSelectionChange (val) {
+        val.forEach((item, index) => {
+          item.bsm = item.zdbsm;
+        });
         if (this.sqywInfo.sqywdylx == "1") {
           if (val.length > 1) {
             this.bdcdysz = [...val[val.length - 1]];
@@ -183,6 +186,7 @@
       },
       handleChange () {
         let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
+        arr[0].bsm = arr[0].zdbsm
         this.bdcdysz = arr
       },
       /**
@@ -194,6 +198,7 @@
         // 如果状态是1，那就是单选
         let refs = 'table';
         if (this.sqywInfo.sqywdylx == "1") {
+          row.bsm = row.zdbsm
           this.bdcdysz = [row]
           this.radioVal = row.bdcdyid
         } else {

@@ -293,10 +293,7 @@
         selectHSplitMerge({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
-            this.tableData.datastwo = res.result
-            this.tableData.datastwo.forEach(item => {
-              item.bsm = item.zdbsm;
-            })
+            this.tableData.datastwo = res.result;            
             this.bdcdysz = this.tableData.datastwo
           }
         })

+<!--
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2024-01-22 16:24:56
+-->
+<template>
+  <div class="from-clues">
+    <!-- 表单部分 国有建设用地使用权 -->
+    <div class="from-clues-header">
+      <el-form :model="queryForm" ref="queryForm" label-width="100px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="不动产单元号">
+              <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="坐落" label-width="60px">
+              <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="权利人">
+              <el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证件号">
+              <el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="btnColRight">
+            <el-form-item>
+              <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="from-clues-content loadingtext">
+      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
+        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
+        :data="tableData.data">
+      </lb-table>
+    </div>
+    <div class="submit_button">
+      <el-button @click="$popupCacel">取消</el-button>
+      <el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
+    </div>
+  </div>
+</template>
+<script>
+  //首次登记
+  import store from '@/store/index.js'
+  import ywsqTable from "@/utils/mixin/ywsqTable";
+  import jump from "../components/mixin/jump";
+  import { ywPopupDialog } from "@/utils/popup.js";
+  import { datas, sendThis } from "../javascript/tdjyq100.js";
+  import { defaultParameters } from "../javascript/publicDefaultPar.js";
+  import { selectZdjbxx } from "@/api/ywsq.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
+  export default {
+    mixins: [ywsqTable, jump],
+    props: {
+      isJump: { type: Boolean, default: false },
+      sqywInfo: { type: Object, default: () => { } },
+    },
+    data () {
+      return {
+        radioVal: '',
+        loading: false,
+        queryForm: defaultParameters.defaultParameters(),
+        tableData: {
+          total: 0,
+          columns: datas.columns(),
+          data: [],
+        },
+        bdcdysz: [],
+      };
+    },
+    mounted () {
+      sendThis(this);
+      if (this.sqywInfo.sqywdylx == "1") {
+        this.tableData.columns = [{
+          label: '选择',
+          width: '50px',
+          render: (h, scope) => {
+            return (
+              <div class="orgColumn">
+                <el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
+                  &ensp;
+                </el-radio>
+              </div>
+            )
+          }
+        }].concat(datas.columns())
+      } else {
+        this.tableData.columns =
+          [{
+            type: 'selection',
+            label: '全选',
+            width: '50'
+          }].concat(datas.columns())
+      }
+    },
+    methods: {
+      /**
+       * @description: queryClick
+       * @author: renchao
+       */
+      queryClick () {
+        this.$startLoading();
+        this.queryForm.sqywbm = this.sqywInfo.djywbm;
+        selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
+          this.$endLoading();
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            this.tableData.total = total;
+            this.tableData.data = records;
+          }
+        });
+      },
+      /**
+       * @description: submitForm
+       * @author: renchao
+       */
+      submitForm () {
+        if (this.bdcdysz.length == 0) {
+          this.$message.error("请至少选择一条数据");
+          return;
+        }
+        this.loading = true
+        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.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
+       * @param {*} val
+       * @author: renchao
+       */
+      handleSelectionChange (val) {
+        val.forEach((item, index) => {
+          item.bsm = item.zdbsm;
+        });
+        if (this.sqywInfo.sqywdylx == "1") {
+          if (val.length > 1) {
+            this.bdcdysz = [...val[val.length - 1]];
+          } else {
+            this.bdcdysz = val;
+          }
+        } else {
+          this.bdcdysz = val;
+        }
+      },
+      handleChange () {
+        let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
+        arr[0].bsm = arr[0].zdbsm
+        this.bdcdysz = arr
+      },
+      /**
+       * @description: handleRowClick
+       * @param {*} row
+       * @author: renchao
+       */
+      handleRowClick (row) {
+        // 如果状态是1，那就是单选
+        let refs = 'table';
+        if (this.sqywInfo.sqywdylx == "1") {
+          this.bdcdysz = [row]
+          this.radioVal = row.bdcdyid
+        } else {
+          this.$refs[refs].toggleRowSelection(row)
+        }
+      },
+      /**
+       * @description: openBook
+       * @param {*} row
+       * @author: renchao
+       */
+      openBook (row) {
+        var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("登记簿详情", "registerBook/djbFrame", {
+          formData: param
+        })
+      }
+    }
+  }
+</script>
+<style scoped lang="scss">
+  @import "~@/styles/mixin.scss";
+  @import "~@/styles/public.scss";
+</style>
+

@@ -5,7 +5,7 @@ export function queueDjywmc (djywbm, djqxbm) {
         return "selectJsydsyqSplitMerge";
     }
     // 房屋分割A04200S1
-    if (['A04300S1', 'A04200S2', 'A04300S2'].includes(djqxbm)) {
+    if (['A04300S1', 'A04200S2', 'A0830S1'].includes(djqxbm)) {
         return "selectFwfgSplitMerge";
     }
     if (djqxbm == "A37100S2") {
@@ -65,9 +65,11 @@ export function queueDjywmc (djywbm, djqxbm) {
             vm = "selectFwsyq";
             break;
         case "A23100"://农用地使用权(首次登记)
-        case "A09100"://土地经营权（首次登记）
             vm = "nydsyq100";
             break;
+        case "A09100"://土地经营权（首次登记）
+            vm = "tdjyq100";
+            break;
         case "A23200":
         case "A23300":
         case "A23400":

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2024-01-22 16:23:21
+ */
+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>
+          )
+        }
+      },
+      {
+        label: "状态",
+        render: (h, scope) => {
+          return (
+            <div>
+              <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
+              <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
+            </div>
+          )
+        }
+      },
+      {
+        prop: "qllxmc",
+        label: "权利类型",
+      },
+      {
+        prop: "zddm",
+        label: "宗地代码",
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+        minWidth: '150'
+      },
+      {
+        prop: "qlxzmc",
+        label: "权利性质",
+      },
+      {
+        prop: "zdmj",
+        label: "面积(㎡)",
+      },
+      {
+        prop: "qlsdfsmc",
+        label: "权利设定方式",
+      },
+      {
+        prop: "showTdyt",
+        label: "土地用途",
+      },
+      {
+        prop: "zl",
+        label: "坐落",
+        minWidth: '130'
+      },
+    ]
+  }
+
+
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}