Merge branch 'dev'

 /*
  * @Description: 互联共享数据
  * @Autor:
- * @LastEditTime: 2023-09-06 09:47:59
+ * @LastEditTime: 2024-01-23 15:37:47
  */
 
 import request from "@/utils/request";
@@ -16,7 +16,7 @@ let SERVER = window.config
  */
 export function sfhc(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/gab/sfhc",
+    url: SERVER.SERVERAPI + "/rest/bj/sfhc",
     method: "post",
     data,
   });
@@ -28,7 +28,7 @@ export function sfhc(data) {
  */
 export function hy(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/mzb/hy",
+    url: SERVER.SERVERAPI + "/rest/bj/hy",
     method: "post",
     data,
   });
@@ -40,7 +40,7 @@ export function hy(data) {
  */
 export function jrxkz(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/ybj/jrxkz",
+    url: SERVER.SERVERAPI + "/rest/bj/jrxkz",
     method: "post",
     data,
   });
@@ -52,7 +52,7 @@ export function jrxkz(data) {
  */
 export function qyjbxx(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/scjg/qyjbxx",
+    url: SERVER.SERVERAPI + "/rest/scjg/qyjbxx",
     method: "post",
     data,
   });
@@ -64,7 +64,7 @@ export function qyjbxx(data) {
  */
 export function qyjbxxyz(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/scjg/qyjbxxyz",
+    url: SERVER.SERVERAPI + "/rest/scjg/qyjbxxyz",
     method: "post",
     data,
   });
@@ -76,7 +76,7 @@ export function qyjbxxyz(data) {
  */
 export function dm(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/mzb/dm",
+    url: SERVER.SERVERAPI + "/rest/bj/dm",
     method: "post",
     data,
   });
@@ -88,7 +88,7 @@ export function dm(data) {
  */
 export function gtgshjbxx(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/sczj/gtgshjbxx",
+    url: SERVER.SERVERAPI + "/rest/scjg/gtgshjbxx",
     method: "post",
     data,
   });
@@ -100,7 +100,7 @@ export function gtgshjbxx(data) {
  */
 export function gtgshjbxxyz(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/sczj/gtgshjbxxyz",
+    url: SERVER.SERVERAPI + "/rest/scjg/gtgshjbxxyz",
     method: "post",
     data,
   });
@@ -112,7 +112,7 @@ export function gtgshjbxxyz(data) {
  */
 export function xydm(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/zbb/xydm",
+    url: SERVER.SERVERAPI + "/rest/bj/xydm",
     method: "post",
     data,
   });
@@ -124,7 +124,7 @@ export function xydm(data) {
  */
 export function jgxxcx(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/mzb/xydm",
+    url: SERVER.SERVERAPI + "/rest/bj/mzbxydm",
     method: "post",
     data,
   });
@@ -136,7 +136,7 @@ export function jgxxcx(data) {
  */
 export function bdcdj(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/mzt/bdcdj",
+    url: SERVER.SERVERAPI + "/rest/mzsf/mzt/bdcdj",
     method: "post",
     data,
   });
@@ -148,7 +148,7 @@ export function bdcdj(data) {
  */
 export function dzyyzz(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/sczj/dzyyzz",
+    url: SERVER.SERVERAPI + "/rest/scjg/dzyyzz",
     method: "post",
     data,
   });
@@ -158,11 +158,11 @@ export function dzyyzz(data) {
  * @param {*} data
  * @author:
  */
-export function gzsxx(data) {
+export function gzsxx(params) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/sft/gzsxx",
-    method: "post",
-    data,
+    url: SERVER.SERVERAPI + "/rest/mzsf/sft/gzsxx",
+    method: "get",
+    params,
   });
 }
 /**
@@ -172,7 +172,7 @@ export function gzsxx(data) {
  */
 export function pjws(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/zgf/pjws",
+    url: SERVER.SERVERAPI + "/rest/bj/pjws",
     method: "post",
     data,
   });
