diff --git a/src/assets/login/build.png b/src/assets/login/build.png index fae49a8..4538027 100644 Binary files a/src/assets/login/build.png and b/src/assets/login/build.png differ diff --git a/src/views/assets/component/addHandles.vue b/src/views/assets/component/addHandles.vue index ce9b2b4..75ca9ba 100644 --- a/src/views/assets/component/addHandles.vue +++ b/src/views/assets/component/addHandles.vue @@ -99,7 +99,7 @@ export default { }, { "prop": "_bencizhengshoumianji", - "label": "本次征收面积(m²)", + "label": "本次调整面积(m²)", "width": 170, customFn: row => { return ( @@ -382,6 +382,7 @@ export default { _zichanshengyumianji: 0, _bencizhengshoumianji: 0, _relation_id: "", + ORIGINAL_DATA: row }) } else { let index = this.nowAssets.findIndex(i => i.id === row.id && !i.hasOwnProperty('land_id') ) @@ -565,7 +566,8 @@ export default { _zichanshengyumianji: 0, _bencizhengshoumianji: 0, _relation_id: "", - land_id: row.land_id + land_id: row.land_id, + ORIGINAL_DATA: row, }) } else { let index = this.nowAssets.findIndex(i => i.id === row.id && i.hasOwnProperty('land_id') ) @@ -734,22 +736,6 @@ export default { }); } - // 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: 'asset_handles' })).then(res => { if (this.type !== 'add') { Promise.all(this.originalForm.id_asset_handles_to_assets_handle_id_relation?.map(i => destroy({ @@ -771,6 +757,24 @@ export default { data: leaseToAssetsData },false) } + Promise.all(this.nowAssets.map(item => save({ + table_name: item.hasOwnProperty('land_id') ? "houses" : "lands", + ...item.ORIGINAL_DATA, + id: item.id, + xianzhuang: '已处置/拆迁',//已处置/拆迁 + shijimianji: item._zichanshengyumianji, + fenlei: 1 + }))) + let hisEvolutionsAssetsData = this.nowAssets.map(item => ({ + table_name: "his_evolutions", + land_id: !item.hasOwnProperty("land_id") ? item.id : "", + house_id: item.hasOwnProperty("land_id") ? item.id : "", + fashengshijian: this.$moment().format('YYYY-MM-DD'), + mianjitiaozheng: `资产面积由${item.shijimianji||0}m²调整为${item._zichanshengyumianji||0}m²`, + qitashuoming: `${this.form.chuzhileixing}` + })); + Promise.all(hisEvolutionsAssetsData.map(i => save(i))) + this.$Message.success({ content: `${this.type === "add" ? "新增" : "编辑"}成功`, }); diff --git a/src/views/assets/handleDetail.vue b/src/views/assets/handleDetail.vue index 8e85fd0..db38cd1 100644 --- a/src/views/assets/handleDetail.vue +++ b/src/views/assets/handleDetail.vue @@ -169,7 +169,7 @@ export default { }, { prop: "bencizhengshoumianji", - label: "本次征收面积(m²)", + label: "本次调整面积(m²)", formatter: (row, data ,val) => parseFloat(val??0).toFixed(2) }, { diff --git a/src/views/assets/handleSign.vue b/src/views/assets/handleSign.vue index a2dbc8f..17606e8 100644 --- a/src/views/assets/handleSign.vue +++ b/src/views/assets/handleSign.vue @@ -139,7 +139,7 @@ export default { }, { "prop": "_bencizhengshoumianji", - "label": "本次征收面积(m²)", + "label": "本次调整面积(m²)", "width": 170, customFn: row => { return ( @@ -838,23 +838,7 @@ export default { fenlei: 1 }))) Promise.all(hisEvolutionsAssetsData.map(i => save(i))) - //变更保存日志 - // if (this.type === "change") { - // let content = ""; - // for (let key in this.originalForm) { - // if (this.form[key] && this.originalForm[key] !== this.form[key]) { - // content += `${key}由${this.originalForm[key]}变更为${this.form[key]}\n`; - // } - // } - // save( - // { - // table_name: "lease_logs", - // content, - // lease_id: this.id, - // }, - // false - // ); - // } + this.$Message.success({ content: `${this.type === "add" ? "新增" : "编辑"}成功`, }); diff --git a/src/views/assets/handleSignDetail.vue b/src/views/assets/handleSignDetail.vue index 66d09c5..ab1aaea 100644 --- a/src/views/assets/handleSignDetail.vue +++ b/src/views/assets/handleSignDetail.vue @@ -197,7 +197,7 @@ export default { }, { prop: "bencizhengshoumianji", - label: "本次征收面积(m²)", + label: "本次调整面积(m²)", formatter: (row, data ,val) => parseFloat(val??0).toFixed(2) }, { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 20794b6..6782fb8 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -263,10 +263,10 @@ .build-img { position: absolute; - width: 36.5vw; + width: 46.5vw; object-fit: contain; - top: 27.3%; - left: 10.2%; + top: 26.8%; + left: 4%; } .title-img { display: block;