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

17.35

develop
zhangjy 4 years ago
parent
7f01b56c34
commit
e8980bc8f1
4 changed files with 255 additions and 102 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. 8
      src/views/land/api/land.js
  2. 66
      src/views/land/handLand/index.vue
  3. 262
      src/views/land/handLand/newLand.vue
  4. 21
      src/views/sale/index.vue

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

@ -256,6 +256,14 @@ export function importLand(data) {
data: data,
})
}
// 导入经纬度
export function importLonLat(data) {
return request({
url: '/api/landlistedlonlat/importLandListLatExcel',
method: 'post',
data: data,
})
}
export function saveLandMulti(data) {
return request({
url: '/api/auction_record/multi',

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

@ -236,7 +236,7 @@
<el-table-column fixed type="selection" width="55"> </el-table-column>
<el-table-column label="公告信息">
<el-table-column
v-for="(item, index) in cols.slice(0,3)"
v-for="(item, index) in cols.slice(0,20)"
:key="index"
:label="item.label"
:prop="item.prop"
@ -248,7 +248,7 @@
</el-table-column>
<el-table-column label="规划条件">
<el-table-column
v-for="(item, index) in cols.slice(3,40)"
v-for="(item, index) in cols.slice(20,24)"
:key="index"
:prop="item.prop"
:label="item.label"
@ -260,7 +260,7 @@
</el-table-column>
<el-table-column label="建设条件">
<el-table-column
v-for="(item, index) in cols.slice(40,62)"
v-for="(item, index) in cols.slice(24,31)"
:key="index"
:label="item.label"
:prop="item.prop"
@ -270,6 +270,66 @@
>
</el-table-column>
</el-table-column>
<el-table-column label="竞买条件">
<el-table-column
v-for="(item, index) in cols.slice(31,37)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="地理信息">
<el-table-column
v-for="(item, index) in cols.slice(37,45)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="成交信息">
<el-table-column
v-for="(item, index) in cols.slice(45,57)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="项目开发">
<el-table-column
v-for="(item, index) in cols.slice(57,65)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<!-- <el-table-column label="项目资料">-->
<!-- <el-table-column-->
<!-- v-for="(item, index) in cols.slice(65,74)"-->
<!-- :key="index"-->
<!-- :label="item.label"-->
<!-- :prop="item.prop"-->
<!-- :width="item.width"-->
<!-- :fixed="item.fixed"-->
<!-- show-overflow-tooltip-->
<!-- >-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope">
<el-button title="111" type="text" size="small" @click="viewItem(scope.row)"

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

@ -6,7 +6,7 @@
:rules="rules"
size="mini"
ref="ruleForm"
style="flex: 1; overflow: auto; margin: 20px;width: calc(100% - 40px)"
style="flex: 1; overflow: auto; margin: 20px;width: calc(100% - 40px);margin-bottom: 50px;"
:disabled="readOnly"
>
<el-collapse v-model="activeNames" @change="editItemChange">
@ -18,92 +18,88 @@
</div>
</template>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="公告序号：" prop="annoId">
<el-input v-model="editForm.annoId"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="地块编号：" prop="landCode">
<el-input v-model="editForm.landCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="地块位置：" prop="landPosition">
<el-input v-model="editForm.landPosition"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="土地用途：">
<el-input v-model="editForm.landUsage"></el-input>
<el-col :span="6">
<el-form-item label="土地用途：" prop="landPosition">
<el-input v-model="editForm.landPosition"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="土地出让面积（㎡）：">
<el-input v-model="editForm.landTransferSquare"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="土地出让面积（亩）：">
<el-input v-model="editForm.landTransferMu"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="总计容建筑面积（㎡）：">
<el-input v-model="editForm.totalConsArea"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="容积率：">
<el-input v-model="editForm.plotRatio"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="建筑密度：">
<el-input v-model="editForm.buildingDensity"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="绿地率：">
<el-input v-model="editForm.greenSpaceRatio"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="限高：">
<el-input v-model="editForm.heighPermitted"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="出让年限：">
<el-input v-model="editForm.remiseYears"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="出让价款起始价（万元）：">
<el-input v-model="editForm.transferPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="起始楼面价：">
<el-input v-model="editForm.startingFloorPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="竞买保证金（万元）：">
<el-input v-model="editForm.bidMargin"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="公告日期：" prop="annoDate">
<el-date-picker
type="date"
@ -114,7 +110,9 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="拍卖日期：" prop="auctionDate">
<el-date-picker
type="date"
@ -125,16 +123,17 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="持证准用面积：">
<el-input v-model="editForm.licensedArea"></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-col :span="6"> </el-col>
<el-col :span="6"> </el-col>
<el-col :span="6"> </el-col>
<el-col :span="6" style="text-align: right">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
@ -149,21 +148,16 @@
</div>
</template>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="商业面积：">
<el-input v-model="editForm.bizSpace"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="商务面积占比（%）：">
<el-input v-model="editForm.fd"></el-input>
</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-col>
</el-row>
<el-row>
<el-col :span="8">
@ -182,7 +176,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>
@ -283,36 +277,36 @@
</div>
</template>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="地质灾害：">
<el-input v-model="editForm.geologicHazard"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="人防还建（㎡)：">
<el-input v-model="editForm.civilAirDefence"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="成品住宅比例：">
<el-input
v-model="editForm.percentFinishedHousing"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="装配建筑：">
<el-input v-model="editForm.assemblyBuilding"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="绿色建筑：">
<el-input v-model="editForm.greenBuilding"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="其他条件：">
<el-input v-model="editForm.otherConditions"></el-input>
</el-form-item>
@ -342,12 +336,12 @@
</div>
</template>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="竞买条件：">
<el-input v-model="editForm.biddingConditions"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="勾地形式：">
<el-select
v-model="editForm.hookForm"
@ -364,24 +358,24 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="一级治理方：">
<el-input v-model="editForm.firstGovernance"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="勾地企业：">
<el-input v-model="editForm.landEnterprises"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="付款节奏：">
<el-input v-model="editForm.paymentRhythm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="出让人：">
<el-input v-model="editForm.bargainor"></el-input>
</el-form-item>
@ -405,7 +399,7 @@
</div>
</template>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="城市：">
<el-select
v-model="editForm.city"
@ -422,7 +416,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="行政区：">
<el-select
v-model="editForm.canton"
@ -439,7 +433,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="特区：">
<el-select
v-model="editForm.specialZone"
@ -456,14 +450,14 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="环线：">
<el-input v-model="editForm.loopWire"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="大组团：">
<el-select
v-model="editForm.bigGroup"
@ -480,7 +474,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="小组团：">
<el-select
v-model="editForm.smallGroup"
@ -497,9 +491,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="奥维定位：">
<el-select
v-model="editForm.ovePosition"
@ -516,11 +508,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="经纬度（百度BD09）：">
<el-input v-model="editForm.lonLatBd"></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;padding-top:20px">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
@ -536,17 +532,17 @@
</div>
</template>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="公告序号：">
<el-input v-model="editForm.annoId"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="地块位置：">
<el-input v-model="editForm.landPosition"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="出让方式：">
<el-select
v-model="editForm.transferMode"
@ -563,53 +559,51 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="受让单位：">
<el-input v-model="editForm.assignee"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="拿地企业-简称：">
<el-input v-model="editForm.landEnterpriseShort"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="成交价：">
<el-input v-model="editForm.dealPrice"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="溢价率：">
<el-input v-model="editForm.premiumRate"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="商业自持比例(%)：">
<el-input v-model="editForm.commercialSelfRatio"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="住宅自持比例(%)：">
<el-input v-model="editForm.homeSelfRatio"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="无偿比例(%)：">
<el-input v-model="editForm.percentUnpaid"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="人才公寓面积：">
<el-input v-model="editForm.talenApartmentArea"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="参拍企业：">
<el-input
v-model="editForm.participatingEnterprises"
@ -635,24 +629,22 @@
</div>
</template>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="项目状态：">
<el-input v-model="editForm.projectStatus"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="楼盘名称：">
<el-input v-model="editForm.buildingName"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="项目公司：">
<el-input v-model="editForm.projectCompany"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="确权时间：">
<el-date-picker
type="date"
@ -663,7 +655,9 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="项目首开时间：">
<el-date-picker
type="date"
@ -922,9 +916,21 @@
>+添加一行</el-button
>
</el-row>
<!-- <el-row style="text-align: center">-->
<!-- <el-button type="text" style="color: gray">导入</el-button>-->
<!-- </el-row>-->
<el-row>
<el-col :span="8"> </el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="display: flex;justify-content: flex-end">
<el-upload
v-show="!readOnly"
style="margin-right: 10px;"
action=""
accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
:before-upload="uploadLonLat"
>
<el-button size="medium" type="primary">导入</el-button>
</el-upload>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="9">
<template slot="title">
@ -1087,7 +1093,30 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="13">
<template slot="title">
<div class="ti-box">
<span>航拍链接</span>
<span class="ti-tag">{{ setTagName(7) }}</span>
</div>
</template>
<el-row>
<el-col :span="6">
<el-form-item label="航拍链接：">
<el-input v-model="editForm.aerialLink"></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="10">
<template slot="title">
<div class="ti-box">
@ -1289,6 +1318,7 @@
updateConstructionPlan,
delConstructionPlan,
importLand,
importLonLat,
saveLandMulti
} from "@/views/land/api/land";
import { uploadFile } from "@/views/api/api";
@ -1642,7 +1672,7 @@
dialogTitle: "新增数据",
// 编辑Form
editForm: {},
activeNames: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10",'11','12'],
activeNames: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10",'11','12','13'],
// 表格加载
loading: false,
// 选中的数据
@ -2502,6 +2532,36 @@
});
return false
},
uploadLonLat(e){
const file = e;
let formData = new FormData();
formData.append("uploadFile", file);
importLonLat(formData).then((res) => {
if (res.data.success) {
// let data=res.data.data;
// data.forEach((item) => {
// item.landListedId=this.onlyId;
// });
// saveLandMulti(data).then(res=>{
// if (res.data.success){
// this.queryRecordList(this.onlyId);
// this.$message({
// type: 'success',
// message: '导入成功'
// });
// }else {
// this.$message.error("保存失败");
// }
// })
this.queryLonLatList(this.onlyId);
return false
} else {
this.$message.error("导入失败");
return false
}
});
return false
},
//分布保存
save() {
if (!this.editForm.landCode) {
@ -2595,4 +2655,10 @@
padding: 0 20px;
margin-top: 20px;
}
/deep/ .el-form-item__content{
display: flex;
}
/deep/ .el-form-item__label{
width: 180px;
}
</style>

21
src/views/sale/index.vue
Unescape View File

@ -94,7 +94,7 @@
v-loading="loading"
>
<el-table-column
v-for="(item, index) in cols"
v-for="(item, index) in cols.slice(0,3)"
:key="index"
:prop="item.prop"
:label="item.label"
@ -103,6 +103,22 @@
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="楼栋" show-overflow-tooltip>
<template slot-scope="scope">
<span style="cursor: pointer" @click="handleBuild(scope.row)">{{scope.row.buildingNo}}</span>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in cols.slice(5,7)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="状态">
<template>
@ -523,6 +539,9 @@ export default {
resetForm(formName) {
this.$refs[formName].resetFields();
},
handleBuild(data){
window.open('http://www.cq315house.com/HtmlPage/ShowRooms.html?buildingid='+data.dataId)
},
//立即处理
handle(item) {
this.ruleForm={};

Write Preview
Loading…
Cancel
Save