Skip to content

Z
zh-baseversion-project
Commit 0082962d authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

parents 173c7729 352aa61b
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 32 deletions
zh-baseversion-system/src/main/java/com/zehong/system/domain/TConGasProInfor.java
View file @ 0082962d
......@@ -27,7 +27,7 @@ public class TConGasProInfor extends BaseEntity
/** 外部工程编码，工程项目在市级平台或燃气企业系统中的自有编号 */
@Excel(name = "外部工程编码")
private Long fProjectNo;
private String fProjectNo;
/** 施工工程项目名称 */
@Excel(name = "施工工程项目名称")
......@@ -221,12 +221,12 @@ public class TConGasProInfor extends BaseEntity
{
return fProjectCode;
}
public void setfProjectNo(Long fProjectNo)
public void setfProjectNo(String fProjectNo)
{
this.fProjectNo = fProjectNo;
}
public Long getfProjectNo()
public String getfProjectNo()
{
return fProjectNo;
}
......
zh-baseversion-web/src/views/thirdbuild/project/components/DetailInfo.vue
View file @ 0082962d
......@@ -2,6 +2,13 @@
<el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form label-width="180px">
<el-row class="el-row-table">
<el-col :span="12">
<el-form-item label="燃气企业" prop="fEnterpriseId">
<span>{{ enterpriseName }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目编码">
<span v-if="detailInfo.fProjectCode">{{ detailInfo.fProjectCode }}</span>
......@@ -45,7 +52,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="所属县级行政区ID">
<el-form-item label="所属县级行政区">
<span v-if="detailInfo.fDistrictId">{{ detailInfo.fDistrictId }}</span>
<span v-else>-</span>
</el-form-item>
......@@ -57,14 +64,6 @@
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="村级行政区">
<span v-if="detailInfo.fVillageId">{{ detailInfo.fVillageId }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="管道压力等级分类">
<span v-if="detailInfo.fPipePress">{{ $parent.fPipePressFormat(detailInfo) }}</span>
......@@ -179,14 +178,6 @@
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="燃气企业编码">
<span v-if="detailInfo.fCompanyInfoId">{{ detailInfo.fCompanyInfoId }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="施工点位巡线员编码">
<span v-if="detailInfo.fPatrolSafetyOfficerNo">{{ detailInfo.fPatrolSafetyOfficerNo }}</span>
......@@ -266,15 +257,33 @@
<script>
import { getInfor } from "@/api/thirdbuild/project";
import { enterpriseLists } from "@/api/regulation/info";
export default {
name: "detail-info",
data(){
return{
enterpriseName:"",
detailInfo: {},
detailOpen: false
}
},
created() {
this.getEnterpriseLists();
},
methods:{
//所属单位
getEnterpriseLists(){
const param = {};
enterpriseLists(param).then(response => {
if (response.rows.length>1){
this.enterprises = response.rows;
this.enterpriseName = response.rows[0].enterpriseName;
}else {
this.enterprises = response.rows;
this.enterpriseName = response.rows[0].enterpriseName;
}
});
},
getDetailInfo(id){
getInfor(id).then(res =>{
if(res.code == 200 && res.data){
......
zh-baseversion-web/src/views/thirdbuild/project/index.vue
View file @ 0082962d
......@@ -90,7 +90,7 @@
<el-table-column label="施工工程项目名称" align="center" prop="fProjectName" />
<el-table-column label="开工时间" align="center" prop="fConstructionStart" />
<el-table-column label="计划竣工时间" align="center" prop="fConstructionEnd" />
<el-table-column label="所属县级行政区ID" align="center" prop="fDistrictId" />
<el-table-column label="所属县级行政区" align="center" prop="fDistrictId" :formatter="beyondCountyFormat"/>
<el-table-column label="涉气施工点位位置属性" align="center" prop="fConstructionPointType" >
<template slot-scope="scope">
<span v-if="scope.row.fConstructionPointType == '1'">城镇</span>
......@@ -143,6 +143,11 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="180px">
<el-row class="el-row-table">
<el-col :span="12">
<el-form-item label="燃气企业" prop="fEnterpriseId">
<el-input v-model="enterpriseName" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="外部工程编码" prop="fProjectNo">
<el-input v-model="form.fProjectNo" placeholder="请输入外部工程编码" />
......@@ -186,11 +191,22 @@
</el-col>
<el-col :span="12">
<el-form-item label="所属县级行政区ID" prop="fDistrictId">
<el-input type="Number" v-model="form.fDistrictId" placeholder="请输入所属县级行政区ID" />
<el-form-item label="所属县级行政区" prop="fDistrictId">
<el-select
v-model="form.fDistrictId"
placeholder="请选择县级行政区"
style="width: 100%"
>
<el-option
v-for="county in countyInfo"
:key="county.fId"
:label="county.fName.trim()"
:value="county.fId"
/>
</el-select>
<!-- <el-input type="Number" v-model="form.fDistrictId" placeholder="请输入所属县级行政区" /> -->
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="经纬度坐标" prop="fConstructionLongitude">
<el-col :span="9">
......@@ -214,11 +230,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="村级行政区" prop="fVillageId">
<el-input v-model="form.fVillageId" placeholder="请输入村级行政区" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="管道压力等级分类" prop="fPipePress">
......@@ -361,11 +377,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="燃气企业编码" prop="fCompanyInfoId">
<el-input v-model="form.fCompanyInfoId" placeholder="请输入燃气企业编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="施工点位巡线员编码" prop="fPatrolSafetyOfficerNo">
......@@ -474,6 +485,8 @@ import { listInfor, getInfor, delInfor, addInfor, updateInfor, exportInfor, repo
import GetPos from '@/components/GetPos';
import{getInfo} from "@/api/login"
import DetailInfo from "./components/DetailInfo";
import { enterpriseLists } from "@/api/regulation/info";
import { getDefaultCountyList } from "@/api/area/county";
export default {
name: "Infor",
components: {
......@@ -482,7 +495,9 @@ export default {
},
data() {
return {
enterpriseName:"",
user:{},
countyInfo: [],
// 遮罩层
loading: true,
// 导出遮罩层
......@@ -538,7 +553,7 @@ export default {
{ required: true, message: "项目位置描述不能为空", trigger: "blur" }
],
fDistrictId: [
{ required: true, message: "所属县级行政区ID不能为空", trigger: "blur" }
{ required: true, message: "所属县级行政区不能为空", trigger: "blur" }
],
fPipePress: [
{ required: true, message: "管道压力等级分类", trigger: "change" }
......@@ -563,11 +578,40 @@ export default {
created() {
this.getuserInfo();
this.getList();
this.getCountyInfo();
this.getEnterpriseLists();
this.getDicts("t_pipe_press").then(response => {
this.fPipePressOptions = response.data;
});
},
methods: {
//所属单位
getEnterpriseLists(){
const param = {};
enterpriseLists(param).then(response => {
if (response.rows.length>1){
this.enterprises = response.rows;
this.form.fEnterpriseId=response.rows[0].enterpriseId;
this.enterpriseName = response.rows[0].enterpriseName;
}else {
this.enterprises = response.rows;
this.form.fEnterpriseId=response.rows[0].enterpriseId;
this.enterpriseName = response.rows[0].enterpriseName;
}
});
},
//获取县级
getCountyInfo(){
getDefaultCountyList().then(res =>{
if(res.code == 200 && res.data){
this.countyInfo = res.data;
}
})
},
beyondCountyFormat(row){
let info = this.countyInfo.find(item => item.fId == row.fDistrictId);
return info?info.fName:"-";
},
/** 查询涉气第三方施工项目档案列表 */
getList() {
this.loading = true;
......@@ -654,6 +698,8 @@ export default {
this.reset();
this.open = true;
this.title = "添加涉气第三方施工项目档案";
this.formData.operator_id = this.operatorLists[0].id
},
/** 修改按钮操作 */
handleUpdate(row) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment