Merge branch 'dev'

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 15:51:52
+ * @LastEditTime: 2023-08-16 16:38:01
 -->
 <template>
   <div class="slxx">
@@ -37,16 +37,12 @@
         <el-row :gutter="10" v-if="ruleForm.slsq">
           <el-col :span="8" v-if="ruleForm.sldyList.length > 0">
             <el-form-item label="权利类型：">
-              <el-input
-                disabled
-                v-model="ruleForm.sldyList[0].qllxmc"></el-input>
+              <el-input disabled v-model="ruleForm.sldyList[0].qllxmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="ruleForm.sldyList.length > 0">
             <el-form-item label="登记类型：">
-              <el-input
-                disabled
-                v-model="ruleForm.sldyList[0].djlxmc"></el-input>
+              <el-input disabled v-model="ruleForm.sldyList[0].djlxmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -56,34 +52,60 @@
           </el-col>
         </el-row>
         <div class="slxx_title title-block">
-          房屋概况
+          房屋批量情况
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.zdjbxx">
           <el-col :span="8">
-            <el-form-item label="规划用途名称：">
+            <el-form-item label="宗地面积：">
+              <div class="flex">
+                <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
+                <el-select disabled v-model="ruleForm.zdjbxx.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 disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="权利设定方式名称：">
-              <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
+            <el-form-item label="土地用途：">
+              <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="10" v-if="ruleForm.zdjbxx">
           <el-col :span="8">
             <el-form-item label="房屋性质：">
+              <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="房屋用途：">
               <el-input disabled v-model="splicingFdcq2.fwxz"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="10" v-if="ruleForm.zdjbxx">
           <el-col :span="8">
             <el-form-item label="房屋结构：">
               <el-input disabled v-model="splicingFdcq2.fwjg"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="10" v-if="ruleForm.zdjbxx">
           <el-col :span="8">
-            <el-form-item label="建筑总面积：">
+            <el-form-item label="房屋总层数：">
+              <el-input disabled v-model="ruleForm.fdcq2List[0].zcs"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="房屋总建筑面积：">
               <el-input disabled v-model="splicingFdcq2.jzmj"></el-input>
             </el-form-item>
           </el-col>
@@ -94,8 +116,13 @@
           </el-col>
         </el-row>
         <el-row :gutter="10" v-if="ruleForm.slsq">
+          <el-col :span="8">
+            <el-form-item label="竣工时间：">
+              <el-input disabled v-model="splicingFdcq2.jzmj"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="5">
-            <el-form-item label="发证方式：">
+            <el-form-item label="发证方式：" :disabled="!viewEdit">
               <el-radio-group v-model="ruleForm.slsq.fzfs">
                 <el-radio label="1">小证</el-radio>
                 <el-radio label="2">大证</el-radio>
@@ -111,7 +138,7 @@
           <el-col :span="12" v-if="ruleForm.sldyList.length>0">
             <el-form-item label="共有方式：">
               <el-radio-group
-                :disabled="!ableOperation"
+                :disabled="!viewEdit"
                 @change="showCZInfo"
                 v-model="ruleForm.sldyList[0].gyfs">
                 <el-radio label="0">单独所有</el-radio>
@@ -126,31 +153,29 @@
             <el-form-item label="是否分别持证：">
               <el-radio-group
                 v-model="ruleForm.sldyList[0].sqfbcz"
-                :disabled="!ableOperation">
+                :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="6" v-if="ruleForm.sldyList[0].gyfs!=0">
+          <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"
                 placeholder="持证人"
-                :disabled="!ableOperation">
+                :disabled="!viewEdit">
                 <el-option
                   v-for="item in czrOptions"
                   :key="item.zjh"
                   :label="item.sqrmc"
-                  :value="item.zjh">
-                </el-option>
+                  :value="item.zjh"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
         <qlrCommonTable
+          :disabled="viewEdit"
           @upDateQlrxxList="upDateQlrxxList"
           :tableData="ruleForm.qlrList"
           :gyfs="ruleForm.sldyList[0].gyfs" />