@@ -184,9 +184,8 @@ export function pjws(data) {
  */
 export function pjwsDetail(data) {
   return request({
-    url: SERVER.SERVERAPI + "/v1/zgf/pjwsDetail",
+    url: SERVER.SERVERAPI + "/rest/bj/pjwsDetail",
     method: "post",
     data,
   });
 }
-

 <!--
  * @Author: yangwei
  * @Date: 2023-09-06 09:00:34
- * @LastEditors: yangwei
- * @LastEditTime: 2023-09-07 11:11:32
+ * @LastEditors: vers
+ * @LastEditTime: 2024-01-23 15:36:59
  * @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\components\gzsxxcx.vue
  * @Description: 
  * 
@@ -19,7 +19,7 @@
           label-width="80px"
         >
           <el-row>
-            <el-col :span="9">
+            <!-- <el-col :span="9">
               <el-form-item label="业务号">
                 <el-input
                   placeholder="业务号"
@@ -29,12 +29,12 @@
                 >
                 </el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="9">
               <el-form-item label="证件号码">
                 <el-input
                   placeholder="证件号码"
-                  v-model="queryForm.certCode"
+                  v-model="queryForm.zjhm"
                   clearable
                   class="width100"
                 >
@@ -74,7 +74,8 @@
           </el-table-column>
           <el-table-column prop="notary_name" label="公证员" width="120">
           </el-table-column>
-          <el-table-column prop="accept_date" label="公证日期" width="120"> </el-table-column>
+          <el-table-column prop="accept_date" label="公证日期" width="120">
+          </el-table-column>
           <el-table-column prop="fwbh" label="房屋编号" width="120">
           </el-table-column>
           <el-table-column prop="mj" label="面积" width="120">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-23 15:36:15
+ * @LastEditTime: 2024-01-23 16:05:38
 -->
 <template>
   <!-- 受理信息 -->
@@ -123,12 +123,28 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="承包起始时间：">
-              <el-input v-model="ruleForm.tdcbjyq.cbqssj" :disabled="!viewEdit"></el-input>
+              <el-date-picker
+                v-model="ruleForm.tdcbjyq.cbqssj"
+                class="width100"
+                type="date"
+                :disabled="!viewEdit"
+                :picker-options="pickerOptionsStart"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="承包结束时间：">
-              <el-input v-model="ruleForm.tdcbjyq.cbjssj" :disabled="!viewEdit"></el-input>
+              <el-date-picker
+                v-model="ruleForm.tdcbjyq.cbjssj"
+                :disabled="!viewEdit"
+                class="width100"
+                type="date"
+                placeholder="选择日期"
+                :picker-options="pickerOptionsEnd"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -139,6 +155,65 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
+            <el-form-item label="用途：">
+              <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.yt"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="确权面积：">
+              <div class="flex">
+                <el-input
+                  :disabled="!viewEdit"
+                  v-model="ruleForm.tdcbjyq.qqmj"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
+                <el-select :disabled="!viewEdit" v-model="mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="土地所有权性质：">
+              <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.tdsyqxz"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="是否永久基本农田：">
+              <el-radio-group
+                v-model="ruleForm.tdcbjyq.sfyjjbnt"
+                :disabled="!viewEdit">
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否自留地：">
+              <el-radio-group
+                v-model="ruleForm.tdcbjyq.sfzld"
+                :disabled="!viewEdit">
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="用地用海分类：">
+              <el-input :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.ydyhfl"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="8">
             <el-form-item label="承包经营权取得方式：">
               <el-input :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.cbjyqqdfs"></el-input>
             </el-form-item>
@@ -149,13 +224,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="10">
-          <el-col :span="24">
-            <el-form-item label="用途：">
-              <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.yt"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -289,6 +358,26 @@
     },
     data () {
       return {
+        // 开始结束日期限制
+        pickerOptionsStart: {
+          disabledDate: (time) => {
+            if (this.ruleForm.tdcbjyq.cbjssj) {
+              return (
+                time.getTime() >= new Date(this.ruleForm.tdcbjyq.cbjssj).getTime()
+              );
+            }
+          }
+        },
+        // 结束日期限制
+        pickerOptionsEnd: {
+          disabledDate: (time) => {
+            if (this.ruleForm.tdcbjyq.cbqssj) {
+              return (
+                time.getTime() <= new Date(this.ruleForm.tdcbjyq.cbqssj).getTime()
+              );
+            }
+          }
+        },
         isSave: true,
         // 键名转换，方法默认是label和children进行树状渲染
         normalizer (node) {