Browse Source

17.14

develop
zhangjy 4 years ago
parent
commit
9cb342b7d0
  1. 39
      src/views/bigdata/city/index.vue
  2. 26
      src/views/company/auction/index.vue
  3. 20
      src/views/houseList/page/detail.vue
  4. 76
      src/views/houseList/page/houseInfo.vue
  5. 27
      src/views/houseList/page/index.vue
  6. 10
      src/views/land/handLand/index.vue
  7. 325
      src/views/land/handLand/newLand.vue
  8. 10
      src/views/land/noneHandLand/index.vue
  9. 328
      src/views/land/noneHandLand/newLand.vue
  10. 71
      src/views/message/editMessage.vue
  11. 44
      src/views/message/index.vue

39
src/views/bigdata/city/index.vue

@ -3,31 +3,21 @@
<div class="page_search">
<div>
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="公告序号:">
<el-input
v-model="searchForm.annoId"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="地块编号:">
<el-input
v-model="searchForm.landCode"
placeholder="请输入"
></el-input>
<el-form-item label="年份:">
<el-date-picker
type="year"
placeholder="选择年份"
v-model="searchForm.year"
value-format="yyyy"
format="yyyy"
></el-date-picker>
</el-form-item>
<el-form-item label="土地用途:">
<el-form-item label="城市:">
<el-input
v-model="searchForm.landUsage"
v-model="searchForm.city"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="公告日期:" prop="annoDate">
<el-date-picker
type="date"
placeholder="选择公告日期"
v-model="searchForm.annoDate"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
@ -260,13 +250,8 @@ export default {
return {
searchForm: {
//
annoId: "",
//
landCode: "",
//
landUsage: "",
//
annoDate: "",
year:'',
city:''
},
tableData: [],
//

26
src/views/company/auction/index.vue

@ -9,23 +9,12 @@
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="地块编号:">
<el-input
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="地块名称:">
<el-input
v-model="searchForm.landName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="成交时间:" prop="annoDate">
<el-date-picker
type="date"
placeholder="选择成交时间"
></el-date-picker>
</el-form-item>
<el-form-item label="举牌企业:">
<el-input
v-model="searchForm.raiseEnterprise"
@ -288,23 +277,12 @@ export default {
width: 150,
fixed: true,
},
{
label: "地块编号",
prop: "",
width: 150,
fixed: true,
},
{
label: "地块名称",
prop: "landName",
width: 150,
fixed: true,
},
{
label: "成交时间",
prop: "",
width: 150,
},
{
label: "举牌排名",
prop: "ranking",
@ -384,8 +362,8 @@ export default {
{
current: this.page.currentPage,
size: this.page.pageSize,
}
// this.searchForm
},
this.searchForm
);
queryList(param).then((response) => {
console.log(response);

20
src/views/houseList/page/detail.vue

@ -2,7 +2,7 @@
<div class="normal_page">
<div class="page_search">
<div class="page_content_head_left">
<div>上东汇规划B-3号楼基础信息</div>
<div>基础信息</div>
</div>
<div style="margin-top: 20px">
<el-form
@ -19,7 +19,7 @@
>
<el-col :span="5">
<el-form-item label="公告编号:">
<span>{{upInfo.annoId}}</span>
<span>{{land.landCode}}</span>
</el-form-item></el-col
>
<el-col :span="5">
@ -77,8 +77,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="经纬度:">
<span>{{land.lonLatBd}}</span>
<el-form-item label="楼号:">
<span>规划B-3号楼</span>
</el-form-item>
</el-col>
<el-col :span="9">
@ -88,11 +88,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="楼号:">
<span>规划B-3号楼</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="物业类型:">
<span>住宅</span>
@ -108,6 +103,11 @@
<span>洋房</span>
</el-form-item>
</el-col>
<el-col :span="5">
<!-- <el-form-item label="楼号:">-->
<!-- <span>规划B-3号楼</span>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</el-form>
</div>
@ -116,7 +116,7 @@
<div class="page_content_head">
<div style="display: flex; justify-content: space-between">
<div class="page_content_head_left">
<div>上东汇业态列表</div>
<div>业态列表</div>
</div>
</div>
</div>

76
src/views/houseList/page/houseInfo.vue

@ -2,7 +2,7 @@
<div class="normal_page">
<div class="page_search">
<div class="page_content_head_left">
<div>上东汇楼盘基础信息</div>
<div>楼盘基础信息</div>
</div>
<div style="margin-top: 20px">
<el-form
@ -19,7 +19,7 @@
>
<el-col :span="5">
<el-form-item label="公告编号:">
<span>{{upInfo.annoId}}</span>
<span>{{land.landCode}}</span>
</el-form-item></el-col
>
<el-col :span="5">
@ -77,9 +77,9 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="经纬度:">
<span>{{land.lonLatBd}}</span>
</el-form-item>
<!-- <el-form-item label="经纬度:">-->
<!-- <span>{{land.lonLatBd}}</span>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</el-form>
@ -89,7 +89,7 @@
<div class="page_content_head">
<div style="display: flex; justify-content: space-between">
<div class="page_content_head_left">
<div>上东汇楼栋列表</div>
<div>楼栋列表</div>
</div>
</div>
</div>
@ -112,6 +112,21 @@
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="物业类型" width="200">
<template slot-scope="scope">
{{getDictVal(scope.row.propertyType,wuyeType)}}
</template>
</el-table-column>
<el-table-column label="大业态" width="150">
<template slot-scope="scope">
{{getDictVal(scope.row.largeFormat,Bigye)}}
</template>
</el-table-column>
<el-table-column label="业态" width="150">
<template slot-scope="scope">
{{getDictVal(scope.row.format,ye)}}
</template>
</el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" @click="info(scope.row)"
@ -317,25 +332,25 @@ export default {
cols: [
{
label: "楼栋号",
prop: "blockId",
prop: "blockName",
},
{
label: "预售许可证号/房产证号",
prop: "preSalePermitNo",
width:300
},
{
label: "物业类型",
prop: "totalConsArea",
},
{
label: "大业态",
prop: "buildingDensity",
},
{
label: "业态",
prop: "plotRatio",
},
// {
// label: "",
// prop: "totalConsArea",
// },
// {
// label: "",
// prop: "buildingDensity",
// },
// {
// label: "",
// prop: "plotRatio",
// },
],
ruleForm: {},
rules: {
@ -399,7 +414,10 @@ export default {
],
upInfo:{},
land:{},
searchForm:{}
searchForm:{},
wuyeType:[],
Bigye:[],
ye:[],
};
},
created() {},
@ -410,6 +428,15 @@ export default {
this.land=res.data.data.landListed;
this.onSubmit();
}).catch((e)=>{});
api.getDict('property_types').then(res=>{
this.wuyeType=res.data.data
})
api.getDict('format').then(res=>{
this.ye=res.data.data
})
api.getDict('largeFormat').then(res=>{
this.Bigye=res.data.data
})
},
computed: {},
watch: {
@ -439,6 +466,15 @@ export default {
console.log(data);
this.$router.push({path:"/houseList/page/detail",query:{id:data.housingEstateId,blockId:data.blockId}});
},
getDictVal(data,list) {
let name;
list.map((e)=>{
if (e.value==data){
name=e.label
}
})
return name
},
//
submitForm(formName) {
this.$refs[formName].validate((valid) => {

27
src/views/houseList/page/index.vue

@ -174,9 +174,9 @@
<el-button type="text" size="small" @click="info(2,scope.row)"
>楼栋信息</el-button
>
<el-button type="text" size="small" @click="handle(scope.row)"
> </el-button
>
<!-- <el-button type="text" size="small" @click="handle(scope.row)"-->
<!-- > </el-button-->
<!-- >-->
</template>
</el-table-column>
</el-table>
@ -456,12 +456,10 @@ export default {
{
label: "楼盘名称",
prop: "name",
width: 200,
},
{
label: "公告编号",
prop: "landCode",
width: 150,
},
// {
// label: "",
@ -475,32 +473,26 @@ export default {
{
label: "区域",
prop: "canton",
width: 150,
},
{
label: "大组团",
prop: "bigGroup",
width: 120,
},
{
label: "小组团",
prop: "smallGroup",
width: 120,
},
{
label: "操盘企业",
prop: "tradingEnterprises",
width: 120,
},
{
label: "合作商",
prop: "partner",
width: 120,
},
{
label: "开发企业",
prop: "conductEnterprise",
width: 120,
},
],
ruleForm: {},
@ -582,18 +574,18 @@ export default {
api.getDict('property_types').then(res=>{
this.wuyeType=res.data.data
})
api.getDict('format').then(res=>{
this.ye=res.data.data
})
api.getDict('largeFormat').then(res=>{
this.Bigye=res.data.data
})
api.getDict('big_group_type').then(res=>{
this.bigGroupList=res.data.data
})
api.getDict('small_group_type').then(res=>{
this.smallGroupList=res.data.data
})
api.getDict('format').then(res=>{
this.ye=res.data.data
})
api.getDict('largeFormat').then(res=>{
this.Bigye=res.data.data
})
},
mounted: function () {
this.onSubmit();
@ -657,6 +649,7 @@ export default {
this.dialogFormVisible = true;
this.dialogLoad=true;
api.houseById(item.housingEstateId).then(res=>{
console.log(res);
this.ruleForm = res.data.data.housingEstates;
this.dialogLoad=false;
}).catch((e)=>{this.dialogLoad=false;})

10
src/views/land/handLand/index.vue

@ -1024,8 +1024,8 @@ export default {
//
viewItem(row) {
let data=JSON.stringify(row)
this.$router.push({path:'/land/handLand/newLand',name:'编辑土地',params:{readOnly:'true',isEditOr:'false',data:data}});
let data=row.landListedId
this.$router.push({path:'/land/handLand/newLand',query:{readOnly:'true',isEditOr:'false',data:data}});
// this.dialogTitle = "";
// this.readOnly = true;
// this.dialogFormVisible = true;
@ -1037,8 +1037,8 @@ export default {
// this.dialogTitle = "";
// this.readOnly = false;
// this.dialogFormVisible = true;
let data=JSON.stringify(row)
this.$router.push({path:'/land/handLand/newLand',name:'编辑土地',params:{readOnly:'false',isEditOr:'true',data:data}});
let data=row.landListedId
this.$router.push({path:'/land/handLand/newLand',query:{readOnly:'false',isEditOr:'true',data:data}});
// this.editForm = row;
// this.onlyId = row.landListedId;
// this.queryLonLatList(row.landListedId);
@ -1099,7 +1099,7 @@ export default {
//
newItem() {
this.$router.push({path:'/land/handLand/newLand',name:'编辑土地',params:{readOnly:'false',isEditOr:'false',}});
this.$router.push({path:'/land/handLand/newLand',query:{readOnly:'false',isEditOr:'false',}});
// cols
// let newObj = {};
// for (let col of this.cols) {

325
src/views/land/handLand/newLand.vue

@ -29,13 +29,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地块位置:" prop="landPosition">
<el-form-item label="地块位置:" prop="landUsage">
<el-input v-model="editForm.landPosition"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="土地用途:" prop="landPosition">
<el-input v-model="editForm.landPosition"></el-input>
<el-input v-model="editForm.landUsage"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -150,12 +150,17 @@
<el-row>
<el-col :span="6">
<el-form-item label="商业面积:">
<el-input v-model="editForm.bizSpace"></el-input>
<el-input oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')" @change="calculate()" v-model="editForm.bizSpace"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商务面积:">
<el-input oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')" @change="calculate()" v-model="editForm.commerceSpace"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商务面积占比(%):">
<el-input v-model="editForm.fd"></el-input>
<el-input readonly v-model="editForm.bizCommerceRate"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -533,24 +538,14 @@
</template>
<el-row>
<el-col :span="6">
<el-form-item label="公告序号:">
<el-input v-model="editForm.annoId"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地块位置:">
<el-input v-model="editForm.landPosition"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="出让方式:">
<el-form-item label="是否成交:">
<el-select
v-model="editForm.transferMode"
v-model="editForm.deal"
placeholder="请选择"
style="width: 100%"
>
<el-option
v-for="item in transferModeList"
v-for="item in yesOrNo"
:key="item.value"
:label="item.label"
:value="item.value"
@ -559,58 +554,92 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="受让单位:">
<el-input v-model="editForm.assignee"></el-input>
</el-form-item>
</el-col>
</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="6">
<el-form-item label="成交价:">
<el-input v-model="editForm.dealPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="溢价率:">
<el-input v-model="editForm.premiumRate"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商业自持比例(%):">
<el-input v-model="editForm.commercialSelfRatio"></el-input>
</el-form-item>
</el-col>
</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-col :span="6">
<el-form-item label="无偿比例(%):">
<el-input v-model="editForm.percentUnpaid"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="人才公寓面积:">
<el-input v-model="editForm.talenApartmentArea"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="参拍企业:">
<el-input
v-model="editForm.participatingEnterprises"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6"></el-col>
<el-col :span="6"></el-col>
<el-col :span="6"></el-col>
</el-row>
<template v-if="editForm.deal=='1'">
<el-row>
<el-col :span="6">
<el-form-item label="公告序号:">
<el-input v-model="editForm.annoId"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地块位置:">
<el-input v-model="editForm.landPosition"></el-input>
</el-form-item>
</el-col>
<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>
</el-form-item>
</el-col>
</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="6">
<el-form-item label="成交价:">
<el-input v-model="editForm.dealPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="溢价率:">
<el-input v-model="editForm.premiumRate"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商业自持比例(%):">
<el-input v-model="editForm.commercialSelfRatio"></el-input>
</el-form-item>
</el-col>
</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-col :span="6">
<el-form-item label="无偿比例(%):">
<el-input v-model="editForm.percentUnpaid"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="人才公寓面积:">
<el-input v-model="editForm.talenApartmentArea"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="参拍企业:">
<el-input
v-model="editForm.participatingEnterprises"
></el-input>
</el-form-item>
</el-col>
</el-row>
</template>
<el-row>
<el-col :span="8"> </el-col>
<el-col :span="8"> </el-col>
@ -829,13 +858,27 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="线条颜色" width="80">
<el-table-column label="线条颜色" width="110">
<template scope="scope">
<el-color-picker
<!-- <el-color-picker-->
<!-- v-model="scope.row.lineColor"-->
<!-- :disabled="!scope.row.edit"-->
<!-- size="small"-->
<!-- ></el-color-picker>-->
<el-select
v-model="scope.row.lineColor"
placeholder="请选择"
style="width: 100%"
:disabled="!scope.row.edit"
size="small"
></el-color-picker>
>
<el-option
v-for="item in colorList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="线条不透明度" width="110">
@ -850,13 +893,22 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="填充颜色" width="80">
<el-table-column label="填充颜色" width="110">
<template scope="scope">
<el-color-picker
<el-select
v-model="scope.row.fillColor"
placeholder="请选择"
style="width: 100%"
:disabled="!scope.row.edit"
size="small"
></el-color-picker>
>
<el-option
v-for="item in colorList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
@ -1137,9 +1189,6 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload></el-tab-pane
>
<el-tab-pane label="红线图" name="redLineMap">
@ -1150,16 +1199,24 @@
:http-request="uploadFile"
multiple
>
<i class="el-icon-plus"></i>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="控规图" name="controlChart">
<el-upload
class="upload-demo"
drag
action
list-type="picture-card"
:http-request="uploadFile"
multiple
>
<i class="el-icon-plus"></i>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="竞买须知" name="biddingNotice">
@ -1174,9 +1231,6 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="出让合同模板" name="transferContractTemplate">
@ -1191,10 +1245,8 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload></el-tab-pane
</el-upload>
</el-tab-pane
>
<el-tab-pane label="建设方案" name="developmentScheme">
<el-upload
@ -1208,35 +1260,38 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="航拍图片" name="aerialPhoto"
><el-upload
action
list-type="picture-card"
:http-request="uploadFile"
>
<i class="el-icon-plus"></i> </el-upload
></el-tab-pane>
<el-upload
class="upload-demo"
drag
action
:http-request="uploadFile"
multiple
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="其他资料" name="otherInfo"
><el-upload
class="upload-demo"
drag
action
:http-request="uploadFile"
multiple
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload></el-tab-pane
<el-upload
class="upload-demo"
drag
action
:http-request="uploadFile"
multiple
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
</el-upload>
</el-tab-pane
>
</el-tabs>
<el-table :data="uploadFiles" border style="width: 100%">
@ -1319,7 +1374,8 @@
delConstructionPlan,
importLand,
importLonLat,
saveLandMulti
saveLandMulti,
queryHandLandObj
} from "@/views/land/api/land";
import { uploadFile } from "@/views/api/api";
import { downUrlFile } from "@/util/file";
@ -1711,7 +1767,8 @@
//
landRecord: [],
yesOrNo:[],
planTypeList:[]
planTypeList:[],
colorList:[]
};
},
created() {
@ -1745,27 +1802,36 @@
getDict("planType").then((res) => {
this.planTypeList = res.data.data;
});
getDict("color").then((res) => {
this.colorList = res.data.data;
});
let newObj = {};
for (let col of this.cols) {
newObj[col.prop] = "";
}
this.editForm = newObj;
// console.log(this.$route);
if (this.$route.params.readOnly==='true'){
if (this.$route.query.readOnly==='true'){
this.readOnly = true;
let row=JSON.parse(this.$route.params.data)
this.editForm = row;
let row=this.$route.query.data;
this.onlyId = row;
// this.editForm = row;
queryHandLandObj(row).then(res=>{
this.editForm = res.data.data;
})
}else {
this.readOnly = false;
}
if (this.$route.params.isEditOr==='true'){
let row=JSON.parse(this.$route.params.data)
this.editForm = row;
this.onlyId = row.landListedId;
this.queryLonLatList(row.landListedId);
this.queryRecordList(row.landListedId);
this.conductenterList(row.landListedId);
this.getPlanList(row.landListedId);
if (this.$route.query.isEditOr==='true'){
let row=this.$route.query.data
this.onlyId = row;
queryHandLandObj(row).then(res=>{
this.editForm = res.data.data;
})
this.queryLonLatList(row);
this.queryRecordList(row);
this.conductenterList(row);
this.getPlanList(row);
this.queryFileList();
}
},
@ -1778,6 +1844,11 @@
txt='';
return txt;
},
calculate(){
if (this.editForm.bizSpace&&this.editForm.commerceSpace&&this.editForm.commerceSpace!=0){
this.editForm.bizCommerceRate=parseFloat(this.editForm.bizSpace/this.editForm.commerceSpace)
}
},
getList(page, params) {
this.tableLoading = true;
fetchHandLandList(
@ -2060,7 +2131,7 @@
//
saveAllData() {
let type='';
this.$route.params.isEditOr==='true'?type='put':type='post';
this.$route.query.isEditOr==='true'?type='put':type='post';
saveHandLandList(JSON.stringify(this.editForm),type).then((res) => {
if (res.data.success) {
this.$message({
@ -2577,7 +2648,7 @@
return;
}
let type='';
this.$route.params.isEditOr==='true'?type='put':type='post';
this.$route.query.isEditOr==='true'?type='put':type='post';
saveHandLandList(JSON.stringify(this.editForm),type).then((res) => {
if (res.data.success) {
this.$message({

10
src/views/land/noneHandLand/index.vue

@ -916,8 +916,8 @@ export default {
//
viewItem(row) {
let data=JSON.stringify(row)
this.$router.push({path:'/land/noneHandLand/newLand',name:'编辑土地拟',params:{readOnly:'true',isEditOr:'false',data:data}});
let data=row.proposedseriaId
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'true',isEditOr:'false',data:data}});
// this.dialogTitle = "";
// this.readOnly = true;
// this.dialogFormVisible = true;
@ -926,8 +926,8 @@ export default {
//
editItem(row) {
let data=JSON.stringify(row)
this.$router.push({path:'/land/noneHandLand/newLand',name:'编辑土地拟',params:{readOnly:'false',isEditOr:'true',data:data}});
let data=row.proposedseriaId
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'false',isEditOr:'true',data:data}});
// this.dialogTitle = "";
// this.readOnly = false;
// this.dialogFormVisible = true;
@ -962,7 +962,7 @@ export default {
//
newItem() {
this.$router.push({path:'/land/noneHandLand/newLand',name:'编辑土地拟',params:{readOnly:'false',isEditOr:'false',}});
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'false',isEditOr:'false',}});
// cols
// let newObj = {};
// for (let col of this.cols) {

328
src/views/land/noneHandLand/newLand.vue

@ -170,7 +170,7 @@
type="date"
placeholder="选择公告日期"
v-model="editForm.annoDate"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@ -181,7 +181,7 @@
type="date"
placeholder="选择拍卖日期"
v-model="editForm.auctionDate"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@ -212,18 +212,18 @@
<el-row>
<el-col :span="8">
<el-form-item label="商业面积:">
<el-input v-model="editForm.bizSpace"></el-input>
<el-input oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')" @change="calculate()" v-model="editForm.bizSpace"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="商务面积占比(%):">
<el-input v-model="editForm.fd"></el-input>
<el-form-item label="商务面积:">
<el-input oninput="value=value.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')" @change="calculate()" v-model="editForm.commerceSpace"></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-form-item label="商务面积占比(%):">
<el-input readonly v-model="editForm.bizCommerceRate"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -596,76 +596,76 @@
<span class="ti-tag">{{ setTagName(7) }}</span>
</div>
</template>
<el-row>
<el-col :span="8">
<el-form-item label="公告序号:">
<el-input v-model="editForm.annoId"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="地块位置:">
<el-input v-model="editForm.landPosition"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出让方式:">
<el-input v-model="editForm.transferMode"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="受让单位:">
<el-input v-model="editForm.assignee"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="拿地企业-简称:">
<el-input v-model="editForm.landEnterpriseShort"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<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-form-item label="溢价率:">
<el-input v-model="editForm.premiumRate"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="商业自持比例(%):">
<el-input v-model="editForm.commercialSelfRatio"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<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-form-item label="无偿比例(%):">
<el-input v-model="editForm.percentUnpaid"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="人才公寓面积:">
<el-input v-model="editForm.talenApartmentArea"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参拍企业:">
<el-input
v-model="editForm.participatingEnterprises"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="公告序号:">
<el-input v-model="editForm.annoId"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="地块位置:">
<el-input v-model="editForm.landPosition"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出让方式:">
<el-input v-model="editForm.transferMode"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="受让单位:">
<el-input v-model="editForm.assignee"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="拿地企业-简称:">
<el-input v-model="editForm.landEnterpriseShort"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<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-form-item label="溢价率:">
<el-input v-model="editForm.premiumRate"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="商业自持比例(%):">
<el-input v-model="editForm.commercialSelfRatio"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<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-form-item label="无偿比例(%):">
<el-input v-model="editForm.percentUnpaid"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="人才公寓面积:">
<el-input v-model="editForm.talenApartmentArea"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参拍企业:">
<el-input
v-model="editForm.participatingEnterprises"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8"> </el-col>
<el-col :span="8"> </el-col>
@ -799,7 +799,13 @@
<el-row>
<el-col :span="8">
<el-form-item label="确权时间:">
<el-input v-model="editForm.confirmationTime"></el-input>
<el-date-picker
type="date"
placeholder="选择确权时间"
v-model="editForm.confirmationTime"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
@ -821,7 +827,13 @@
</el-col>
<el-col :span="8">
<el-form-item label="项目首开时间:">
<el-input v-model="editForm.firstOpenTime"></el-input>
<el-date-picker
type="date"
placeholder="选择项目首开时间"
v-model="editForm.firstOpenTime"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" style="text-align: right">
@ -875,13 +887,27 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="线条颜色" width="80">
<el-table-column label="线条颜色" width="110">
<template scope="scope">
<el-color-picker
<!-- <el-color-picker-->
<!-- v-model="scope.row.lineColor"-->
<!-- :disabled="!scope.row.edit"-->
<!-- size="small"-->
<!-- ></el-color-picker>-->
<el-select
v-model="scope.row.lineColor"
placeholder="请选择"
style="width: 100%"
:disabled="!scope.row.edit"
size="small"
></el-color-picker>
>
<el-option
v-for="item in colorList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="线条不透明度" width="110">
@ -896,13 +922,27 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="填充颜色" width="80">
<el-table-column label="填充颜色" width="110">
<template scope="scope">
<el-color-picker
<!-- <el-color-picker-->
<!-- v-model="scope.row.fillColor"-->
<!-- :disabled="!scope.row.edit"-->
<!-- size="small"-->
<!-- ></el-color-picker>-->
<el-select
v-model="scope.row.fillColor"
placeholder="请选择"
style="width: 100%"
:disabled="!scope.row.edit"
size="small"
></el-color-picker>
>
<el-option
v-for="item in colorList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
@ -994,10 +1034,8 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload></el-tab-pane
</el-upload>
</el-tab-pane
>
<el-tab-pane label="红线图" name="redLineMap">
<el-upload
@ -1011,18 +1049,20 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="控规图" name="controlChart">
<el-upload
class="upload-demo"
drag
action
list-type="picture-card"
:http-request="uploadFile"
multiple
>
<i class="el-icon-plus"></i>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="竞买须知" name="biddingNotice">
@ -1037,9 +1077,6 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="出让合同模板" name="transferContractTemplate">
@ -1054,10 +1091,8 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload></el-tab-pane
</el-upload>
</el-tab-pane
>
<el-tab-pane label="建设方案" name="developmentScheme">
<el-upload
@ -1071,35 +1106,38 @@
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="航拍图片" name="aerialPhoto"
><el-upload
action
list-type="picture-card"
:http-request="uploadFile"
>
<i class="el-icon-plus"></i> </el-upload
></el-tab-pane>
<el-upload
class="upload-demo"
drag
action
:http-request="uploadFile"
multiple
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="其他资料" name="otherInfo"
><el-upload
class="upload-demo"
drag
action
:http-request="uploadFile"
multiple
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload></el-tab-pane
<el-upload
class="upload-demo"
drag
action
:http-request="uploadFile"
multiple
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
</el-upload>
</el-tab-pane
>
</el-tabs>
<el-table :data="uploadFiles" border style="width: 100%">
@ -1177,6 +1215,7 @@
addConstructionPlan,
updateConstructionPlan,
delConstructionPlan,
queryNoHandLandObj
} from "@/views/land/api/noLand";
import { uploadFile } from "@/views/api/api";
import { downUrlFile } from "@/util/file";
@ -1594,6 +1633,7 @@
planEdit:false,
companyList:[],
constructionPlanList:[],
colorList:[]
};
},
created() {
@ -1627,26 +1667,33 @@
getDict("planType").then((res) => {
this.planTypeList = res.data.data;
});
getDict("color").then((res) => {
this.colorList = res.data.data;
});
let newObj = {};
for (let col of this.cols) {
newObj[col.prop] = "";
}
this.editForm = newObj;
if (this.$route.params.readOnly==='true'){
if (this.$route.query.readOnly==='true'){
this.readOnly = true;
let row=JSON.parse(this.$route.params.data)
this.editForm = row;
let row=this.$route.query.data;
this.onlyId = row;
queryNoHandLandObj(row).then(res=>{
this.editForm = res.data.data;
})
}else {
this.readOnly = false;
}
if (this.$route.params.isEditOr==='true'){
let row=JSON.parse(this.$route.params.data)
console.log(row);
this.editForm = row;
this.onlyId = row.proposedseriaId;
this.queryLonLatList(row.proposedseriaId);
this.conductenterList(row.proposedseriaId);
this.getPlanList(row.proposedseriaId);
if (this.$route.query.isEditOr==='true'){
let row=this.$route.query.data
this.onlyId = row;
queryNoHandLandObj(row).then(res=>{
this.editForm = res.data.data;
})
this.queryLonLatList(row);
this.conductenterList(row);
this.getPlanList(row);
this.queryFileList();
}
},
@ -1704,6 +1751,11 @@
txt='';
return txt;
},
calculate(){
if (this.editForm.bizSpace&&this.editForm.commerceSpace&&this.editForm.commerceSpace!=0){
this.editForm.bizCommerceRate=parseFloat(this.editForm.bizSpace/this.editForm.commerceSpace)
}
},
getList(page, params) {
this.tableLoading = true;
console.debug(params);

71
src/views/message/editMessage.vue

@ -1,17 +1,41 @@
<template>
<div class="edit_container" v-loading="loading">
<div class="btn">
<el-input
style="width: 200px;margin-right: 10px;"
v-model="messageTitle"
placeholder="请输入消息标题"
></el-input>
<el-button @click="save" type="primary"
>保存</el-button
>
<el-button @click="back"
>返回</el-button
>
<div>
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="标题:" style="margin-right: 20px;">
<el-input
v-model="searchForm.messageTitle"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="消息类型:">
<el-select
style="width: 100%"
v-model="searchForm.messageType"
filterable
allow-create
placeholder="请选择"
>
<el-option
v-for="item in typeList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<div>
<el-button @click="save" type="primary"
>保存</el-button
>
<el-button @click="back"
>返回</el-button
>
</div>
</div>
<!-- 新增时输入 -->
<quill-editor
@ -30,18 +54,25 @@
import 'quill/dist/quill.core.css';
import 'quill/dist/quill.snow.css';
import 'quill/dist/quill.bubble.css';
import * as api from "../houseList/api";
export default {
components: {
quillEditor
},
data() {
return {
searchForm: {
//
messageTitle: "",
messageType:'',
},
loading:false,
content: ``,
messageTitle:'',
str: '',
isEdit:false,
myHtml:'',
typeList:[],
editorOption: {
placeholder: "请在这里输入",
modules:{
@ -70,7 +101,8 @@
getMessage(this.$route.query.data).then(res=>{
this.content=res.data.data.messageContent
this.myHtml=res.data.data.messageContent;
this.messageTitle=res.data.data.messageTitle;
this.searchForm.messageTitle=res.data.data.messageTitle;
this.searchForm.messageType=res.data.data.messageType;
this.id=res.data.data.messageId;
this.loading=false;
// this.escapeStringHTML(this.content)
@ -95,13 +127,18 @@
window.history.back()
},
save(){
if (!this.messageTitle){
if (!this.searchForm.messageTitle){
this.$message.error("请先输入消息标题");
return false
}
if (!this.searchForm.messageType){
this.$message.error("请先选择消息类型");
return false
}
let data={
messageTitle:this.messageTitle,
messageTitle:this.searchForm.messageTitle,
messageContent:this.myHtml,
messageType:this.searchForm.messageType
}
if (this.isEdit){
this.$set(data,'messageId',this.id)
@ -137,7 +174,9 @@
},
},
mounted() {
api.getDict('message_type').then(res=>{
this.typeList=res.data.data
})
}
}
</script>
@ -149,7 +188,7 @@
height: 80px;
display: flex;
align-items: center;
justify-content: flex-end;
justify-content: space-between;
padding: 0 30px;
border-top: 1px solid #ccc;
background-color: white;

44
src/views/message/index.vue

@ -9,12 +9,24 @@
placeholder="请输入"
></el-input>
</el-form-item>
<!-- <el-form-item label="内容:">-->
<!-- <el-input-->
<!-- v-model="searchForm.messageContent"-->
<!-- placeholder="请输入"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="消息类型:">
<el-select
style="width: 100%"
v-model="searchForm.messageType"
filterable
clearable
allow-create
placeholder="请选择"
>
<el-option
v-for="item in typeList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
@ -56,6 +68,11 @@
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="消息类型" width="150">
<template slot-scope="scope">
{{getDictVal(scope.row.messageType,typeList)}}
</template>
</el-table-column>
<el-table-column label="内容" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{escapeStringHTML(scope.row.messageContent)}}</span>
@ -97,6 +114,7 @@
<script>
import {editMessage, messageList,deleteMessage} from "./api/api";
import * as api from "../houseList/api";
export default {
name: "BigData",
@ -105,6 +123,7 @@
searchForm: {
//
messageContent: "",
messageType:'',
//
landCode: "",
},
@ -142,6 +161,7 @@
dialogTitle: "新增数据",
// Form
editForm: {},
typeList:[]
};
},
methods: {
@ -176,6 +196,15 @@
return str;
}
},
getDictVal(data,list) {
let name;
list.map((e)=>{
if (e.value==data){
name=e.label
}
})
return name
},
handleSizeChange(val) {
this.page.pageSize = val;
this.onSubmit()
@ -238,6 +267,9 @@
},
mounted() {
this.onSubmit();
api.getDict('message_type').then(res=>{
this.typeList=res.data.data
})
},
};
</script>

Loading…
Cancel
Save