Merge branch 'dev'

@@ -51,17 +51,26 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item label="是否效验土地确权" prop="enabled" v-if="form.sqdjyw">
+              <el-radio-group v-model="form.sqdjyw.sfjytd">
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+           </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="业务流程ID" prop="flowid" v-if="form.sqdjyw">
               <el-input v-model="form.sqdjyw.flowid"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="16">
             <el-form-item label="流程参数" prop="flowparams" v-if="form.sqdjyw">
               <el-input v-model="form.sqdjyw.flowparams"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="8">
             <el-form-item label="登记原因设置" prop="sfqydjyymb" v-if="form.sqdjyw">
@@ -93,7 +102,11 @@
         </el-row>
       </el-form>
       <el-collapse class="modifycollapse" accordion>
-        <el-collapse-item title="登记情形设置" name="1">
+         <el-collapse-item title="登记类型" name="0" v-if="form.sqdjyw.sqfl=='2'">
+          <lb-table :column="djqxCol" :pagination="false" heightNumSetting :minHeight="160" :data="form.djlx">
+          </lb-table>
+        </el-collapse-item>
+        <el-collapse-item title="登记情形设置" name="1" v-if="form.sqdjyw.sqfl=='1'">
           <lb-table :column="djqxCol" :pagination="false" heightNumSetting :minHeight="160" :data="form.djqx">
           </lb-table>
         </el-collapse-item>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-05 15:36:51
+ * @LastEditTime: 2023-09-05 16:37:35
 -->
 <template>
   <div>
@@ -24,7 +24,7 @@
               </el-select>
             </el-col>
             <el-col :span="2" v-if="this.formData.ysxlh">
-              <el-button type="primary" @click="invalidDiglog=true">作废</el-button>
+              <el-button type="primary" @click="handleZF" v-if="disabled">作废</el-button>
             </el-col>
           </el-row>
 
@@ -166,11 +166,15 @@
         this.zfyy = "";
         this.invalidDiglog = false
       },