@@ -164,15 +189,16 @@
               <el-input
                 class="textArea"
                 type="textarea"
-                maxlength="500"  show-word-limit
-                :disabled="!ableOperation"
+                maxlength="500"
+                show-word-limit
+                :disabled="!viewEdit"
                 v-model="ruleForm.fdcq2List[0].djyy">
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
-      <el-row class="btn" v-if="ableOperation">
+      <el-row class="btn" v-if="viewEdit">
         <el-form-item>
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>
@@ -181,9 +207,14 @@
   </div>
 </template>
 <script>
-  import ywmix from "@/views/ywbl/mixin/index"
+  import ywmix from "@/views/ywbl/mixin/index";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
-  import { BatchInit, Init, saveBatchData, saveData } from "@/api/workflow/fwsyqFlow.js";
+  import {
+    BatchInit,
+    Init,
+    saveBatchData,
+    saveData,
+  } from "@/api/workflow/fwsyqFlow.js";
   import { mapGetters } from "vuex";
   export default {
     mixins: [ywmix],
@@ -206,44 +237,46 @@
         disabled: true,
         tdytOption: [],
         ruleForm: {
-          cfdjList: []//查封登记
-          , diyaqList: []//抵押权
-          , fdcq2List: []//房屋信息集合
-          , qlrList: []//权利人
-          , ywrList: []//义务人
-          , qlxxList: []//权利信息集合
-          , sldyList: []//受理不动产单元集合
-          , slsq: {}//受理申请流程明细
-          , flow: {}//受理申请流程明细
-          , sqrList: []//申请人
-          , ssQlxxList: []//上手权利信息
-          , user: {}//用户
-          , zdjbxx: {}//宗地基本信息
+          cfdjList: [], //查封登记
+          diyaqList: [], //抵押权
+          fdcq2List: [], //房屋信息集合
+          qlrList: [], //权利人
+          ywrList: [], //义务人
+          qlxxList: [], //权利信息集合
+          sldyList: [], //受理不动产单元集合
+          slsq: {}, //受理申请流程明细
+          flow: {}, //受理申请流程明细
+          sqrList: [], //申请人
+          ssQlxxList: [], //上手权利信息
+          user: {}, //用户
+          zdjbxx: {}, //宗地基本信息
         },
         czrOptions: [],
         //传递参数
         propsParam: this.$attrs,
         //表单是否可操作
-        ableOperation: true,
+        viewEdit: true,
         rules: {},
         gyfs: "",
-        bsmSlsq: this.$route.query.bsmSlsq,//受理申请标识码
-        splicingFdcq2: {//前端根据后台数组组装展示内容
-          fwxz: ''//房屋性质
-          , fwjg: ''//房屋结构
-          , jzmj: '' //建筑面积
-          , zts: ''//房屋总套数
-        }
-      }
+        bsmSlsq: this.$route.query.bsmSlsq, //受理申请标识码
+        splicingFdcq2: {
+          //前端根据后台数组组装展示内容
+          tdxz: "",//土地性质
+          fwxz: "", //房屋性质
+          fwjg: "", //房屋结构
+          jzmj: "", //建筑面积
+          zts: "", //房屋总套数
+        },
+      };
     },
     mounted (callbackfn, thisArg) {
-      this.ableOperation = this.$parent.currentSelectTab.ableOperation
+      this.viewEdit = this.$parent.currentSelectTab.ableOperation;
       this.propsParam = this.$attrs;
       var formdata = new FormData();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
       formdata.append("bsmSlsq", this.bsmSlsq);
-      formdata.append("isEdit", this.ableOperation);
+      formdata.append("isEdit", this.viewEdit);
       BatchInit(formdata).then((res) => {
         if (res.code == 200) {
           this.ruleForm = res.result;
@@ -253,10 +286,10 @@
             }
           })
           this.czrOptions = this.ruleForm.qlrList;
-          this.gyfs = this.ruleForm.sldyList[0].gyfs
+          this.gyfs = this.ruleForm.sldyList[0].gyfs;
           this.splicingFdcq2Info();
         }
-      })
+      });
     },
     methods: {
       //组装房地产权通用信息
@@ -269,11 +302,11 @@
         let fwxzArr = [];
         let fwjgArr = [];
         let jzmj = 0;
-        fdcq2List.forEach(fdcq2 => {
+        fdcq2List.forEach((fdcq2) => {
           fwxzArr.push(fdcq2.fwxzmc);
           fwjgArr.push(fdcq2.fwjgmc);
           jzmj += parseFloat(fdcq2.jzmj);
-        })
+        });
         //将数据转为字符串
         //房屋性质
         let fwxz = Array.from(new Set(fwxzArr)).join(",");
@@ -283,7 +316,6 @@
         this.splicingFdcq2.fwjg = fwjg;
         this.splicingFdcq2.jzmj = jzmj == null ? 0 : jzmj;
         this.splicingFdcq2.zts = fdcq2List.length;
-
       },
       /**
        * @description: 更新权利人信息
@@ -328,7 +360,8 @@
           if (this.ruleForm.qlrList.length <= 1) {
             this.$message({
               showClose: true,
-              message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
+              message:
+                "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
               type: "error",
             });
             return false;
@@ -341,18 +374,18 @@
               message: "保存成功！",
               type: "success",
             });
-            this.$store.dispatch('user/refreshPage', true);
+            this.$store.dispatch("user/refreshPage", true);
           } else {
             this.$message({
               showClose: true,
               message: res.message,
-              type: "error"
-            })
+              type: "error",
+            });
           }
-        })
-      }
-    }
-  }
+        });
+      },
+    },
+  };
 </script>
 <style scoped lang="scss">
   @import "~@/styles/public.scss";

@@ -40,17 +40,6 @@ class data extends filter {
             <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>
-              {/* <a icon="el-icon-discover" style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
-              <span icon="el-icon-discover" v-show={scope.row.zjgcdyzt == 1}>在建工程抵押</span>
-              <span icon="el-icon-discover" v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span icon="el-icon-discover" v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span icon="el-icon-discover" v-show={scope.row.cfzt == 1}> 已查封</span>
-              <span icon="el-icon-discover" v-show={scope.row.diyizt == 1}>,已地役</span>
-              <span icon="el-icon-discover" v-show={scope.row.yyzt == 1}>,异议中</span>
-              <span icon="el-icon-discover" v-show={scope.row.xzzt == 1}>,已限制</span>
-              <span icon="el-icon-discover" v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
-              <span icon="el-icon-discover" v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
-              <span icon="el-icon-discover" v-show={scope.row.dyzt == 1}>,已抵押</span> */}
             </div>
           )
         }
@@ -92,11 +81,15 @@ class data extends filter {
         minWidth: '150'
       },
       {
-        prop: "mj",
+        prop: "qlxzmc",
+        label: "权利性质",
+      },
+      {
+        prop: "qlmjmc",
         label: "面积",
       },
       {
-        prop: "ytmc",
+        prop: "qlytmc",
         label: "用途",
       },
       {

@@ -70,33 +70,29 @@ class data extends filter {
         minWidth: '150'
       },
       {
-        prop: "fwxz",
-        label: "房屋性质",
-      },
-      {
-        prop: "fwjgmc",
-        label: "房屋结构",
+        prop: "gyqk",
+        label: "共有情况",
       },
       {
         prop: "qlrmc",
         label: "权利人",
       },
       {
-        prop: "zjh",
+        prop: "qlrzjhm",
         label: "证件号",
       },
       {
-        prop: "mj",
-        label: "面积",
+        prop: "qlxzmc",
+        label: "权利性质",
       },
       {
-        prop: "showTdyt",
+        prop: "qlytmc",
         label: "用途",
       },
       {
-        prop: "zdmj",
-        label: "宗地面积",
-      },
+        prop: "qlmjmc",
+        label: "面积",
+      },       
       {
         prop: "zl",
         label: "坐落",

@@ -77,12 +77,12 @@ class data extends filter {
         label: "权利性质",
       },
       {
-        prop: "mjmc",
+        prop: "qlmjmc",
         width: '100',
         label: "使用权面积",
       },
       {
-        prop: "ytmc",
+        prop: "qlytmc",
         label: "土地用途",
       },
       {

@@ -78,12 +78,12 @@ class data extends filter {
         label: "权利性质",
       },
       {
-        prop: "mj",
+        prop: "qlmjmc",
         width: '100',
         label: "使用权面积",
       },
       {
-        prop: "ytmc",
+        prop: "qlytmc",
         label: "土地用途",
       },
       {

@@ -40,17 +40,6 @@ class data extends filter {
             <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>
-              {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
-              <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span v-show={scope.row.cfzt == 1}>,已查封</span>
-              <span v-show={scope.row.diyizt == 1}>,已地役</span>
-              <span v-show={scope.row.yyzt == 1}>,异议中</span>
-              <span v-show={scope.row.xzzt == 1}>,已限制</span>
-              <span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
-              <span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
-              <span v-show={scope.row.dyzt == 1}>,已抵押</span> */}
             </div>
           )
         }
@@ -87,12 +76,12 @@ class data extends filter {
         label: "权利性质",
       },
       {
-        prop: "mjmc",
+        prop: "qlmjmc",
         width: '100',
         label: "使用权面积",
       },
       {
-        prop: "ytmc",
+        prop: "qlytmc",
         label: "土地用途",
       },
       {

@@ -40,17 +40,6 @@ class data extends filter {
             <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>
-              {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
-              <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span v-show={scope.row.cfzt == 1}>,已查封</span>
-              <span v-show={scope.row.diyizt == 1}>,已地役</span>
-              <span v-show={scope.row.yyzt == 1}>,异议中</span>
-              <span v-show={scope.row.xzzt == 1}>,已限制</span>
-              <span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
-              <span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
-              <span v-show={scope.row.dyzt == 1}>,已抵押</span> */}
             </div>
           )
         }
@@ -66,18 +55,10 @@ class data extends filter {
       },
       {
         prop: "bdcqzh",
-        label: "不动产权证号",
+        label: "不动产登记证明号",
         minWidth: '150'
       },
       {
-        prop: "fwxz",
-        label: "房屋性质",
-      },
-      {
-        prop: "fwjgmc",
-        label: "房屋结构",
-      },
-      {
         prop: "qlrmc",
         label: "权利人",
       },
@@ -86,18 +67,31 @@ class data extends filter {
         label: "证件号",
       },
       {
-        prop: "mj",
-        label: "面积",
+        prop: "ywrmc",
+        label: "义务人",
       },
       {
-        prop: "showTdyt",
-        label: "用途",
+        prop: "ywrzjhm",
+        label: "义务人证件号",
+        minWidth: '150'
       },
       {
-        prop: "zdmj",
-        label: "宗地面积",
+        prop: "fwxzmc",
+        label: "房屋性质",
+      },
+      {
+        prop: "ytmc",
+        label: "房屋用途",
       },
       {
+        prop: "fwjgmc",
+        label: "房屋结构",
+      },     
+      {
+        prop: "jzmj",
+        label: "房屋面积(㎡)",
+      },      
+      {
         prop: "zl",
         label: "坐落",
         minWidth: '130'

@@ -40,24 +40,13 @@ class data extends filter {
             <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>
-              {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
-              <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span v-show={scope.row.cfzt == 1}>,已查封</span>
-              <span v-show={scope.row.diyizt == 1}>,已地役</span>
-              <span v-show={scope.row.yyzt == 1}>,异议中</span>
-              <span v-show={scope.row.xzzt == 1}>,已限制</span>
-              <span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
-              <span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
-              <span v-show={scope.row.dyzt == 1}>,已抵押</span> */}
             </div>
           )
         }
       },
       {
         prop: "bdcqzh",
-        label: "不动产证明号",
+        label: "不动产登记证明号",
         minWidth: '150'
       },
       {