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

18.00

develop
zhangjy 4 years ago
parent
604b345bce
commit
f2d0322254
4 changed files with 1184 additions and 191 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. 76
      src/views/land/api/land.js
  2. 76
      src/views/land/api/noLand.js
  3. 627
      src/views/land/handLand/newLand.vue
  4. 596
      src/views/land/noneHandLand/newLand.vue

76
src/views/land/api/land.js
Unescape View File

@ -94,7 +94,22 @@ export function queryLonLatList(landListedId) {
method: 'get'
})
}
// 通过公告序号经营企业列表查询
export function conductenterList(data) {
return request({
url: '/api/landlistedconductenterprise/page',
method: 'get',
params:data
})
}
// 通过公告序号经营配件列表查询
export function constructionPlanList(data) {
return request({
url: '/api/landlistedconstructionplan/page',
method: 'get',
params:data
})
}
// 新增已挂牌地块经纬度
export function addLonLat(param) {
return request({
@ -107,6 +122,57 @@ export function addLonLat(param) {
})
}
// 新增已挂牌地块经营企业
export function addConductenter(param) {
return request({
url: '/api/landlistedconductenterprise',
method: 'post',
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// 新增已挂牌地块配件
export function addConstructionPlan(param) {
return request({
url: '/api/landlistedconstructionplan',
method: 'post',
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// 更新已挂牌地块配件
export function updateConstructionPlan(param) {
return request({
url: '/api/landlistedconstructionplan',
method: 'put',
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// 通过ID删除经营配件
export function delConstructionPlan(constructionPlanId) {
return request({
url: '/api/landlistedconstructionplan/' + constructionPlanId,
method: 'delete'
})
}
// 更新已挂牌地块经营企业
export function updateConductenter(param) {
return request({
url: '/api/landlistedconductenterprise',
method: 'put',
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// 更新已挂牌地块经纬度
export function updateLonLat(param) {
return request({
@ -126,7 +192,13 @@ export function delLandLonLat(landListedId, landCode) {
method: 'delete'
})
}
// 通过ID删除经营企业
export function delConductenter(conductEnterpriseId) {
return request({
url: '/api/landlistedconductenterprise/' + conductEnterpriseId,
method: 'delete'
})
}
// 通过序号和文件类型查询文件列表
export function queryFileList(param) {
return request({

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

@ -86,7 +86,22 @@ export function queryLonLatList(proposedseriaId) {
method: 'get'
})
}
// 通过公告序号经营企业列表查询
export function conductenterList(data) {
return request({
url: '/api/landtolistconductenterprise/page',
method: 'get',
params:data
})
}
// 通过公告序号经营配件列表查询
export function constructionPlanList(data) {
return request({
url: '/api/landtolistconstructionplan/page',
method: 'get',
params:data
})
}
// 新增已挂牌地块经纬度
export function addLonLat(param) {
return request({
@ -98,7 +113,64 @@ export function addLonLat(param) {
data: param
})
}
// 新增已挂牌地块经营企业
export function addConductenter(param) {
return request({
url: '/api/landtolistconductenterprise',
method: 'post',
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// 新增已挂牌地块配件
export function addConstructionPlan(param) {
return request({
url: '/api/landtolistconstructionplan',
method: 'post',
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// 更新已挂牌地块配件
export function updateConstructionPlan(param) {
return request({
url: '/api/landtolistconstructionplan',
method: 'put',
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// 更新已挂牌地块经营企业
export function updateConductenter(param) {
return request({
url: '/api/landtolistconductenterprise',
method: 'put',
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// 通过ID删除经营企业
export function delConductenter(conductEnterpriseId) {
return request({
url: '/api/landtolistconductenterprise/' + conductEnterpriseId,
method: 'delete'
})
}
// 通过ID删除配件
export function delConstructionPlan(constructionPlanId) {
return request({
url: '/api/landtolistconstructionplan/' + constructionPlanId,
method: 'delete'
})
}
// 更新已挂牌地块经纬度
export function updateLonLat(param) {
return request({

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

@ -160,16 +160,16 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="配建-计容：">
<el-input v-model="editForm.allocationCapacity"></el-input>
</el-form-item>
<!-- <el-form-item label="配建-计容：">-->
<!-- <el-input v-model="editForm.allocationCapacity"></el-input>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="配建-不计容：">
<el-input v-model="editForm.allocationNotCapacity"></el-input>
</el-form-item>
<!-- <el-form-item label="配建-不计容：">-->
<!-- <el-input v-model="editForm.allocationNotCapacity"></el-input>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
@ -179,6 +179,111 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="12">
<template slot="title">
<div class="ti-box">
<span>建筑配建计容</span>
<span class="ti-tag">{{ setTagName(12) }}</span>
</div>
</template>
<el-table :data="constructionPlanList" style="width: 100%">
<el-table-column label="序号" width="120">
<template scope="scope">
<span>{{scope.row.index+1}}</span>
</template>
</el-table-column>
<el-table-column label="规划类型">
<template scope="scope">
<el-select
v-if="scope.row.edit"
v-model="scope.row.planType"
placeholder="请选择"
size="small"
style="width: 80%"
>
<el-option
v-for="item in planTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<span v-else>{{getDictVal(scope.row.planType,planTypeList)}}</span>
</template>
</el-table-column>
<el-table-column label="配件类型" >
<template scope="scope">
<el-input
v-model="scope.row.constructionType"
v-if="scope.row.edit"
size="small"
></el-input>
<span v-else>{{scope.row.constructionType}}</span>
</template>
</el-table-column>
<el-table-column label="配件面积">
<template scope="scope">
<el-input
oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')"
v-model="scope.row.constructionArea"
v-if="scope.row.edit"
size="small"
></el-input>
<span v-else>{{scope.row.constructionArea}}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
v-show="scope.row.edit"
@click="handleLonLatOKClick(scope.row,'配件')"
>确定</el-button
>
<el-button
type="text"
size="small"
v-show="!scope.row.edit"
@click="handleLonLatEditClick(scope.row,'配件')"
>编辑</el-button
>
<el-button
type="text"
size="small"
v-show="!scope.row.edit"
@click="handleLonLatDelClick(scope.row,'配件')"
>删除</el-button
>
<el-button
type="text"
size="small"
v-show="scope.row.edit"
@click="handleLonLatCancelClick(scope.row, scope.$index,'配件')"
>取消</el-button
>
</template>
</el-table-column>
</el-table>
<el-row style="text-align: center">
<el-button
type="text"
style="color: gray"
@click="addOneRowForLonLat('配件')"
>+添加一行</el-button
>
</el-row>
<el-row>
<el-col :span="8"> </el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="3">
<template slot="title">
<div class="ti-box">
@ -198,8 +303,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="特殊规划：">
<el-input v-model="editForm.specialPlan"></el-input>
<el-form-item label="成品住宅比例：">
<el-input
v-model="editForm.percentFinishedHousing"
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -222,11 +329,11 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="成品住宅比例：">
<el-input
v-model="editForm.percentFinishedHousing"
></el-input>
</el-form-item>
<!-- <el-form-item label="成品住宅比例：">-->
<!-- <el-input-->
<!-- v-model="editForm.percentFinishedHousing"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
@ -565,23 +672,6 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操盘企业：">
<el-input v-model="editForm.tradingEnterprises"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合作方：">
<el-input v-model="editForm.partner"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="经营企业：">
<el-input v-model="editForm.conductEnterprise"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目首开时间：">
<el-date-picker
@ -593,6 +683,125 @@
></el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="操盘企业：">-->
<!-- <el-input v-model="editForm.tradingEnterprises"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="合作方：">-->
<!-- <el-input v-model="editForm.partner"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8"></el-col>
<el-col :span="8"></el-col>
<el-col :span="8" style="text-align: right">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="11">
<template slot="title">
<div class="ti-box">
<span>经营企业数据</span>
<span class="ti-tag">{{ setTagName(11) }}</span>
</div>
</template>
<el-table :data="companyList" style="width: 100%">
<el-table-column label="序号" width="120">
<template scope="scope">
<span>{{scope.row.index+1}}</span>
</template>
</el-table-column>
<el-table-column label="企业">
<template scope="scope">
<el-input
v-model="scope.row.enterpriseName"
v-if="scope.row.edit"
size="small"
></el-input>
<span v-else>{{scope.row.enterpriseName}}</span>
</template>
</el-table-column>
<el-table-column label="股比" >
<template scope="scope">
<el-input
oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')"
v-model="scope.row.shareRatio"
v-if="scope.row.edit"
size="small"
></el-input>
<span v-else>{{scope.row.shareRatio}}</span>
</template>
</el-table-column>
<el-table-column label="是否操盘" width="120">
<template scope="scope">
<el-select
v-if="scope.row.edit"
v-model="scope.row.operation"
placeholder="请选择"
size="small"
style="width: 80%"
>
<el-option
v-for="item in yesOrNo"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<span v-else>{{getDictVal(scope.row.operation,yesOrNo)}}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
v-show="scope.row.edit"
@click="handleLonLatOKClick(scope.row,'企业')"
>确定</el-button
>
<el-button
type="text"
size="small"
v-show="!scope.row.edit"
@click="handleLonLatEditClick(scope.row,'企业')"
>编辑</el-button
>
<el-button
type="text"
size="small"
v-show="!scope.row.edit"
@click="handleLonLatDelClick(scope.row,'企业')"
>删除</el-button
>
<el-button
type="text"
size="small"
v-show="scope.row.edit"
@click="handleLonLatCancelClick(scope.row, scope.$index,'企业')"
>取消</el-button
>
</template>
</el-table-column>
</el-table>
<el-row style="text-align: center">
<el-button
type="text"
style="color: gray"
@click="addOneRowForLonLat('企业')"
>+添加一行</el-button
>
</el-row>
<el-row>
<el-col :span="8"> </el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
@ -1036,12 +1245,12 @@
</el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="uploadRes(scope.row)"
>上传</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click="uploadRes(scope.row)"-->
<!-- >上传</el-button-->
<!-- >-->
<el-button type="text" size="small" @click="delRes(scope.row)"
>删除</el-button
>
@ -1092,6 +1301,14 @@
updateRecord,
queryRecord,
deleteRecord,
conductenterList,
addConductenter,
updateConductenter,
delConductenter,
constructionPlanList,
addConstructionPlan,
updateConstructionPlan,
delConstructionPlan,
} from "@/views/land/api/land";
import { uploadFile } from "@/views/api/api";
import { downUrlFile } from "@/util/file";
@ -1114,6 +1331,9 @@
tableData: [],
// 地块经纬信息
landLonLat: [],
// 经营企业信息
companyList:[],
constructionPlanList:[],
// 列
cols: [
{
@ -1441,7 +1661,7 @@
dialogTitle: "新增数据",
// 编辑Form
editForm: {},
activeNames: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"],
activeNames: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10",'11','12'],
// 表格加载
loading: false,
// 选中的数据
@ -1466,6 +1686,8 @@
],
},
isLonLatEdit: false,
companyEdit:false,
planEdit:false,
//字典
regionList: [],
bigGroupList: [],
@ -1477,6 +1699,8 @@
cityList: [],
//
landRecord: [],
yesOrNo:[],
planTypeList:[]
};
},
created() {
@ -1504,6 +1728,12 @@
getDict("transfer_mode_type").then((res) => {
this.transferModeList = res.data.data;
});
getDict("yesOrNot").then((res) => {
this.yesOrNo = res.data.data;
});
getDict("planType").then((res) => {
this.planTypeList = res.data.data;
});
let newObj = {};
for (let col of this.cols) {
newObj[col.prop] = "";
@ -1522,6 +1752,8 @@
this.onlyId = row.landListedId;
this.queryLonLatList(row.landListedId);
this.queryRecordList(row.landListedId);
this.conductenterList(row.landListedId);
this.getPlanList(row.landListedId);
this.queryFileList();
}
},
@ -1645,6 +1877,8 @@
this.onlyId = row.landListedId;
this.queryLonLatList(row.landListedId);
this.queryRecordList(row.landListedId);
this.conductenterList(row.landListedId);
this.getPlanList(row.landListedId);
this.queryFileList();
},
@ -1743,6 +1977,51 @@
}
});
},
conductenterList(landListedId){
let data={
landListedId:landListedId,
current:1,
size:1000000
}
conductenterList(data).then((response) => {
if (response.data.success) {
let index = 0;
this.companyList = response.data.data.records;
this.companyList.forEach((item) => {
item.operation=item.operation.toString();
this.$set(item,'edit',false)
this.$set(item,'index',index)
// item.edit = false;
// item.index = index;
index++;
});
} else {
this.companyList = [];
}
});
},
getPlanList(landListedId){
let data={
landListedId:landListedId,
current:1,
size:1000000
}
constructionPlanList(data).then((response) => {
if (response.data.success) {
let index = 0;
this.constructionPlanList = response.data.data.records;
this.constructionPlanList.forEach((item) => {
this.$set(item,'edit',false)
this.$set(item,'index',index)
// item.edit = false;
// item.index = index;
index++;
});
} else {
this.constructionPlanList = [];
}
});
},
queryRecordList(landListedId) {
queryRecord({ landListedId: landListedId }).then((response) => {
if (response.data.success) {
@ -1776,27 +2055,65 @@
window.history.back()
},
// 添加一行经纬信息
addOneRowForLonLat() {
this.isLonLatEdit = false;
addOneRowForLonLat(type) {
if (!this.onlyId) {
this.$message.error("请先保存公告信息");
return;
}
let index = 0;
this.landLonLat.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
this.landLonLat.push({
// annoId: this.editForm.annoId,
// landListedId: this.editForm.landListedId,
landCode: "",
landLonLat: "",
lineColor: "#FF0000",
lineWidth: "",
lineOpaqueness: "",
fillColor: "#FF0000",
fillOpaqueness: "",
edit: true,
index: index,
});
if (type==='企业'){
this.companyEdit=false;
this.companyList.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
this.companyList.push({
// annoId: this.editForm.annoId,
// landListedId: this.editForm.landListedId,
shareRatio: "",
operation: "",
enterpriseName: "",
edit: true,
index: index,
});
}else if (type==='配件'){
this.planEdit=false;
this.constructionPlanList.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
this.constructionPlanList.push({
// annoId: this.editForm.annoId,
// landListedId: this.editForm.landListedId,
constructionArea: "",
constructionType: "",
planType: "",
edit: true,
index: index,
});
}else {
this.isLonLatEdit = false;
this.landLonLat.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
this.landLonLat.push({
// annoId: this.editForm.annoId,
// landListedId: this.editForm.landListedId,
landCode: "",
landLonLat: "",
lineColor: "#FF0000",
lineWidth: "",
lineOpaqueness: "",
fillColor: "#FF0000",
fillOpaqueness: "",
edit: true,
index: index,
});
}
},
addOneRecord() {
this.isLonLatEdit = false;
@ -1823,15 +2140,36 @@
},
// 删除一行经纬度
handleLonLatDelClick(row) {
delLandLonLat(row.latId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.queryLonLatList(row.landListedId);
} else {
this.$message.error("删除失败");
}
});
handleLonLatDelClick(row,type) {
if (type==='企业'){
delConductenter(row.conductEnterpriseId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.conductenterList(row.landListedId);
} else {
this.$message.error("删除失败");
}
});
}else if (type==='配件'){
// console.log(row);
delConstructionPlan(row.constructionPlanId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.getPlanList(row.landListedId);
} else {
this.$message.error("删除失败");
}
});
}else {
delLandLonLat(row.latId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.queryLonLatList(row.landListedId);
} else {
this.$message.error("删除失败");
}
});
}
},
handelDeleteRecord(row) {
deleteRecord(row.auctionRecordId).then((res) => {
@ -1845,36 +2183,80 @@
},
// 保存编辑行
handleLonLatOKClick(row) {
handleLonLatOKClick(row,type) {
if (!this.onlyId) {
this.$message.error("请先填写公告信息");
return;
}
if (!row.landCode) {
this.$message.error("请输入宗地编号");
this.$message.error("请先保存公告信息");
return;
}
row.edit = false;
this.$set(row, "landListedId", this.onlyId);
this.$set(row, "annoId", this.editForm.annoId);
if (this.isLonLatEdit) {
updateLonLat(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.queryLonLatList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
} else {
addLonLat(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.queryLonLatList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
if (type==='企业'){
// console.log(row);
if (this.companyEdit) {
updateConductenter(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.conductenterList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
} else {
addConductenter(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.conductenterList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
}
}else if (type==='配件'){
if (this.planEdit) {
updateConstructionPlan(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.getPlanList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
} else {
addConstructionPlan(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.getPlanList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
}
}else {
if (!row.landCode) {
this.$message.error("请输入宗地编号");
return;
}
this.$set(row, "annoId", this.editForm.annoId);
if (this.isLonLatEdit) {
updateLonLat(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
row.edit = false;
this.queryLonLatList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
} else {
addLonLat(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
row.edit = false;
this.queryLonLatList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
}
}
},
saveRecord(row) {
@ -1911,12 +2293,21 @@
},
// 确定编辑行
handleLonLatEditClick(row) {
this.isLonLatEdit = true;
row.edit = true;
let bakObj = this.landLonLat.concat();
this.landLonLat = [];
this.landLonLat = bakObj;
handleLonLatEditClick(row,type) {
// console.log(row);
this.$nextTick(()=>{
row.edit = true;
})
if (type==='企业'){
this.companyEdit = true;
}else if (type==='配件'){
this.planEdit = true;
}else {
this.isLonLatEdit = true;
let bakObj = this.landLonLat.concat();
this.landLonLat = [];
this.landLonLat = bakObj;
}
},
editRecord(row) {
this.isLonLatEdit = true;
@ -1927,14 +2318,31 @@
},
// 取消编辑行
handleLonLatCancelClick(row, index) {
handleLonLatCancelClick(row, index,type) {
let data = row;
if (!row.landListedId) {
this.landLonLat.splice(index, 1);
} else {
this.$set(data, "edit", false);
this.$set(this.landLonLat, index, data);
if (type==='企业'){
if (!row.landListedId) {
this.companyList.splice(index, 1);
} else {
this.$set(data, "edit", false);
this.$set(this.companyList, index, data);
}
}else if (type==='配件'){
if (!row.landListedId) {
this.constructionPlanList.splice(index, 1);
} else {
this.$set(data, "edit", false);
this.$set(this.constructionPlanList, index, data);
}
}else {
if (!row.landListedId) {
this.landLonLat.splice(index, 1);
} else {
this.$set(data, "edit", false);
this.$set(this.landLonLat, index, data);
}
}
},
cancelOneRecord(row, index) {
let data = row;
@ -2051,7 +2459,7 @@
if (res.data.success) {
this.$message("保存成功");
this.onlyId = res.data.data;
window.history.back()
// window.history.back()
// this.dialogFormVisible = false;
// this.onSubmit();
} else {
@ -2059,6 +2467,15 @@
}
});
},
getDictVal(data,list) {
let name;
list.map((e)=>{
if (e.value==data){
name=e.label
}
})
return name
}
},
}
</script>

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

@ -221,16 +221,16 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="配建-计容：">
<el-input v-model="editForm.allocationCapacity"></el-input>
</el-form-item>
<!-- <el-form-item label="配建-计容：">-->
<!-- <el-input v-model="editForm.allocationCapacity"></el-input>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="配建-不计容：">
<el-input v-model="editForm.allocationNotCapacity"></el-input>
</el-form-item>
<!-- <el-form-item label="配建-不计容：">-->
<!-- <el-input v-model="editForm.allocationNotCapacity"></el-input>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
@ -240,6 +240,111 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="12">
<template slot="title">
<div class="ti-box">
<span>建筑配建计容</span>
<span class="ti-tag">{{ setTagName(12) }}</span>
</div>
</template>
<el-table :data="constructionPlanList" style="width: 100%">
<el-table-column label="序号" width="120">
<template scope="scope">
<span>{{scope.row.index+1}}</span>
</template>
</el-table-column>
<el-table-column label="规划类型">
<template scope="scope">
<el-select
v-if="scope.row.edit"
v-model="scope.row.planType"
placeholder="请选择"
size="small"
style="width: 80%"
>
<el-option
v-for="item in planTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<span v-else>{{getDictVal(scope.row.planType,planTypeList)}}</span>
</template>
</el-table-column>
<el-table-column label="配件类型" >
<template scope="scope">
<el-input
v-model="scope.row.constructionType"
v-if="scope.row.edit"
size="small"
></el-input>
<span v-else>{{scope.row.constructionType}}</span>
</template>
</el-table-column>
<el-table-column label="配件面积">
<template scope="scope">
<el-input
oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')"
v-model="scope.row.constructionArea"
v-if="scope.row.edit"
size="small"
></el-input>
<span v-else>{{scope.row.constructionArea}}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
v-show="scope.row.edit"
@click="handleLonLatOKClick(scope.row,'配件')"
>确定</el-button
>
<el-button
type="text"
size="small"
v-show="!scope.row.edit"
@click="handleLonLatEditClick(scope.row,'配件')"
>编辑</el-button
>
<el-button
type="text"
size="small"
v-show="!scope.row.edit"
@click="handleLonLatDelClick(scope.row,'配件')"
>删除</el-button
>
<el-button
type="text"
size="small"
v-show="scope.row.edit"
@click="handleLonLatCancelClick(scope.row, scope.$index,'配件')"
>取消</el-button
>
</template>
</el-table-column>
</el-table>
<el-row style="text-align: center">
<el-button
type="text"
style="color: gray"
@click="addOneRowForLonLat('配件')"
>+添加一行</el-button
>
</el-row>
<el-row>
<el-col :span="8"> </el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="4">
<template slot="title">
<div class="ti-box">
@ -259,8 +364,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="特殊规划：">
<el-input v-model="editForm.specialPlan"></el-input>
<el-form-item label="成品住宅比例：">
<el-input
v-model="editForm.percentFinishedHousing"
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -283,11 +390,11 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="成品住宅比例：">
<el-input
v-model="editForm.percentFinishedHousing"
></el-input>
</el-form-item>
<!-- <el-form-item label="成品住宅比例：">-->
<!-- <el-input-->
<!-- v-model="editForm.percentFinishedHousing"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
@ -578,6 +685,111 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="11">
<template slot="title">
<div class="ti-box">
<span>经营企业数据</span>
<span class="ti-tag">{{ setTagName(11) }}</span>
</div>
</template>
<el-table :data="companyList" style="width: 100%">
<el-table-column label="序号" width="120">
<template scope="scope">
<span>{{scope.row.index+1}}</span>
</template>
</el-table-column>
<el-table-column label="企业">
<template scope="scope">
<el-input
v-model="scope.row.enterpriseName"
v-if="scope.row.edit"
size="small"
></el-input>
<span v-else>{{scope.row.enterpriseName}}</span>
</template>
</el-table-column>
<el-table-column label="股比" >
<template scope="scope">
<el-input
oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')"
v-model="scope.row.shareRatio"
v-if="scope.row.edit"
size="small"
></el-input>
<span v-else>{{scope.row.shareRatio}}</span>
</template>
</el-table-column>
<el-table-column label="是否操盘" width="120">
<template scope="scope">
<el-select
v-if="scope.row.edit"
v-model="scope.row.operation"
placeholder="请选择"
size="small"
style="width: 80%"
>
<el-option
v-for="item in yesOrNo"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<span v-else>{{getDictVal(scope.row.operation,yesOrNo)}}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
v-show="scope.row.edit"
@click="handleLonLatOKClick(scope.row,'企业')"
>确定</el-button
>
<el-button
type="text"
size="small"
v-show="!scope.row.edit"
@click="handleLonLatEditClick(scope.row,'企业')"
>编辑</el-button
>
<el-button
type="text"
size="small"
v-show="!scope.row.edit"
@click="handleLonLatDelClick(scope.row,'企业')"
>删除</el-button
>
<el-button
type="text"
size="small"
v-show="scope.row.edit"
@click="handleLonLatCancelClick(scope.row, scope.$index,'企业')"
>取消</el-button
>
</template>
</el-table-column>
</el-table>
<el-row style="text-align: center">
<el-button
type="text"
style="color: gray"
@click="addOneRowForLonLat('企业')"
>+添加一行</el-button
>
</el-row>
<el-row>
<el-col :span="8"> </el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="8">
<template slot="title">
<div class="ti-box">
@ -924,12 +1136,12 @@
</el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="uploadRes(scope.row)"
>上传</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click="uploadRes(scope.row)"-->
<!-- >上传</el-button-->
<!-- >-->
<el-button type="text" size="small" @click="delRes(scope.row)"
>删除</el-button
>
@ -977,6 +1189,14 @@
delLandResFile,
updateLonLat,
multiDeteleList,
conductenterList,
addConductenter,
updateConductenter,
delConductenter,
constructionPlanList,
addConstructionPlan,
updateConstructionPlan,
delConstructionPlan,
} from "@/views/land/api/noLand";
import { uploadFile } from "@/views/api/api";
import { downUrlFile } from "@/util/file";
@ -1350,7 +1570,7 @@
dialogTitle: "新增数据",
// 编辑Form
editForm: {},
activeNames: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"],
activeNames: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10","11","12"],
// 表格加载
loading: false,
// 选中的数据
@ -1387,6 +1607,13 @@
avPositionList: [],
landTypeList: [],
cityList: [],
yesOrNo:[],
planTypeList:[],
companyEdit:false,
planEdit:false,
companyList:[],
constructionPlanList:[],
};
},
created() {
@ -1414,6 +1641,12 @@
getDict("land_supply_status").then((res) => {
this.supplyStatusList = res.data.data;
});
getDict("yesOrNot").then((res) => {
this.yesOrNo = res.data.data;
});
getDict("planType").then((res) => {
this.planTypeList = res.data.data;
});
let newObj = {};
for (let col of this.cols) {
newObj[col.prop] = "";
@ -1428,13 +1661,61 @@
}
if (this.$route.query.isEditOr==='true'){
let row=JSON.parse(this.$route.query.data)
console.log(row);
this.editForm = row;
this.onlyId = row.landListedId;
this.onlyId = row.proposedseriaId;
this.queryLonLatList(row.proposedseriaId);
this.conductenterList(row.proposedseriaId);
this.getPlanList(row.proposedseriaId);
this.queryFileList();
}
},
methods: {
conductenterList(landListedId){
let data={
landListedId:landListedId,
current:1,
size:1000000
}
conductenterList(data).then((response) => {
if (response.data.success) {
let index = 0;
this.companyList = response.data.data.records;
this.companyList.forEach((item) => {
item.operation=item.operation.toString();
this.$set(item,'edit',false)
this.$set(item,'index',index)
// item.edit = false;
// item.index = index;
index++;
});
} else {
this.companyList = [];
}
});
},
getPlanList(landListedId){
let data={
landListedId:landListedId,
current:1,
size:1000000
}
constructionPlanList(data).then((response) => {
if (response.data.success) {
let index = 0;
this.constructionPlanList = response.data.data.records;
this.constructionPlanList.forEach((item) => {
this.$set(item,'edit',false)
this.$set(item,'index',index)
// item.edit = false;
// item.index = index;
index++;
});
} else {
this.constructionPlanList = [];
}
});
},
setTagName(val) {
let txt = "";
this.activeNames.some((item) => item == val)
@ -1613,7 +1894,8 @@
saveNoHandLandList(JSON.stringify(this.editForm)).then((res) => {
if (res.data.success) {
this.$message("保存成功");
window.history.back()
this.onlyId = res.data.data;
// window.history.back()
// this.dialogFormVisible = false;
// this.onSubmit();
} else {
@ -1676,87 +1958,228 @@
},
// 添加一行经纬信息
addOneRowForLonLat() {
this.isLonLatEdit = false;
addOneRowForLonLat(type) {
if (!this.onlyId) {
this.$message.error("请先保存公告信息");
return;
}
let index = 0;
this.landLonLat.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
this.landLonLat.push({
// annoId: this.editForm.annoId,
// proposedseriaId: this.editForm.proposedseriaId,
landCode: "",
landLonLat: "",
lineColor: "#FF0000",
lineWidth: "",
lineOpaqueness: "",
fillColor: "#FF0000",
fillOpaqueness: "",
edit: true,
index: index,
});
if (type==='企业'){
this.companyEdit=false;
this.companyList.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
this.companyList.push({
// annoId: this.editForm.annoId,
// landListedId: this.editForm.landListedId,
shareRatio: "",
operation: "",
enterpriseName: "",
edit: true,
index: index,
});
}else if (type==='配件'){
this.planEdit=false;
this.constructionPlanList.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
this.constructionPlanList.push({
// annoId: this.editForm.annoId,
// landListedId: this.editForm.landListedId,
constructionArea: "",
constructionType: "",
planType: "",
edit: true,
index: index,
});
}else {
this.isLonLatEdit = false;
this.landLonLat.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
this.landLonLat.push({
// annoId: this.editForm.annoId,
// proposedseriaId: this.editForm.proposedseriaId,
landCode: "",
landLonLat: "",
lineColor: "#FF0000",
lineWidth: "",
lineOpaqueness: "",
fillColor: "#FF0000",
fillOpaqueness: "",
edit: true,
index: index,
});
}
},
// 删除一行经纬度
handleLonLatDelClick(row) {
delLandLonLat(row.latId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.queryLonLatList(row.proposedseriaId);
} else {
this.$message.error("删除失败");
}
});
},
// 保存编辑行
handleLonLatOKClick(row) {
if (!this.readOnly && !this.onlyId) {
this.$message.error("请先填写公告信息");
return;
}
if (!row.landCode) {
this.$message.error("请输入宗地编号");
return;
}
row.edit = false;
this.$set(row, "proposedseriaId", this.onlyId);
this.$set(row, "annoId", this.editForm.annoId);
if (this.isLonLatEdit) {
updateLonLat(row).then((res) => {
handleLonLatDelClick(row,type) {
if (type==='企业'){
delConductenter(row.conductEnterpriseId).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.queryLonLatList(row.proposedseriaId);
this.$message("删除成功");
this.conductenterList(row.landListedId);
} else {
this.$message.error("删除失败");
}
});
}else if (type==='配件'){
// console.log(row);
delConstructionPlan(row.constructionPlanId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.getPlanList(row.landListedId);
} else {
this.$message.error("保存失败");
this.$message.error("删除失败");
}
});
} else {
addLonLat(row).then((res) => {
}else {
delLandLonLat(row.latId).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message("删除成功");
this.queryLonLatList(row.proposedseriaId);
} else {
this.$message.error("保存失败");
this.$message.error("删除失败");
}
});
}
// delLandLonLat(row.latId).then((res) => {
// if (res.data.success) {
// this.$message("删除成功");
// this.queryLonLatList(row.proposedseriaId);
// } else {
// this.$message.error("删除失败");
// }
// });
},
// 保存编辑行
handleLonLatOKClick(row,type) {
if (!this.readOnly && !this.onlyId) {
this.$message.error("请先保存公告信息");
return;
}
this.$set(row, "proposedseriaId", this.onlyId);
if (type==='企业'){
// console.log(row);
if (this.companyEdit) {
updateConductenter(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.conductenterList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
} else {
addConductenter(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.conductenterList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
}
}else if (type==='配件'){
if (this.planEdit) {
updateConstructionPlan(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.getPlanList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
} else {
addConstructionPlan(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.getPlanList(row.landListedId);
} else {
this.$message.error("保存失败");
}
});
}
}else {
if (!row.landCode) {
this.$message.error("请输入宗地编号");
return;
}
row.edit = false;
this.$set(row, "annoId", this.editForm.annoId);
if (this.isLonLatEdit) {
updateLonLat(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.queryLonLatList(row.proposedseriaId);
} else {
this.$message.error("保存失败");
}
});
} else {
addLonLat(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.queryLonLatList(row.proposedseriaId);
} else {
this.$message.error("保存失败");
}
});
}
}
},
// 确定编辑行
handleLonLatEditClick(row) {
handleLonLatEditClick(row,type) {
this.isLonLatEdit = true;
row.edit = true;
let bakObj = this.landLonLat.concat();
this.landLonLat = [];
this.landLonLat = bakObj;
this.$nextTick(()=>{
row.edit = true;
})
if (type==='企业'){
this.companyEdit = true;
}else if (type==='配件'){
this.planEdit = true;
}else {
this.isLonLatEdit = true;
let bakObj = this.landLonLat.concat();
this.landLonLat = [];
this.landLonLat = bakObj;
}
},
// 取消编辑行
handleLonLatCancelClick(row, index) {
this.landLonLat.splice(index, 1);
handleLonLatCancelClick(row, index,type) {
let data = row;
if (type==='企业'){
if (!row.landListedId) {
this.companyList.splice(index, 1);
} else {
this.$set(data, "edit", false);
this.$set(this.companyList, index, data);
}
}else if (type==='配件'){
if (!row.landListedId) {
this.constructionPlanList.splice(index, 1);
} else {
this.$set(data, "edit", false);
this.$set(this.constructionPlanList, index, data);
}
}else {
if (!row.landListedId) {
this.landLonLat.splice(index, 1);
} else {
this.$set(data, "edit", false);
this.$set(this.landLonLat, index, data);
}
}
},
//批量删除
multiDelete() {
@ -1877,6 +2300,15 @@
}
});
},
getDictVal(data,list) {
let name;
list.map((e)=>{
if (e.value==data){
name=e.label
}
})
return name
}
},
}
</script>

Write Preview
Loading…
Cancel
Save