+      handleZF () {
+        this.invalidDiglog = true
+      },
       /**
        * @description: 作废缮证信息
        * @author: renchao
        */
       confirmInvalid () {
+        store.dispatch('user/reWorkFresh', false)
         invalidCertificate({ bsmBdcqz: this.bdcqz.bsmBdcqz, zfyy: this.zfyy }).then((res) => {
           if (res.code === 200) {
             this.$message.success("作废成功");
@@ -179,12 +183,12 @@
             this.zfyy = ''
             this.ruleForm.ysxlh = ''
             this.bdcqz.ysxlh = ''
-            store.dispatch('user/reWorkFresh', false)
             if (this.bdcqz.bdcqzlx == 1) {
               this.drawTextOnImage()
             } else {
               this.drawTextzmImage()
             }
+            store.dispatch('user/reWorkFresh', true)
           } else {
             this.$message.error(res.message);
           }
@@ -587,6 +591,7 @@
           this.$message.error('请选择印刷序列号');
           return;
         }
+        store.dispatch('user/reWorkFresh', false)
         let that = this
         if (this.bdcqz.bdcqzlx == 1) {
           getPrintTemplateByCode({ tmpno: 'zsdy' }).then(resInfo => {
@@ -646,6 +651,7 @@
           this.$message.error('请选择印刷序列号');
           return;
         }
+        store.dispatch('user/reWorkFresh', false)
         this.ruleForm.bsmBdcqz = this.bdcqz.bsmBdcqz;
         this.ruleForm.bdcqzlx = this.bdcqz.bdcqzlx;
         this.ruleForm.szzh = this.bdcqz.bdcqzh;

 <template>
-   <div>
-    <div>不动产信息</div>
-    <div>买方信息</div>
-    <div>卖方信息</div>
-    <div>合同信息</div>
-     <div>缴税信息</div>
+  <div class="slxx swxx">
+    <!--
+    <div>缴税信息</div> -->
+    <el-form
+      :model="ruleForm"
+      ref="ruleForm"
+      v-Loading="loading"
+      :label-position="flag ? 'top' : ''"
+      :inline="flag"
+      label-width="120px">
+      <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
+        <div class="slxx_title title-block">
+          不动产信息
+          <div class="triangle"></div>
+        </div>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="不动产单元号：">
+              <el-input disabled v-model="ruleForm.bdcdyh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="原产证号：">
+              <el-input disabled v-model="ruleForm.yfczh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="面积(m3)：">
+              <el-input disabled v-model="ruleForm.mj"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="权利类型：">
+              <el-input disabled v-model="ruleForm.qllxmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="用途：">
+              <el-input disabled v-model="ruleForm.yt"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="坐落：">
+              <el-input disabled v-model="ruleForm.zl"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="slxx_title title-block">
+          买方信息
+          <div class="triangle"></div>
+        </div>
+        <lb-table :column="column" :pagination="false" :heightNumSetting="true"
+          :data="ruleForm.tableDataList">
+        </lb-table>
+        <div class="slxx_title title-block">
+          卖方信息
+          <div class="triangle"></div>
+        </div>
+        <lb-table :column="column1" :pagination="false" :heightNumSetting="true"
+          :data="ruleForm.tableDataList">
+        </lb-table>
+        <div class="slxx_title title-block">
+          合同信息
+          <div class="triangle"></div>
+        </div>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="合同编号：">
+              <el-input v-model="ruleForm.htbh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合同金额(万元)：">
+              <el-input v-model="ruleForm.htje"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="签订时间：">
+              <el-date-picker
+                class="width100"
+                v-model="ruleForm.qdsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <el-row class="btn" v-if="viewEdit">
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">保存</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
   </div>
-</template>
\ No newline at end of file
+</template>
+<script>
+  import { mapGetters } from "vuex";
+  export default {
+    computed: {
+      ...mapGetters(["dictData", "flag"]),
+    },
+    mounted () {
+      // this.loading = true
+      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("isEdit", this.viewEdit);
+      // Init(formdata).then((res) => {
+      //   if (res.code === 200 && res.result) {
+      //   }
+      // });
+    },
+    data () {
+      return {
+        loading: false,
+        //表单是否可操作
+        viewEdit: false,
+        column: [
+          {
+            prop: "qlrxm",
+            label: "权利人姓名"
+          },
+          {
+            prop: "gyqk",
+            label: "共有情况"
+          },
+          {
+            prop: "zjzl",
+            label: "身份证号种类"
+          },
+          {
+            prop: "zjhm",
+            label: "证件号码"
+          },
+        ],
+        column1: [{
+          prop: "ywrxm",
+          label: "义务人姓名"
+        },
+        {
+          prop: "zjzl",
+          label: "身份证号种类"
+        },
+        {
+          prop: "zjhm",
+          label: "证件号码"
+        },],
+        ruleForm: {
+          tableDataList: []
+        }
+      }
+    },
+    methods: {
+      onSubmit () { }
+    }
+  }
+</script>
+<style scoped lang="scss">
+  @import "~@/styles/public.scss";
+  @import "~@/styles/slxx/slxx.scss";
+</style>

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-09-01 13:23:30
+ * @LastEditTime: 2023-09-05 15:48:55
 -->
 <template>
   <div class="slxx">
@@ -353,8 +353,6 @@
         this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
-
-      // 是否持证人变化
       /**
        * @description: 是否持证人变化
        * @param {*} val

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-01 13:40:52
+ * @LastEditTime: 2023-09-05 15:53:51
 -->
 <template>
   <div class="slxx">
@@ -378,8 +378,7 @@
             v-if="ruleForm.qlxx"
             @upDateQlrxxList="upDateYwrxxList"
             :tableData="ruleForm.ywrList"
-            :disabled="viewEdit"
-             />
+            :disabled="viewEdit" />
         </div>
         <div class="slxx_title title-block">
           登记原因
@@ -443,7 +442,7 @@
         }
       });
     },
-    components: { qlrCommonTable, tdytTable },
+    components: { qlrCommonTable, tdytTable, ywrCommonTable },
     computed: {
       ...mapGetters(["dictData", "flag"]),
     },

@@ -45,8 +45,9 @@ class data extends filter {
         }
       },
       {
-        prop: "qllxmc",
-        label: "权利类型",
+        prop: "ygdjzlmc",
+        label: "预告登记种类",
+        minWidth: '100'
       },
       {
         prop: "bdcdyh",

@@ -45,9 +45,9 @@ class data extends filter {
         }
       },
       {
-        prop: "bdcqzh",
-        label: "不动产登记证明号",
-        minWidth: '150'
+        prop: "ygdjzlmc",
+        label: "预告登记种类",
+        minWidth: '100'
       },
       {
         prop: "bdcdyh",
@@ -55,41 +55,34 @@ class data extends filter {
         minWidth: '150'
       },
       {
-        prop: "dyfs",
-        label: "抵押方式",
-        render: (h, scope) => {
-          switch (scope.row.dyfs) {
-            case '1':
-              return <span>一般抵押</span>
-            case '2':
-              return <span>最高额抵押</span>
-          }
-        }
-      },
+        prop: "bdcqzh",
+        label: "不动产登记证明号",
+        minWidth: '150'
+      },    
       {
         prop: "qlrmc",
-        label: "抵押权人",
+        label: "权利人",
       },
       {
         prop: "qlrzjhm",
-        label: "抵押权人证件号",
+        label: "证件号码",
       },
       {
         prop: "ywrmc",
-        label: "抵押人",
+        label: "义务人",
       },
       {
         prop: "ywrzjhm",
-        label: "抵押人证件号",
+        label: "证件号码",
       },
       {
-        prop: "dyje",
-        label: "抵押金额(万元)",
+        prop: "jzmj",
+        label: "建筑面积",
       },
       {
-        prop: "dymj",
-        label: "抵押面积",
-      },
+        prop: "qdjg",
+        label: "被担保主债权数额",
+      },      
       {
         prop: "dyqx",
         label: "债务履行期限",