Merge branch 'dev'

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-06-20 10:02:14
+ * @LastEditTime: 2023-11-15 10:03:39
  */
 import Vue from 'vue'
 import App from './App'
@@ -55,7 +55,7 @@ import 'quill/dist/quill.bubble.css'
 Vue.use(VueQuillEditor)
 
 import * as filters from './filters' // global filters
-Vue.use(Element, { size: 'small', zIndex: 1000 })
+Vue.use(Element, { size: 'mini', zIndex: 1000 })
 Vue.use(Base)
 Object.keys(filters).forEach(key => {
     Vue.filter(key, filters[key])

@@ -265,3 +265,9 @@
   bottom: 0;
   border-bottom: 1px solid #1890ff;
 }
+
+
+// 整体配置
+.el-form-item--mini.el-form-item {
+  margin-bottom: 10px;
+}
\ No newline at end of file

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-11-15 10:02:49
+-->
+<template>
+  <div class='detail'>
+    <el-form :model="ruleForm" ref="ruleForm" label-width="130px">
+      <p>不动产情况</p>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="坐落:">
+            <el-input v-model="ruleForm.zl"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="不动产单元号:">
+            <el-input v-model="ruleForm.bdcdyh"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="宗地/宗海面积:">
+            <el-input v-model="ruleForm.zdzhmj"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="定着物面积:">
+            <el-input v-model="ruleForm.dzwmj"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="宗地/宗海用途:">
+            <el-input v-model="ruleForm.zdzhyt"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="定着物用途:">
+            <el-input v-model="ruleForm.dzwyt"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="不动产类型:">
+            <el-select v-model="ruleForm.bdclx" class="width100" placeholder="请选择">
+              <el-option
+                v-for="item in bdclxList"
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="宗地/宗海权利性:">
+            <el-select v-model="ruleForm.zdzhqlxz" class="width100" placeholder="请选择">
+              <el-option
+                v-for="item in qlxzList"
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="用海类型:">
+            <el-input v-model="ruleForm.yhlx"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="构筑物类型:">
+            <el-input v-model="ruleForm.gzwlx"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="林种:">
+            <el-input v-model="ruleForm.lz"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="原不动产权证书号:">
+            <el-input v-model="ruleForm.ybdcqzh"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div>
+        <p>登记申请人</p>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="义务人名称:">
+              <el-input v-model="ruleForm.ywrmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证件种类:">
+              <el-select v-model="ruleForm.zjzl" class="width100" placeholder="请选择">
+                <el-option
+                  v-for="item in zjzlList"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证件号:">
+              <el-input v-model="ruleForm.zjh"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+  import store from '@/store/index.js'
+  export default {
+    components: {},
+    data () {
+      return {
+        bdclxList: store.getters.dictData['A27'],
+        qlxzList: store.getters.dictData['A9'],
+        zjzlList: store.getters.dictData['A9'],
+        ruleForm: {
+          zl: '',
+          bdcdyh: '',
+          zdzhmj: '',
+          dzwmj: '',
+          zdzhyt: '',
+          dzwyt: '',
+          bdclx: '',
+          zdzhqlxz: ''
+        }
+      }
+    },
+    methods: {
+      dicStatus (val, code) {
+        let data = store.getters.dictData[code],
+          name = '暂无'
+        if (data) {
+          data.map((item) => {
+            if (item.dcode == val) {
+              name = item.dname
+            }
+          })
+          return name
+        }
+      },
+    }
+  }
+</script>
+<style scoped lang='scss'>
+  /deep/.el-form-item {
+    margin-bottom: 8px;
+  }
+</style>
\ No newline at end of file

+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: "ywh",
+        label: "业务号",
+      },
+      {
+        prop: "sqbh",
+        label: "申请编号",
+      },
+      {
+        prop: "qlr",
+        label: "权利人",
+      },
+      {
+        prop: "ywr",
+        label: "义务人",
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+        width: 150
+      },
+      {
+        prop: "sqsj",
+        label: "申请时间",
+        width: 140
+      },
+      {
+        label: "登记类型",
+        render: (h, scope) => {
+          return <span>{this.dicStatus(scope.row.djlx, "A21")}</span>
+        }
+      },
+      {
+        label: "权利类型",
+        render: (h, scope) => {
+          return <span>{this.dicStatus(scope.row.qllx, "A8")}</span>
+        }
+      },
+      {
+        label: "办理状态",
+        render: (h, scope) => {
+          return <span>{this.dicStatus(scope.row.blzt, "dyblzt")}</span>
+        }
+      },
+      {
+        prop: "shyj",
+        label: "审核意见"
+      },
+      {
+        label: "操作",
+        width: 250,
+        fixed: 'right',
+        render: (h, scope) => {
+          return <div>
+            <el-button type="text" icon='el-icon-view' onClick={() => { vm.handleViewClick(scope.row) }}>详情</el-button>
+            <el-button type="text" icon="el-icon-delete" onClick={() => { vm.handleDel(scope.row) }}>删除</el-button>
+            <el-button type="text" icon='el-icon-refresh-left' onClick={() => { vm.handleBack(scope.row) }}>回退</el-button>
+            <el-button type="text" icon='el-icon-document-copy' onClick={() => { vm.handleSync(scope.row) }}>数据同步</el-button>
+          </div>
+        }
+      }
+    ]
+  }
+
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}

 <!--
