diff --git a/src/views/assets/component/addFiles.vue b/src/views/assets/component/addFiles.vue
index e89ce16..c952f7e 100644
--- a/src/views/assets/component/addFiles.vue
+++ b/src/views/assets/component/addFiles.vue
@@ -607,4 +607,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
+::v-deep .el-table__body tr.current-row > td.el-table__cell {
+  background: $primaryColor;
+  color: #fff;
+}
 </style>
diff --git a/src/views/assets/component/addHouse.vue b/src/views/assets/component/addHouse.vue
index e1ba31a..c5f6e76 100644
--- a/src/views/assets/component/addHouse.vue
+++ b/src/views/assets/component/addHouse.vue
@@ -32,7 +32,7 @@ export default {
           h("br"),
           h("Tag",{
             style: {
-              display: _this.selectLand?.name ? "inline-block" : "none"
+              display: _this.selectLand?.id ? "inline-block" : "none"
             },
             props: {
               color: "primary",
@@ -41,10 +41,10 @@ export default {
             on: {
               ["on-close"]: _ => {
                 _this.selectLand = {};
-                _this.$refs['houseLinkTable'].setCurrentRow();
+                _this.$refs['landLinkTable'].setCurrentRow();
               }
             }
-          },_this.selectLand?.name)
+          },_this.selectLand?.name || _this.selectLand?.tudizhenghao)
         ]),
       },
     ],{
@@ -64,10 +64,25 @@ export default {
                      ['update:visible']: (val) => this.landDialog = val,
                    }}>
           <div style="padding: 0 10px;">
+            <div>
+              <Input vModel={this.landSelect.keyword} style="width: 300px;"  placeholder="请填写关键词"/>
+              <Button type="primary"
+                      style="margin-left: 10px;"
+                      on={{
+                        ['click']: _ => {
+                          this.$refs['landLinkTable'].getTableData(true)
+                        }
+                      }}>搜索</Button>
+            </div>
             <xy-table
