9.14发现问题

src/views/assets/component/addHouse.vue

@@ -121,6 +121,8 @@ export default {
         <el-drawer title="土地列表"
                    visible={this.landDialog}
                    size="64%"
+                   append-to-body
+                   modal-append-to-body
                    on={{
                      ['update:visible']: (val) => this.landDialog = val,
                    }}>

src/views/component/dialog.vue

@@ -675,6 +675,11 @@ export default {
 };
 </script>
 
+<style>
+:root {
+  --column-num: 2;
+}
+</style>
 <style scoped lang="scss">
 :root {
   --column-num: 2;

src/views/component/linkPickModal.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="请选择" :visible.sync="dialogVisible">
+    <el-dialog modal-append-to-body append-to-body title="请选择" :visible.sync="dialogVisible">
       <template>
         <div class="select">
           <Select
@@ -228,7 +228,7 @@ export default {
       this.columns.unshift({
         prop: "id",
         width: 50,
-        formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
+        formatter: (row, column, cellValue, index) => (this.$refs['table']?.selectOpt?.page - 1) * this.$refs['table']?.selectOpt?.page_size + index + 1
       });
 
       if (this.linkType === "hasMany" || this.linkType === "newHasMany") {

src/views/component/map.vue

@@ -137,7 +137,7 @@
           <li v-for="(item,index) in list" :key="item.id" :style="{'border-color': openData.id === item.id ? 'blue' : ''}">
             <div class="left">
               <p>{{ item.name }}</p>
-              <Tag :color="Object.hasOwn(item,'id_house_properties_land_id_relation') ? 'green' : 'purple'">{{ Object.hasOwn(item,'id_house_properties_land_id_relation') ? '土地' : '房产' }}</Tag>
+              <Tag :color="item.hasOwnProperty('land_id') ? 'green' : 'purple'">{{ item.hasOwnProperty('land_id') ? '房产' : '土地' }}</Tag>
               <Tag color="blue" v-if="item.area">{{ wxAreas[item.area-1] }}</Tag>
 <!--              <Tag color="cyan" v-if="item.shijimianji">{{ item.shijimianji }} m²</Tag>-->
               <Tag color="red" v-if="Object.hasOwn(item,'id_house_properties_land_id_relation')">{{ item.id_house_properties_land_id_relation ? '权属合一' : '权属分离' }}</Tag>
@@ -321,6 +321,11 @@ export default {
             key: 'zichanshifouyoujianzhu',
             op: 'eq',
             value: ''
+          },
+          {
+            key: 'fenlei',
+            op: 'neq',
+            value: 1
           }
         ],
       },
@@ -474,7 +479,7 @@ export default {
           };
           let markerImg = document.createElement("img");
           markerImg.src =
-            item.id_house_properties_land_id_relation ? "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-red.png" : "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png";
+            item.hasOwnProperty('land_id') ? "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-red.png" : "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png";
           let markerSpan = document.createElement("span");
           markerSpan.setAttribute("class", "map-marker__text");
           markerSpan.innerText =
@@ -833,10 +838,10 @@ export default {
     },
     leaseAreaTotal () {
       return this.listFilter.reduce((a,b) => {
-        if (b.id_leases_land_id_relation instanceof Array && b.id_leases_land_id_relation.length > 0 ) {
+        if (b.leases instanceof Array && b.leases.length > 0 ) {
-          return a + Number(b.id_leases_land_id_relation.reduce((c,d) => {
+          return a + Number(b.leases.reduce((c,d) => {
             if (this.$moment().isBetween(this.$moment(d.zulinkaishiqixian),this.$moment(d.zulinjieshuqixian))) {
-              return c + Number(d.zulinmianji)
+              return c + Number(b.id_leases_to_assets_land_id_relation.find(e => d.id === e.lease_id)?.chuzumianji??0)
             } else {
               return c
             }

src/views/system/components/Account.vue

@@ -6,6 +6,9 @@
     <el-form-item label="密码" label-position="right" prop="password">
       <el-input v-model.trim="form.password" type="password" />
     </el-form-item>
+    <el-form-item label="手机号" label-position="right" prop="mobile">
+      <el-input v-model.trim="form.mobile" />
+    </el-form-item>
     <el-form-item>
       <el-button type="primary" @click="submit">保存</el-button>
     </el-form-item>
@@ -27,7 +30,8 @@
           id: "",
           name: "",
           username: "",
-          password: ""
+          password: "",
+          mobile: "",
         },
         rules: {
           name: [{
@@ -39,6 +43,15 @@
             required: true,
             message: '请输入密码',
             trigger: 'blur',
+          }],
+          mobile: [{
+            required: true,
+            message: '请输入手机号',
+            trigger: 'blur',
+          },{
+            pattern: /^1[3456789]\d{9}$/,
+            message: "手机号格式不正确",
+            trigger: "blur",
           }]
         },
       }
@@ -48,6 +61,7 @@
         this.form.id = res.id;
         this.form.name = res.name
         this.form.username = res.username
+        this.form.mobile = res.mobile
       })
     },
     methods: {

src/views/system/menu.vue

@@ -88,7 +88,7 @@
       </div>
     </div>
 
-    <el-dialog title="菜单编辑" :visible.sync="dialogFormVisible" width="60%">
+    <el-dialog title="菜单编辑" modal-append-to-body append-to-body :visible.sync="dialogFormVisible" width="60%">
       <el-form
         :model="form"
         :rules="rules"

src/views/system/user.vue

@@ -48,7 +48,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-dialog title="用户编辑" :visible.sync="dialogFormVisible" width="30%">
+      <el-dialog modal-append-to-body append-to-body title="用户编辑" :visible.sync="dialogFormVisible" width="30%">
         <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
           <el-form-item label="姓名" prop="name">
             <el-input v-model="form.name" autocomplete="off"></el-input>