diff --git a/.env.staging b/.env.staging index 3646f31..9361378 100644 --- a/.env.staging +++ b/.env.staging @@ -4,10 +4,10 @@ NODE_ENV = production ENV = 'staging' # base api -#VUE_APP_BASE_API=http://wuxiwuye.ali251.langye.net/ -#VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file -#VUE_APP_PREVIEW=//view.langye.net:8012/onlinePreview +VUE_APP_BASE_API=http://wuxiwuye.ali251.langye.net/ +VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file +VUE_APP_PREVIEW=//view.langye.net:8012/onlinePreview # base api -VUE_APP_BASE_API=http://192.168.221.31:9001/ -VUE_APP_UPLOAD_API=http://192.168.221.31:9001/api/admin/upload-file -VUE_APP_PREVIEW=http://192.168.221.31:8012/onlinePreview +#VUE_APP_BASE_API=http://192.168.221.31:9001/ +#VUE_APP_UPLOAD_API=http://192.168.221.31:9001/api/admin/upload-file +#VUE_APP_PREVIEW=http://192.168.221.31:8012/onlinePreview diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 7c93daf..f4e299c 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -874,8 +874,8 @@ export default { if ($scopedSlots[item.prop]) { return $scopedSlots[item.prop](item, index); } - return ( - { return ( - + > ); }) : ""} - - ); + + ) : () })} { $scopedSlots.btns ? $scopedSlots.btns() : (this.auths.length > 0 ? this.isCreateAuthBtns() : '') diff --git a/src/views/assets/component/addLand.vue b/src/views/assets/component/addLand.vue index 57a9708..c504f28 100644 --- a/src/views/assets/component/addLand.vue +++ b/src/views/assets/component/addLand.vue @@ -335,7 +335,7 @@ export default { }); if (this.$refs["houseTable"].getSelection() && this.$refs["houseTable"]?.getSelection()?.length > 0) { promiseAll.push( - ...this.$refs["houseTable"].getSelection().map(i => save(Object.assign(i, { table_name: 'houses',land_id: this.id }))) + ...this.$refs["houseTable"].getSelection().map(i => 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 => { diff --git a/src/views/assets/detail.vue b/src/views/assets/detail.vue index 72f9390..f8f1dd6 100644 --- a/src/views/assets/detail.vue +++ b/src/views/assets/detail.vue @@ -451,7 +451,7 @@ export default { )) } { - row.house?.map(i => ( + row.houses?.map(i => ( { i.name } )) } @@ -502,6 +502,91 @@ export default { align: 'right', width: 120 }, + { + label: "租金收取计划", + multiHd: [ + { + width: 200, + prop: "zujindiyicidaoweishijian", + label: "租金第一次到位时间", + customFn: ({ row }) => { + return ( +
+ { + row.id_lease_plans_lease_id_relation?.map(i => ( +

{ i.zujindiyicidaoweishijian }

+ )) + } +
+ ) + } + }, + { + width: 160, + prop: "shijidaozhangriqi", + label: "实际到账日期", + customFn: ({ row }) => { + return ( +
+ { + row.id_lease_plans_lease_id_relation?.map(i => ( +

{ i.shijidaozhangriqi }

+ )) + } +
+ ) + } + }, + { + width: 140, + prop: "yingshou", + label: "应收", + customFn: ({ row }) => { + return ( +
+ { + row.id_lease_plans_lease_id_relation?.map(i => ( +

{ i.yingshou }

+ )) + } +
+ ) + } + }, + { + width: 140, + prop: "shijidaozhang", + label: "实际到账", + customFn: ({ row }) => { + return ( +
+ { + row.id_lease_plans_lease_id_relation?.map(i => ( +

{ i.shijidaozhang }

+ )) + } +
+ ) + } + }, + { + width: 200, + prop: "weidaoweiyuanyin", + label: "未到账原因", + customFn: ({ row }) => { + return ( +
+ { + row.id_lease_plans_lease_id_relation?.map(i => ( +

{ i.weidaoweiyuanyin }

+ )) + } +
+ ) + } + } + ] + } ], @@ -666,9 +751,15 @@ export default { this.detail = detail; this.init(); - this.myFiles.push(...detail.id_asset_file_files_land_id_relation); - this.myFiles.push(...detail.id_asset_picture_files_land_id_relation); - this.myFiles.push(...detail.id_assets_atlas_files_land_id_relation); + if (/\/land/g.test(this.$route.path)) { + this.myFiles.push(...detail.id_asset_file_files_land_id_relation); + this.myFiles.push(...detail.id_asset_picture_files_land_id_relation); + this.myFiles.push(...detail.id_assets_atlas_files_land_id_relation); + } else { + this.myFiles.push(...detail.id_asset_file_files_house_id_relation); + this.myFiles.push(...detail.id_asset_picture_files_house_id_relation); + this.myFiles.push(...detail.id_assets_atlas_files_house_id_relation); + } }, @@ -701,7 +792,7 @@ export default { filter:[ { key: "id", - op: 'range', + op: 'eq_many', value: this.detail.leases.map(i => i.id).toString() } ] @@ -709,7 +800,9 @@ export default { this.leases = res.data; res.data.forEach(i => { - this.myFiles.push(...i.fujian_detail) + if (i.file_detail) { + this.myFiles.push(...i.file_detail) + } }) }, diff --git a/src/views/assets/house.vue b/src/views/assets/house.vue index b970167..4c49502 100644 --- a/src/views/assets/house.vue +++ b/src/views/assets/house.vue @@ -305,14 +305,6 @@ >资产处置 - -