- * @Author: yangwei
- * @Date: 2023-09-06 09:20:11
- * @LastEditors: Please set LastEditors
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-11-15 09:41:55
 -->
 <template>
-  <div> <el-empty description="正在开发"></el-empty></div>
+  <div class="from-clues">
+    <!-- 家庭房产 -->
+    <div class="from-clues-header">
+      <el-form :model="queryForm" @submit.native.prevent ref="queryForm" label-width="70px">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="申请编号">
+              <el-input placeholder="申请编号" v-model="queryForm.sqbh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9" class="flex">
+            <el-form-item label="申请时间">
+              <el-date-picker v-model="queryForm.date1" type="date" placeholder="开始日期" value-format="yyyy-MM-dd" clearable>
+              </el-date-picker> 至
+              <el-date-picker v-model="queryForm.date2" type="date" placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="权利人">
+              <el-input placeholder="权利人" v-model="queryForm.qlr" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="义务人">
+              <el-input placeholder="义务人" v-model="queryForm.ywr" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="办理状态">
+              <el-input placeholder="办理状态" v-model="queryForm.blzt" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="19" class="btnColRight">
+            <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="from-clues-content">
+      <lb-table :page-size="pageData.size" class="loadingtext" :current-page.sync="pageData.current"
+        :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: "BdcdjWebYcsl",
-
+    name: "jtfc",
+    mixins: [table],
+    mounted () {
+      sendThis(this);
+      this.queryClick();
+    },
     data () {
-      return {};
+      return {
+        sqcxBsm: "",
+        queryForm: {
+          sqbh: "",
+          date1: "",
+          date2: "",
+          qlr: "",
+          ywr: "",
+          blzt: ""
+        },
+        tableData: {
+          columns: datas.columns(),
+          data: [{}]
+        }
+      }
+    },
+    activated () {
+      this.queryClick()
+    },
+    methods: {
+      /**
+       * @description: 初始化数据
+       * @author: renchao
+       */
+      queryClick () {
+        // this.$startLoading()
       },
-
-    mounted () { },
-
-    methods: {},
-  };
+      handleViewClick () {
+        this.$popupDialog("查看详情", "ywbl/ycsl/components/detail", {}, "75%")
+      }
+    }
+  }
 </script>
-
-<style lang="scss" scoped></style>
+<style scoped lang="scss">
+  @import "~@/styles/public.scss";
+</style>