From 1c139338c0e2f580dbf261beaab22fec7f34d750 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Sat, 14 Sep 2024 16:26:04 +0800
Subject: [PATCH] =?UTF-8?q?9.14=E5=8F=91=E7=8E=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/component/addHouse.vue |   2 +
 src/views/component/dialog.vue          |   5 +
 src/views/component/linkPickModal.vue   |   4 +-
 src/views/component/map.vue             |  15 ++-
 src/views/system/components/Account.vue | 156 +++++++++++++-----------
 src/views/system/menu.vue               |   2 +-
 src/views/system/user.vue               |   2 +-
 7 files changed, 106 insertions(+), 80 deletions(-)

diff --git a/src/views/assets/component/addHouse.vue b/src/views/assets/component/addHouse.vue
index 869a4ca..71d3c8c 100644
--- a/src/views/assets/component/addHouse.vue
+++ b/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,
                    }}>
diff --git a/src/views/component/dialog.vue b/src/views/component/dialog.vue
index 7c45c38..6242fc2 100644
--- a/src/views/component/dialog.vue
+++ b/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;
diff --git a/src/views/component/linkPickModal.vue b/src/views/component/linkPickModal.vue
index d1b06bf..d251ef2 100644
--- a/src/views/component/linkPickModal.vue
+++ b/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") {
diff --git a/src/views/component/map.vue b/src/views/component/map.vue
index ca4b53d..ca14ae2 100644
--- a/src/views/component/map.vue
+++ b/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 ) {
-          return a + Number(b.id_leases_land_id_relation.reduce((c,d) => {
+        if (b.leases instanceof Array && b.leases.length > 0 ) {
+          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
             }
diff --git a/src/views/system/components/Account.vue b/src/views/system/components/Account.vue
index cb0d2f6..864d03f 100644
--- a/src/views/system/components/Account.vue
+++ b/src/views/system/components/Account.vue
@@ -1,72 +1,86 @@
-<template>
-  <el-form :model="form" ref="form" :rules="rules">
-    <el-form-item label="姓名" label-position="right" prop="name">
-      <el-input v-model.trim="form.name" />
-    </el-form-item>
-    <el-form-item label="密码" label-position="right" prop="password">
-      <el-input v-model.trim="form.password" type="password" />
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" @click="submit">保存</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-  import {
-    save
-  } from '../../../api/system/user.js'
-  import {
-    getInfo
-  } from '../../../api/user.js'
-
-  export default {
-    data() {
-      return {
-        form: {
-          id: "",
-          name: "",
-          username: "",
-          password: ""
-        },
-        rules: {
-          name: [{
-            required: true,
-            message: '请输入姓名',
-            trigger: 'blur'
-          }],
-          password: [{
-            required: true,
-            message: '请输入密码',
-            trigger: 'blur',
-          }]
-        },
-      }
-    },
-    created() {
-      getInfo().then(res => {
-        this.form.id = res.id;
-        this.form.name = res.name
-        this.form.username = res.username
-      })
-    },
-    methods: {
-      submit() {
-        let that = this;
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            save(that.form).then(response => {
-              this.$Message.success('操作成功');
-            }).catch(error => {
-              //reject(error)
-            })
-          } else {
-            this.$Message.error('数据校验失败');
-            console.log('error submit!!');
-            return false;
-          }
-        });
-      }
-    }
-  }
+<template>
+  <el-form :model="form" ref="form" :rules="rules">
+    <el-form-item label="姓名" label-position="right" prop="name">
+      <el-input v-model.trim="form.name" />
+    </el-form-item>
+    <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>
+  </el-form>
+</template>
+
+<script>
+  import {
+    save
+  } from '../../../api/system/user.js'
+  import {
+    getInfo
+  } from '../../../api/user.js'
+
+  export default {
+    data() {
+      return {
+        form: {
+          id: "",
+          name: "",
+          username: "",
+          password: "",
+          mobile: "",
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请输入姓名',
+            trigger: 'blur'
+          }],
+          password: [{
+            required: true,
+            message: '请输入密码',
+            trigger: 'blur',
+          }],
+          mobile: [{
+            required: true,
+            message: '请输入手机号',
+            trigger: 'blur',
+          },{
+            pattern: /^1[3456789]\d{9}$/,
+            message: "手机号格式不正确",
+            trigger: "blur",
+          }]
+        },
+      }
+    },
+    created() {
+      getInfo().then(res => {
+        this.form.id = res.id;
+        this.form.name = res.name
+        this.form.username = res.username
+        this.form.mobile = res.mobile
+      })
+    },
+    methods: {
+      submit() {
+        let that = this;
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            save(that.form).then(response => {
+              this.$Message.success('操作成功');
+            }).catch(error => {
+              //reject(error)
+            })
+          } else {
+            this.$Message.error('数据校验失败');
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      }
+    }
+  }
 </script>
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index d6b7d34..534d2cc 100644
--- a/src/views/system/menu.vue
+++ b/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"
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 0ac1804..5b58d1e 100644
--- a/src/views/system/user.vue
+++ b/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>