-              ref="houseLinkTable"
+              ref="landLinkTable"
               table-item={
                 [
+                  {
+                    type: "selection",
+                    width: 56,
+                    label: " "
+                  },
                   {
                     "prop": "id",
                     "width": 60,
@@ -225,25 +240,34 @@ export default {
                 ]
               }
               action={this.index}
-              req-opt={{
-                table_name: "lands"
-              }}
+              req-opt={this.landSelect}
+              is-handler-key={false}
               on={{
                 ['loaded']: _ => {
                   if (this.selectLand.id) {
-                    this.$refs['houseLinkTable'].setCurrentRow(
-                      this.$refs['houseLinkTable'].getListData().find(row => row.id === this.selectLand.id)
+                    this.$refs['landLinkTable'].setCurrentRow(
+                      this.$refs['landLinkTable'].getListData().find(row => row.id === this.selectLand.id)
                     );
                   }
                 },
-                ['row-click']: ({ row }) => {
-                  if (row.id === this.selectLand.id) {
-                    this.selectLand = {};
-                    this.$refs['houseLinkTable'].setCurrentRow();
-                  } else {
+                ['select']: (selection, row) => {
+                  if (selection.length > 0) {
                     this.selectLand = row;
+                    this.$refs['landLinkTable'].clearSelection();
+                    this.$refs['landLinkTable'].toggleRowSelection(row, true);
+                  } else {
+                    this.selectLand = {};
+                    this.$refs['landLinkTable'].clearSelection();
                   }
-                },
+                }
+                // ['row-click']: ({ row }) => {
+                //   if (row.id === this.selectLand.id) {
+                //     this.selectLand = {};
+                //     this.$refs['landLinkTable'].setCurrentRow();
+                //   } else {
+                //     this.selectLand = row;
+                //   }
+                // },
               }}
             ></xy-table>
           </div>
@@ -264,6 +288,10 @@ export default {
       file: {},
 
       landDialog: false,
+      landSelect: {
+        table_name: "lands",
+        keyword: ""
+      },
     };
   },
   methods: {
@@ -511,7 +539,7 @@ export default {
         this.id = "";
         this.type = "";
         this.init();
-        this.$refs['houseLinkTable']?.setCurrentRow();
+        this.$refs['landLinkTable']?.setCurrentRow();
         this.$refs["elForm"].clearValidate();
         delete this.form.id;
         for (let key in this.file) {
@@ -560,8 +588,4 @@ export default {
   grid-column-gap: 40px;
   grid-template-columns: repeat(var(--column-num), 1fr);
 }
-::v-deep .el-table__body tr.current-row > td.el-table__cell {
-  background: $primaryColor;
-  color: #fff;
-}
 </style>
diff --git a/src/views/assets/component/addLand.vue b/src/views/assets/component/addLand.vue
index a25b65f..dbcafe0 100644
--- a/src/views/assets/component/addLand.vue
+++ b/src/views/assets/component/addLand.vue
@@ -34,19 +34,19 @@ export default {
         render: h("xy-table", {
           ref: "houseTable",
           props: {
-            action: index,
+            list: this.originalForm?.id_houses_land_id_relation,
             auths: [],
             reqOpt: {
               table_name: "houses",
             },
             tableItem: [
-              {
-                type: "selection",
-                reserveSelection: true,
-                fixed: "left",
-                width: 50,
-                selectable: (row) => (!row.land_id || row.land_id === this.id),
-              },
+              // {
+              //   type: "selection",
+              //   reserveSelection: true,
+              //   fixed: "left",
+              //   width: 50,
+              //   selectable: (row) => (!row.land_id || row.land_id === this.id),
+              // },
               {
                 label: "名称",
                 prop: "name",
@@ -341,25 +341,25 @@ export default {
               delete copyForm[info._relations?.link_with_name];
             }
           });
-          if (this.$refs["houseTable"].getSelection() && this.$refs["houseTable"]?.getSelection()?.length > 0) {
-            promiseAll.push(
-              ...this.$refs["houseTable"].getSelection().map(i => {
-                for (let key in i) {
-                  if (/_relation/g.test(key)) {
-                    delete i[key]
-                  }
-                }
-                return save(Object.assign(i, { table_name: 'houses',land_id: this.id, quanzhenghao: copyForm.tudizhenghao, zichanweizhi: copyForm.zichanweizhi }))
-              })
-            );
-          }
-          this.originalForm.id_houses_land_id_relation.forEach(item => {
-            if (this.$refs["houseTable"].getSelection().findIndex(selected => selected.id === item.id) === -1) {
-              promiseAll.push(
-                save(Object.assign(item, { table_name: 'houses',land_id: "" }))
-              );
-            }
-          })
+          // if (this.$refs["houseTable"].getSelection() && this.$refs["houseTable"]?.getSelection()?.length > 0) {
+          //   promiseAll.push(
+          //     ...this.$refs["houseTable"].getSelection().map(i => {
+          //       for (let key in i) {
+          //         if (/_relation/g.test(key)) {
+          //           delete i[key]
+          //         }
+          //       }
+          //       return save(Object.assign(i, { table_name: 'houses',land_id: this.id, quanzhenghao: copyForm.tudizhenghao, zichanweizhi: copyForm.zichanweizhi }))
+          //     })
+          //   );
+          // }
+          // this.originalForm.id_houses_land_id_relation.forEach(item => {
+          //   if (this.$refs["houseTable"].getSelection().findIndex(selected => selected.id === item.id) === -1) {
+          //     promiseAll.push(
+          //       save(Object.assign(item, { table_name: 'houses',land_id: "" }))
+          //     );
+          //   }
+          // })
           promiseAll.push(
             save(Object.assign(copyForm, { table_name: this.tableName }))
           );
diff --git a/src/views/assets/detail.vue b/src/views/assets/detail.vue
index a241d9d..284c767 100644
--- a/src/views/assets/detail.vue
+++ b/src/views/assets/detail.vue
@@ -178,6 +178,11 @@
         <el-card id="detail-assetsMap">
           <div class="el-descriptions__header el-descriptions__title">
             <p>资产地图</p>
+
+            <div @click="copyLocation" style="cursor: pointer">
+              <i class="el-icon-map-location" style="font-weight: 600;margin-right: 4px;"></i>
+              <span>{{ detail.zichanweizhi }}</span>
+            </div>
           </div>
 
           <div
@@ -602,6 +607,21 @@ export default {
     };
   },
   methods: {
+    copyLocation () {
+      const input = document.createElement("input");
+      input.setAttribute("readonly", "readonly"); // 设置为只读, 防止在 ios 下拉起键盘
+      input.value = this.detail.zichanweizhi;
+      document.body.appendChild(input);
+      input.setSelectionRange(0, 9999); // 防止 ios 下没有全选内容而无法复制
+      input.select();
+      document.execCommand("copy");
+      document.body.removeChild(input);
+      this.$message({
+        type: "success",
+        message: `已复制:${input.value}`,
+      });
+    },
+
     async searchFile () {
       try {
         const res = await getFiles({ keyword: this.searchKeyword });
diff --git a/src/views/dataShow/tooltip.vue b/src/views/dataShow/tooltip.vue
index b54be73..032c2b4 100644
--- a/src/views/dataShow/tooltip.vue
+++ b/src/views/dataShow/tooltip.vue
@@ -39,6 +39,8 @@ export default {
           this.timer = setInterval(() => {
             this.index = (++this.index) % (this.info?.length || 0);
           },3000)
+        } else {
+          this.index = 0;
         }
       })
     }
diff --git a/src/views/lease/component/addLet.vue b/src/views/lease/component/addLet.vue
new file mode 100644
index 0000000..7e23e59
--- /dev/null
+++ b/src/views/lease/component/addLet.vue
@@ -0,0 +1,853 @@
+<script>
+import { save, show, index, destroy, imports } from "@/api/system/baseForm";
+import { CreateDialog } from "@/utils/createDialog"
+import { deepCopy } from "@/utils";
+import { resolveFormInfo } from '@/utils/createTable'
+export default {
+  components: {
+  },
+  props: {
+    tableName: String,
+  },
+  render(h) {
+    const _this = this;
+    let dialog = new CreateDialog(this,[
+    ],{}, false)
+
+    return (
+      <div>
+        <el-card style="margin-top: 20px;">
+          <div slot="header" style="display: flex;align-items: center;">
+            <i class="el-icon-back"
+               style="padding-right: 20px;font-size: 20px;font-weight: 600;cursor: pointer;"
+               on={{
+                 ['click']: _ => {
+                   this.$router.go(-1)
+                 }
+               }}></i>
+            <p>{ (() => {
+              let title = new Map([
+                ['add', '新增招租'],
+                ['editor', '编辑招租']
+              ])
+              return title.get(this.type)
+            })() }</p>
+          </div>
+
+          {/* 资产信息 */}
+          <div style="margin-bottom: 10px;">
+            <div style="display: flex;margin-bottom: 10px;align-items: center;">
+              <p style="font-weight: 700;line-height: 2;">资产信息</p>
+
+              <div style="margin-left: auto;">
+                <Button type="primary"
+                        shape="circle"
+                        on={{
+                          ['click']: _ => {
+                            this.landDialog = true;
+                          }
+                        }}>选择土地</Button>
+                <Button type="primary"
+                        shape="circle"
+                        on={{
+                          ['click']: _ => {
+                            this.houseDialog = true;
+                          }
+                        }}>选择房产</Button>
+              </div>
+            </div>
+
+            <xy-table list={
+              this.distinct([
+                ...this.selectedLands,
+                ...this.selectedHouses,
+                ...(() => {
+                  let temp = [];
+                  this.originalForm?.id_lets_to_assets_let_id_relation?.forEach(item => {
+                    if (item.land_id) {
+                      let land = this.originalForm.land?.find(land => land.id === item.land_id);
+                      if (land) {
+                        temp.push({
+                          id: land.id,
+                          name: land.name,
+                          zuoluo: land.zuoluo,
+                          zichanweizhi: land.zichanweizhi,
+                          dengjimianji: land.dengjimianji,
+                          _chuzumianji: item.chuzumianji,
+                          _relation_id: item.id,
+                          _TAG_: "land"
+                        });
+                      }
+                    } else {
+                      let house = this.originalForm.house?.find(house => house.id === item.house_id);
+                      if (house) {
+                        temp.push({
+                          id: house.id,
+                          name: house.name,
+                          zuoluo: house.zuoluo,
+                          zichanweizhi: house.zichanweizhi,
+                          dengjimianji: house.dengjimianji,
+                          _chuzumianji: item.chuzumianji,
+                          _relation_id: item.id,
+                          _TAG_: "house"
+                        });
+                      }
+                    }
+                  })
+
+                  return temp;
+                })()
+              ])
+            }
+                      height="300"
+                      isHandlerKey={false}
+                      is-page={false}
+                      table-item={
+                        [
+                          {
+                            "prop": "name",
+                            "label": "地块名称",
+                            "width": 0,
+                            "fixed": "left",
+                            "align": "left"
+                          },
+                          {
+                            "prop": "zuoluo",
+                            "label": "坐落",
+                            "width": 0,
+                            "align": "left"
+                          },
+                          {
+                            "prop": "zichanweizhi",
+                            "label": "资产位置",
+                            "width": 0,
+                            "align": "center"
+                          },
+                          {
+                            "prop": "dengjimianji",
+                            "label": "登记面积（m²）",
+                            "width": 0,
+                            "align": "center"
+                          },
+                          {
+                            "prop": "_chuzumianji",
+                            "label": "出租面积（m²）",
+                            "width": 160,
+                            customFn: row => {
+                              return (
+                                <el-input-number controls={false} precision={2} vModel={row._chuzumianji} size="small"></el-input-number>
+                              )
+                            }
+                          },
+                          {
+                            prop: "operate",
+                            label: "操作",
+                            width: 160,
+                            customFn: row => {
+                              return (
+                                <div style="display: flex;">
+                                  <Button type="error"
+                                          size="small"
+                                          ghost={true}
+                                          on={{
+                                            ['click']: _ => {
+                                              this.$confirm("确定删除？").then(_ => {
+                                                if (row.hasOwnProperty("land_id")) {
+                                                  this.$refs["houseLinkTable"]?.toggleRowSelection(row,false)
+                                                  ++this.houseSelectTemp;
+                                                } else {
+                                                  this.$refs["landLinkTable"]?.toggleRowSelection(row,false)
+                                                  ++this.landSelectTemp;
+                                                }
+
+                                                if (row._relation_id) {
+                                                  destroy({ table_name: "lets_to_assets", id: row._relation_id },false).then(_ => {
+                                                    let index = this.originalForm.id_lets_to_assets_let_id_relation?.findIndex(item => item.id === row._relation_id);
+                                                    this.originalForm.id_lets_to_assets_let_id_relation?.splice(index, 1);
+                                                    ++this.landSelectTemp;
+                                                    ++this.houseSelectTemp;
+                                                  })
+                                                }
+                                              })
+                                            }
+                                          }}>删除</Button>
+                                </div>
+                              )
+                            }
+                          }
+                        ]
+                      }></xy-table>
+          </div>
+
+          {
+            dialog.render()
+          }
+        </el-card>
+
+        <el-drawer title="土地列表"
+                   visible={this.landDialog}
+                   size="64%"
+                   on={{
+                     ['update:visible']: (val) => this.landDialog = val,
+                   }}>
+          <div style="padding: 0 10px;">
+            <div>
+              <Input vModel={this.landSelect.keyword} style="width: 300px;"  placeholder="请填写关键词"/>
+              <Button type="primary"
+                      style="margin-left: 10px;"
+                      on={{
+                        ['click']: _ => {
+                          this.$refs['landLinkTable'].getTableData(true)
+                        }
+                      }}>搜索</Button>
+            </div>
+            <xy-table
+              isHandlerKey={false}
+              height="600"
+              ref="landLinkTable"
+              table-item={
+                [
+                  {
+                    type: "selection",
+                    width: 56,
+                    align: "center",
+                    reserveSelection: true,
+                    fixed: "left",
+                  },
+                  {
+                    "prop": "id",
+                    "width": 60,
+                    "label": "序号"
+                  },
+                  {
+                    "prop": "tudiquanshuren",
+                    "label": "土地权属人",
+                    "width": 0,
+                    "align": "left"
+                  },
+                  {
+                    "prop": "area",
+                    "label": "区域",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "name",
+                    "label": "地块名称",
+                    "width": 0,
+                    "align": "left",
+                    "fixed": "left"
+                  },
+                  {
+                    "prop": "tudizhenghao",
+                    "label": "土地证号",
+                    "width": 0,
+                    "align": "left"
+                  },
+                  {
+                    "prop": "zuoluo",
+                    "label": "坐落",
+                    "width": 0,
+                    "align": "left"
+                  },
+                  {
+                    "prop": "zichanweizhi",
+                    "label": "资产位置",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "quanliren",
+                    "label": "证载“权利人”",
+                    "width": 0,
+                    "align": "left"
+                  },
+                  {
+                    "prop": "gongyouqingkuang",
+                    "label": "共有情况",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "shiyongnianxian",
+                    "label": "使用年限（年）",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "xianzhuang",
+                    "label": "现状",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "yongtu",
+                    "label": "用途",
+                    "width": 0,
+                    "align": "left"
+                  },
+                  {
+                    "prop": "shiyongquanleixing",
+                    "label": "使用权类型",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "lingzhengriqi",
+                    "label": "领证日期",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "zhongzhiriqi",
+                    "label": "终止日期",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "dengjimianji",
+                    "label": "登记面积（m²）",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "shijimianji",
+                    "label": "实际面积（m²）",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "label": "不符情况",
+                    "width": 0
+                  },
+                  {
+                    "prop": "bufuyuanyin",
+                    "label": "不符原因",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "ruzhangshijian",
+                    "label": "入账时间",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "zhangmianyuanzhi",
+                    "label": "账面原值",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "tudidengji",
+                    "label": "土地等级",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "tudishuidanjia",
+                    "label": "土地税单价",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "tudishui",
+                    "label": "土地税",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "tudishuijiaonazhuti",
+                    "label": "土地税缴纳主体",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "jiaoshuijine",
+                    "label": "缴税金额",
+                    "width": 0,
+                    "align": "center"
+                  }
+                ]
+              }
+              action={this.index}
+              req-opt={this.landSelect}
+              on={{
+                ['loaded']: _ => {
+                  this.$nextTick(() => {
+                    this.$refs['landLinkTable'].getListData()?.filter(item => this.originalForm.id_lets_to_assets_let_id_relation?.find(j => j.land_id === item.id))?.forEach(item => {
+                      this.$refs['landLinkTable'].toggleRowSelection(item, true)
+                    })
+                    ++this.landSelectTemp;
+                  })
+                },
+                ['select']: _ => ++this.landSelectTemp
+              }}
+            ></xy-table>
+          </div>
+        </el-drawer>
+
+        <el-drawer title="房产列表"
+                   visible={this.houseDialog}
+                   size="64%"
+                   on={{
+                     ['update:visible']: (val) => this.houseDialog = val,
+                   }}>
+          <div style="padding: 0 10px;">
+            <div>
+              <Input vModel={this.houseSelect.keyword} style="width: 300px;" placeholder="请填写关键词"/>
+              <Button type="primary"
+                      style="margin-left: 10px;"
+                      on={{
+                        ['click']: _ => {
+                          this.$refs['houseLinkTable'].getTableData(true)
+                        }
+                      }}>搜索</Button>
+            </div>
+            <xy-table
+              isHandlerKey={false}
+              height="600"
+              ref="houseLinkTable"
+              table-item={
+                [
+                  {
+                    type: "selection",
+                    width: 56,
+                    align: "center",
+                    reserveSelection: true,
+                    fixed: "left"
+                  },
+                  {
+                    "prop": "id",
+                    "width": 60,
+                    "label": "序号"
+                  },
+                  {
+                    "prop": "quanshuren",
+                    "label": "权属人",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "area",
+                    "label": "区域",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "name",
+                    "label": "地块名称",
+                    "width": 0,
+                    "fixed": "left",
+                    "align": "left"
+                  },
+                  {
+                    "prop": "quanzhenghao",
+                    "label": "权证号",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "zuoluo",
+                    "label": "坐落",
+                    "width": 0,
+                    "align": "left"
+                  },
+                  {
+                    "prop": "zichanweizhi",
+                    "label": "房产位置",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "quanliren",
+                    "label": "证载“权利人”",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "yongtu",
+                    "label": "用途",
+                    "width": 0,
+                    "align": "left"
+                  },
+                  {
+                    "prop": "zhuangtai",
+                    "label": "现状",
+                    "width": 0,
+                    "align": "left"
+                  },
+                  {
+                    "prop": "dengjishijian",
+                    "label": "登记时间",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "dengjimianji",
+                    "label": "登记面积（m²）",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "shijimianji",
+                    "label": "实际面积（m²）",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "bufuyuanyin",
+                    "label": "不符情况",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "ruzhangshijian",
+                    "label": "入账时间",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "zhangmianyuanzhi",
+                    "label": "账面原值",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "guanliantudizhengquanzheng",
+                    "label": "关联土地证权证",
+                    "width": 0,
+                    "align": "center"
+                  },
+                  {
+                    "prop": "shiyongzhuangtai",
+                    "label": "使用状态",
+                    "width": 0,
+                    "align": "center"
+                  }
+                ]
+              }
+              action={this.index}
+              req-opt={this.houseSelect}
+              on={{
+                ['loaded']: _ => {
+                  this.$nextTick(() => {
+                    this.$refs['houseLinkTable'].getListData()?.filter(item => this.originalForm.id_lets_to_assets_let_id_relation?.find(j => j.house_id === item.id))?.forEach(item => {
+                      this.$refs['houseLinkTable'].toggleRowSelection(item, true)
+                    })
+                    ++this.houseSelectTemp;
+                  })
+                },
+                ['select']: _ => ++this.houseSelectTemp
+              }}
+            ></xy-table>
+          </div>
+        </el-drawer>
+
+      </div>
+    )
+  },
+  data() {
+    return {
+      houseDialog: false,
+      houseSelectTemp: 0,
+      landDialog: false,
+      landSelectTemp: 0,
+      leasePlans: [],
+      landSelect: {
+        table_name: "lands",
+        keyword: ""
+      },
+      houseSelect: {
+        table_name: "houses",
+        keyword: ""
+      },
+
+      columns: 1,
+      row: {},
+      formInfo: [],
+      id: "",
+      type: "add",
+      form: {},
+      originalForm: {},
+      rules: {},
+      file: {},
+    };
+  },
+  methods: {
+    distinct (arr, key="id") {
+      let newobj = {};
+      arr = arr.reduce((preVal, curVal) => {
+        if (!newobj[curVal[key]]) {
+          newobj[curVal[key]] = preVal.push(curVal)
+        } else {
+          let findVal = preVal.find(item => item[key] === curVal[key]);
+          findVal._chuzumianji = newobj[curVal[key]]["_chuzumianji"] || curVal["_chuzumianji"];
+          findVal._chuzumianji = newobj[curVal[key]]["_relation_id"] || curVal["_relation_id"];
+          findVal._TAG_ = newobj[curVal[key]]["_TAG_"] || curVal["_TAG_"];
+        }
+        return preVal
+      }, []);
+      return arr;
+    },
+    index,
+    setRow (row) {
+      this.row = row
+    },
+    init() {
+      for (let key in this.form) {
+        if (this.form[key] instanceof Array) {
+          this.form[key] = [];
+        } else {
+          this.form[key] = "";
+        }
+      }
+      this.$refs["elForm"].clearValidate();
+    },
+    setType(type = "add") {
+      let types = ["add", "editor"];
+      if (types.includes(type)) {
+        this.type = type;
+      } else {
+        console.warn("Unknown type: " + type);
+      }
+    },
+    setId(id) {
+      if (typeof id == "number") {
+        this.id = id;
+      } else {
+        console.error("error typeof id: " + typeof id);
+      }
+    },
+
+    async getDetail() {
+      const res = await show({ id: this.id, table_name: 'lets' });
+      this.$integrateData(this.form, res);
+
+      this.formInfo.forEach((i) => {
+        if (i.edit_input === "file") {
+
+        }
+        if (i.edit_input === "files") {
+          this.file[i.field] = res[`${i.field}_upload_details`]
+        }
+      });
+      this.form = Object.assign({}, this.form);
+      this.originalForm = deepCopy(res);
+    },
+
+    submit() {
+      if (this.type === "add") {
+        if (this.form.hasOwnProperty("id")) {
+          delete this.form.id;
+        }
+      }
+      if (this.type === "editor") {
+        Object.defineProperty(this.form, "id", {
+          value: this.id,
+          enumerable: true,
+          configurable: true,
+          writable: true,
+        });
+      }
+
+      this.form.let_id = this.$route.params.letId;
+      // this.form.id_leases_to_assets_lease_id_relation = [];
+      // this.selectedHouses?.forEach(i => {
+      //   this.form.id_leases_to_assets_lease_id_relation.push({
+      //     house_id: i.id,
+      //     lease_id: this.id,
+      //     chuzumianji: i._chuzumianji
+      //   })
+      // })
+      // this.selectedLands?.forEach(i => {
+      //   this.form.id_leases_to_assets_lease_id_relation.push({
+      //     land_id: i.id,
+      //     lease_id: this.id,
+      //     chuzumianji: i._chuzumianji
+      //   })
+      // })
+      // this.form.id_lease_plans_lease_id_relation = this.leasePlans;
+      save(Object.assign(this.form, { table_name: 'lets' })).then(res => {
+        let leaseToAssetsData = this.distinct([
+          ...this.selectedLands.map(i => ({...i,_TAG_: "land"})),
+          ...this.selectedHouses.map(i => ({...i,_TAG_: "house"})),
+          ...(() => {
+            let temp = [];
+            this.originalForm?.id_lets_to_assets_let_id_relation?.forEach(item => {
+              if (item.land_id) {
+                let land = this.originalForm.land?.find(land => land.id === item.land_id);
+                if (land) {
+                  temp.push({
+                    id: land.id,
+                    name: land.name,
+                    zuoluo: land.zuoluo,
+                    zichanweizhi: land.zichanweizhi,
+                    dengjimianji: land.dengjimianji,
+                    _chuzumianji: item.chuzumianji,
+                    _relation_id: item.id,
+                    _TAG_: "land"
+                  });
+                }
+              } else {
+                let house = this.originalForm.house?.find(house => house.id === item.house_id);
+                if (house) {
+                  temp.push({
+                    id: house.id,
+                    name: house.name,
+                    zuoluo: house.zuoluo,
+                    zichanweizhi: house.zichanweizhi,
+                    dengjimianji: house.dengjimianji,
+                    _chuzumianji: item.chuzumianji,
+                    _relation_id: item.id,
+                    _TAG_: "house"
+                  });
+                }
+              }
+            })
+            return temp;
+          })()
+        ]).map(item => ({
+          id: item._relation_id,
+          land_id: item._TAG_ === "land" ? item.id : "",
+          house_id: item._TAG_ === "house"? item.id : "",
+          chuzumianji: item._chuzumianji,
+          let_id: res.id
+        }));
+        if (leaseToAssetsData && leaseToAssetsData.length > 0) {
+          imports({
+            table_name: "lets_to_assets",
+            data: leaseToAssetsData
+          },false)
+        }
+        this.$Message.success({
+          content: `${this.type === "add" ? "新增" : "编辑"}成功`,
+        });
+        this.$emit("refresh");
+        this.$router.back();
+      })
+    },
+  },
+  computed: {
+    selectedLands () {
+      let temp = this.landSelectTemp;
+      return this.$refs['landLinkTable']?.getSelection() || [];
+    },
+    selectedHouses () {
+      let temp = this.houseSelectTemp;
+      return this.$refs['houseLinkTable']?.getSelection() || [];
+    },
+  },
+  watch: {
+    formInfo: {
+      handler: function (newVal) {
+        this.form = {};
+        this.rules = {};
+        this.file = {};
+        newVal.forEach((i) => {
+          if (i.field) {
+            this.form[i.field] = "";
+            if (
+              i.validation instanceof Array &&
+              i.validation.length > 0 &&
+              !!i.validation.find((i) => i === "required")
+            ) {
+              this.rules[i.field] = [
+                { required: true, message: `请填写${i.name}` },
+              ];
+            }
+            if (i.edit_input === "files") {
+              this.form[i.field] = [];
+            }
+            if (i.edit_input === "files" || i.edit_input === "file") {
+              this.file[i.field] = [];
+            }
+            if (i.edit_input === "checkbox") {
+              this.form[i.field] = [];
+            }
+            if (i._relations) {
+              this.form[i._relations?.link_with_name] = [];
+            }
+          }
+        });
+
+        this.columns = newVal.length > 11 ? '2' : '1'
+      },
+      //immediate: true,
+    },
+    dialogVisible(val) {
+      if (val) {
+        document.documentElement.style.setProperty(
+          "--column-num",
+          this.columns
+        );
+        if (this.type === "editor" || this.type === "change") {
+          this.$nextTick(() => this.getDetail());
+        }
+      } else {
+        this.id = "";
+        this.type = "";
+        this.init();
+        this.$refs["elForm"].clearValidate();
+        delete this.form.id;
+        for (let key in this.file) {
+          this.file[key] = [];
+        }
+        this.$refs['landLinkTable'].clearSelection();
+        this.$refs['houseLinkTable'].clearSelection();
+      }
+    },
+  },
+  created() {
+    this.id = this.$route.query.letId;
+    this.type = this.$route.query.type;
+    resolveFormInfo(31).then(res => {
+      this.formInfo = res;
+
+      if (this.type === "editor" || this.type === "change") {
+        this.$nextTick(() => this.getDetail());
+      }
+    })
+  },
+  mounted() {
+
+  },
+  beforeDestroy() {
+    this.id = "";
+    this.type = "";
+    this.init();
+    this.$refs["elForm"].clearValidate();
+    delete this.form.id;
+    for (let key in this.file) {
+      this.file[key] = [];
+    }
+  }
+};
+</script>
+
+<style>
+:root {
+  --column-num: 2;
+}
+</style>
+<style scoped lang="scss">
+.uploaded-a {
+  color: red;
+  text-decoration: none;
+  transition: all 0.2s;
+}
+
+.uploaded-a:hover {
+  color: red;
+  text-decoration: underline;
+}
+
+.form-body {
+  display: grid;
+  grid-gap: 10px;
+  grid-template-columns: repeat(var(--column-num), 1fr);
+}
+::v-deep .el-input-number input {
+  text-align: right;
+}
+</style>
diff --git a/src/views/lease/let.vue b/src/views/lease/let.vue
index 3878c95..5b89a46 100644
--- a/src/views/lease/let.vue
+++ b/src/views/lease/let.vue
@@ -213,7 +213,7 @@
                 <Button
                   type="primary"
                   @click="
-                    $refs['dialog'].setType('add'), $refs['dialog'].show()
+                    $router.push('/addlet'+'?type=add')
                   "
                 >新增</Button
                 >
@@ -256,9 +256,7 @@
       "
       @editor="
         (row) => {
-          $refs['dialog'].setId(row.id);
-          $refs['dialog'].setType('editor');
-          $refs['dialog'].show();
+          $router.push('/addlet'+'?type=editor&letId='+row.id)
         }
       "
       @loaded="adjustAlignment"
@@ -268,13 +266,6 @@
       </template>
     </xy-table>
 
-    <dialoger
-      :table-name="customForm.tableName"
-      :form-info="form"
-      ref="dialog"
-      @refresh="$refs['xyTable'].getTableData()"
-    >
-    </dialoger>
     <drawer
       :table-name="customForm.tableName"
       :form-info="form"
@@ -301,7 +292,6 @@ import * as XLSX from "xlsx";
 import { saveAs } from "file-saver";
 import { listdept } from "@/api/system/department"
 
-import dialoger from "@/views/component/dialog.vue";
 import LxHeader from "@/components/LxHeader/index.vue";
 import headerContent from "@/components/LxHeader/XyContent.vue";
 import drawer from "@/views/component/drawer.vue";
@@ -310,7 +300,6 @@ export default {
   name: 'tableList',
   components: {
     LxHeader,
-    dialoger,
     headerContent,
     drawer,
     imports,
diff --git a/src/views/lease/sign.vue b/src/views/lease/sign.vue
index ac7095b..5f82975 100644
--- a/src/views/lease/sign.vue
+++ b/src/views/lease/sign.vue
@@ -976,6 +976,11 @@ export default {
         this.$nextTick(() => this.getDetail());
       }
     })
+    if (this.$route.params.letId) {
+      show({ id: this.$route.params.letId,table_name: 'lets' }).then(res => {
+        console.log(res)
+      })
+    }
   },
   mounted() {