Merge branch 'dev'

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-09-05 16:52:14
+-->
 <template>
-  <div>
-    <div>不动产信息</div>
-    <div>收费明细</div>
-    <div>缴费票据</div>
+  <div class="sfxx">
+
   </div>
 </template>
\ No newline at end of file

 <template>
   <div class="slxx swxx">
-    <!--
-    <div>缴税信息</div> -->
     <el-form
       :model="ruleForm"
       ref="ruleForm"
@@ -90,6 +88,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="slxx_title title-block">
+          缴税信息
+          <div class="triangle"></div>
+        </div>
+        <lb-table :column="column2" :pagination="false" :heightNumSetting="true"
+          :data="ruleForm.tableDataList">
+        </lb-table>
       </div>
       <el-row class="btn" v-if="viewEdit">
         <el-form-item>
@@ -152,7 +157,32 @@
         {
           prop: "zjhm",
           label: "证件号码"
-        },],
+        }],
+        column2: [{
+          type: 'index',
+          label: "序号",
+          width: '50'
+        },
+        {
+          prop: "nsr",
+          label: "纳税人"
+        },
+        {
+          prop: "sz",
+          label: "税种"
+        },
+        {
+          prop: "jsyj",
+          label: "计税依据"
+        },
+        {
+          prop: "sl",
+          label: "税率"
+        },
+        {
+          prop: "jsje",
+          label: "计税金额"
+        }],
         ruleForm: {
           tableDataList: []
         }

@@ -82,7 +82,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="房屋性质：">
-              <el-select v-model="ruleForm.ygdj.fwxz">
+              <el-select v-model="ruleForm.ygdj.fwxz" :disabled="!viewEdit">
                 <el-option
                   v-for="item in dictData['A19']"
                   :key="item.dcode"
@@ -108,12 +108,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="所在层：">
-              <el-input maxlength="20" v-model="ruleForm.ygdj.szc"></el-input>
+              <el-input maxlength="20" :disabled="!viewEdit" v-model="ruleForm.ygdj.szc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="总层数：">
               <el-input
+                :disabled="!viewEdit"
                 maxlength="4"
                 v-model.number="ruleForm.ygdj.zcs"
                 oninput="value=value.replace(/[^0-9]/g,'')"></el-input>
@@ -123,7 +124,7 @@
         <el-row :gutter="10" v-if="ruleForm.qlxx">
           <el-col :span="8">
             <el-form-item label="房屋结构：">
-              <el-select v-model="ruleForm.ygdj.fwjg">
+              <el-select v-model="ruleForm.ygdj.fwjg" :disabled="!viewEdit">
                 <el-option
                   v-for="item in dictData['A46']"
                   :key="item.dcode"
@@ -157,6 +158,7 @@
             <el-form-item label="取得价格：">
               <div class="flex">
                 <el-input
+                  :disabled="!viewEdit"
                   maxlength="11"
                   v-model="ruleForm.ygdj.qdjg"
                   style="width: 500%"