guolong
/
front-end
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改地块BUG

develop
王健 4 years ago
parent
757cf27a75
commit
163975c684
5 changed files with 56 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/land/api/noLand.js
  2. 38
      src/views/land/handLand/index.vue
  3. 56
      src/views/land/handLand/newLand.vue
  4. 8
      src/views/land/noneHandLand/index.vue
  5. 6
      src/views/land/noneHandLand/newLand.vue

4
src/views/land/api/noLand.js
Unescape View File

@ -235,7 +235,7 @@ export function delLandResFile(id) {
// 批量删除
export function multiDeteleList(data) {
return request({
url: '/api/landlisted/',
url: '/api/landtolist/',
method: 'delete',
data: data,
})
@ -243,7 +243,7 @@ export function multiDeteleList(data) {
//导入
export function importFile(data) {
return request({
url: '/api/landlisted/importLandListExcel',
url: '/api/landtolist/importLandListExcel',
method: 'post',
data: data,
})

38
src/views/land/handLand/index.vue
Unescape View File

@ -232,7 +232,6 @@
border
@selection-change="handleSelectionChange"
style="width: 100%"
max-height="630"
ref="multipleTable"
v-loading="loading"
>
@ -888,23 +887,23 @@ export default {
: (txt = "展开");
return txt;
},
getList(page, params) {
this.tableLoading = true;
fetchHandLandList(
Object.assign({
current: page.currentPage,
size: page.pageSize,
})
)
.then((response) => {
this.tableData = response.data.data.records;
this.page.total = response.data.data.total;
this.loading = false;
})
.catch(() => {
this.loading = false;
});
},
// getList(page, params) {
// this.tableLoading = true;
// fetchHandLandList(
// Object.assign({
// current: page.currentPage,
// size: page.pageSize,
// })
// )
// .then((response) => {
// this.tableData = response.data.data.records;
// this.page.total = response.data.data.total;
// this.loading = false;
// })
// .catch(() => {
// this.loading = false;
// });
// },
// 编辑项
editItemChange(val) {
@ -1030,6 +1029,7 @@ export default {
// 查看
viewItem(row) {
this.$route.meta.keepAlive = true
let data = row.landListedId
this.$router.push({path: '/land/handLand/newLand', query: {readOnly: 'true', isEditOr: 'false', data: data}});
// this.dialogTitle = "查看数据";
@ -1043,6 +1043,7 @@ export default {
// this.dialogTitle = "编辑数据";
// this.readOnly = false;
// this.dialogFormVisible = true;
this.$route.meta.keepAlive = true
let data = row.landListedId
this.$router.push({path: '/land/handLand/newLand', query: {readOnly: 'false', isEditOr: 'true', data: data}});
// this.editForm = row;
@ -1106,6 +1107,7 @@ export default {
// 新建
newItem() {
this.$route.meta.keepAlive = true
this.$router.push({path: '/land/handLand/newLand', query: {readOnly: 'false', isEditOr: 'false',}});
// 从cols里面拷贝字段
// let newObj = {};

56
src/views/land/handLand/newLand.vue
Unescape View File

@ -625,9 +625,20 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="editForm.deal == '1'">
<el-form-item label="成交楼面价(元/㎡)：">
<el-input-number controls-position="right" :precision="zero"
v-model="editForm.dealFloorPrice"></el-input-number>
<el-form-item label="出让方式：">
<el-select
v-model="editForm.transferMode"
placeholder="请选择"
style="width: 100%"
>
<el-option
v-for="item in transferModeList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="editForm.deal == '1'">
@ -645,23 +656,6 @@
</el-row>
<template v-if="editForm.deal == '1'">
<el-row>
<el-col :span="6">
<el-form-item label="出让方式：">
<el-select
v-model="editForm.transferMode"
placeholder="请选择"
style="width: 100%"
>
<el-option
v-for="item in transferModeList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="受让单位：">
<el-input v-model="editForm.assignee"></el-input>
@ -678,6 +672,12 @@
v-model="editForm.dealPrice"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="成交楼面价(元/㎡)：">
<el-input-number controls-position="right" :precision="zero"
v-model="editForm.dealFloorPrice"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
@ -1536,7 +1536,7 @@ export default {
"controlChart": "",
"createDate": "",
"createUserId": "",
"deal": 0,
"deal": "0",
"dealFloorPrice": 0,
"dealPrice": 0,
"developmentScheme": "",
@ -1701,12 +1701,6 @@ export default {
getDict("projectStatus").then((res) => {
this.projectStatusList = res.data.data;
});
// let newObj = {};
// for (let col of this.cols) {
// newObj[col.prop] = "";
// }
// this.editForm = newObj;
if (this.$route.query.readOnly === "true") {
this.readOnly = true;
let row = this.$route.query.data;
@ -1747,7 +1741,7 @@ export default {
this.editForm.landTransferMu = (
(this.editForm.landTransferSquare / 2000) *
3
).toFixed(2);
).toFixed(0);
//容积率
this.editForm.plotRatio = (
this.editForm.totalConsArea / this.editForm.landTransferSquare
@ -1755,7 +1749,7 @@ export default {
}
if (this.editForm.totalConsArea && this.editForm.totalConsArea != 0) {
//商务面积占比(%)
//商业商务占比(%)
this.editForm.bizCommerceRate = (
((this.editForm.bizSpace + this.editForm.commerceSpace) /
this.editForm.totalConsArea) *
@ -1765,7 +1759,9 @@ export default {
this.editForm.startingFloorPrice = (
(this.editForm.transferPrice * 10000) /
this.editForm.totalConsArea
).toFixed(2);
).toFixed(0);
//成交楼面价(元/㎡)
this.editForm.dealFloorPrice = (this.editForm.dealPrice * 10000 / this.editForm.totalConsArea).toFixed(0)
}
},
deep: true,

8
src/views/land/noneHandLand/index.vue
Unescape View File

@ -846,7 +846,6 @@ export default {
// 查询
onSubmit() {
this.loading = true;
console.log(this.searchForm);
fetchNoHandLandList(
Object.assign({
current: this.page.currentPage,
@ -881,7 +880,7 @@ export default {
}
let ids = [];
for (let item of this.selectedData) {
ids.push(item["landListedId"]);
ids.push(item["proposedseriaId"]);
}
exportHandLandListExcel(ids.toString()).then((res) => {
// fileDownload(res.data, "kg.xlsx");
@ -916,6 +915,7 @@ export default {
// 查看
viewItem(row) {
this.$route.meta.keepAlive = true
let data=row.proposedseriaId
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'true',isEditOr:'false',data:data}});
// this.dialogTitle = "查看数据";
@ -926,6 +926,7 @@ export default {
// 编辑
editItem(row) {
this.$route.meta.keepAlive = true
let data=row.proposedseriaId
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'false',isEditOr:'true',data:data}});
// this.dialogTitle = "编辑数据";
@ -962,6 +963,7 @@ export default {
// 新建
newItem() {
this.$route.meta.keepAlive = true
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'false',isEditOr:'false',}});
// 从cols里面拷贝字段
// let newObj = {};
@ -1148,7 +1150,7 @@ export default {
}
let ids = [];
for (let item of this.selectedData) {
ids.push(item["landListedId"]);
ids.push(item["proposedseriaId"]);
}
multiDeteleList(ids).then((res) => {
if (res.data.success) {

6
src/views/land/noneHandLand/newLand.vue
Unescape View File

@ -246,7 +246,7 @@
<el-collapse-item name="12">
<template slot="title">
<div class="ti-box">
<span>建筑配建计容</span>
<span>配建情况</span>
<span class="ti-tag">{{ setTagName(12) }}</span>
</div>
</template>
@ -278,7 +278,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="配件类型">
<el-table-column label="配建类型">
<template scope="scope">
<el-input
v-model="scope.row.constructionType"
@ -288,7 +288,7 @@
<span v-else>{{ scope.row.constructionType }}</span>
</template>
</el-table-column>
<el-table-column label="配件面积">
<el-table-column label="配建面积">
<template scope="scope">
<el-input
oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')"

Write Preview
Loading…
Cancel
Save