daochu

src/views/assets/component/addHandles.vue

@@ -748,7 +748,7 @@ export default {
       // this.form.id_lease_plans_lease_id_relation = this.leasePlans;
       save(Object.assign(this.form, { table_name: 'asset_handles' })).then(res => {
         if (this.type !== 'add') {
-          Promise.all(this.originalForm.id_asset_handles_to_assets_handles_id_relation?.map(i => destroy({
+          Promise.all(this.originalForm.id_asset_handles_to_assets_handle_id_relation?.map(i => destroy({
             id: i.id,
             table_name: "asset_handles_to_assets"
           },false)))
@@ -758,6 +758,7 @@ export default {
           land_id: !item.hasOwnProperty("land_id") ? item.id : "",
           house_id: item.hasOwnProperty("land_id") ? item.id : "",
           zichanshengyumianji: item._zichanshengyumianji,
+          bencizhengshoumianji: item._bencizhengshoumianji,
           handle_id: res.id
         }));
         if (leaseToAssetsData && leaseToAssetsData.length > 0) {

src/views/assets/handleDetail.vue

@@ -167,6 +167,11 @@ export default {
             return (<span>{ row.land_id ? row.lands.shijimianji : row.house.shijimianji }</span>)
           }
         },
+        {
+          prop: "bencizhengshoumianji",
+          label: "本次征收面积（m²）",
+          formatter: (row, data ,val) => parseFloat(val??0).toFixed(2)
+        },
         {
           "prop": "zichanshengyumianji",
           "label": "资产剩余面积（m²）",

src/views/assets/handleSignDetail.vue

@@ -139,6 +139,16 @@ export default {
       allTables: [],
       linkTableList: [],
       assetTable: [
+        {
+          "prop": "type",
+          "label": "分类",
+          "width": 0,
+          "fixed": "left",
+          "align": "center",
+          customFn: row => {
+            return (<span>{ row.land_id ? '土地' : '房产' }</span>)
+          }
+        },
         {
           prop: "name",
           label: "资产名称",
@@ -185,6 +195,11 @@ export default {
             );
           },
         },
+        {
+          prop: "bencizhengshoumianji",
+          label: "本次征收面积（m²）",
+          formatter: (row, data ,val) => parseFloat(val??0).toFixed(2)
+        },
         {
           prop: "zichanshengyumianji",
           label: "资产剩余面积（m²）",

src/views/assets/handleSignList.vue

@@ -354,18 +354,66 @@ export default {
     },
 
     async exportExcel(sheetName) {
+      let filterTableColumns = this.$refs['xyTable']?.tableFormat || []
       const res = await index(
         Object.assign(this.select, { page: 1, page_size: 9999 })
       );
       if (res.data) {
-        let headers = this.form.map((i) => {
+        let headers = this.form.filter(i => filterTableColumns.find(j => j.prop === i.field)).map((i) => {
           return {
             key: i.field,
             title: i.name,
           };
         });
+        if(filterTableColumns.find(j => j.prop === 'assets')) {
+          headers.unshift({
+            key: 'assets',
+            title: '资产'
+          })
+        }
         const data = res.data.map((row) =>
-          headers.map((header) => row[header.key])
+          headers.map((header) => {
+            if(header.key === 'assets') {
+              return  row.asset_handles_to_assets?.map(i => (i.land_id ? '【土地】' : '【房产】')+(i.lands?.name || i.house?.name)).toString()
+            }
+            const i = this.form.find(i => i.field === header.key)
+            //if (i.edit_input === 'file' || i.edit_input === 'files') return ''
+            // if (
+            //   i.select_item &&
+            //   typeof i.select_item === "object" &&
+            //   !(i.select_item instanceof Array)
+            // ) {
+            //   let keys = Object.keys(i.select_item);
+            //   let paramMap = new Map();
+            //   keys.forEach((key) => {
+            //     paramMap.set(i.select_item[key], key);
+            //   });
+            //   return paramMap.get(row[i.field]?.toString());
+            // }
+            if (i._relations) {
+              let { link_relation, foreign_key, link_with_name } = i._relations;
+              if (link_relation === "newHasOne" || link_relation === "hasOne") {
+                return row[link_with_name]?.original_name || row[link_with_name]?.name ||
+                  row[link_with_name]?.no ||
+                  row[link_with_name]?.value
+              }
+
+              if (link_relation === "hasMany" || link_relation === "newHasMany") {
+                return row[link_with_name]?.map((o) => (
+                  o?.name ||
+                  o?.no ||
+                  o?.value ||
+                  o?.biaoti ||
+                  o?.mingcheng
+                )).toString()
+              }
+            }
+
+            if (this.table.find(i => i.prop === header.key)?.formatter) {
+              return this.table.find(i => i.prop === header.key).formatter(row, {}, row[header.key])
+            }
+            return row[header.key]
+          })
         );
         data.unshift(headers.map((header) => header.title));
         const wb = XLSX.utils.book_new();