-
+
-
+
-
+
-
-
-
+
+
+
+
+
{{ item.enterpriseName }}
{{ $t('message.laborMange.unifiedSocialCreditCode') }}：{{
@@ -145,6 +115,9 @@
$t('message.projectInfo.projectLeaderPhone') + ':'
}}{{ item.projectDirectorPhone }}
+
+ 项目类型:{{ item.projectEnterprise }}
+
-
+
{{
$t('message.laborMange.edit')
}}
- 
-
- 
+
+
+
{{
$t('message.laborMange.delete')
}}
-
+
@@ -191,298 +160,154 @@
{{ $t('message.laborMange.noData') }}
-
+
-
-
+
-
-
+
-
-
-
+
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
-
+
+
@@ -490,85 +315,45 @@
-
-
-
+
+
+
-
-
+
-
+
- {{ $t('message.laborDev.whetherList')[0] }}
+ {{ $t('message.laborDev.whetherList')[0]
+ }}
- {{ $t('message.laborDev.whetherList')[1] }}
+ {{ $t('message.laborDev.whetherList')[1]
+ }}
-
-
+
+
{{
$t('message.laborMange.clickOnTheUpload')
}}
@@ -577,19 +362,11 @@
-
+
{{
$t('message.laborMange.clickOnTheUpload')
}}
@@ -597,90 +374,211 @@
+
+ 承包商项目基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t(
+ 'message.companyDiagram.dialog_ProjectPop_up.coordinatePicking'
+ )
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t('message.laborMange.clickOnTheUpload')
+ }}
+
+
+
+
+
+
+ {{
+ $t('message.laborMange.clickOnTheUpload')
+ }}
+
+
+
+
+
+
+
+
+
+
- {{ $t('message.cooperationUnit.back') }}
+ {{
+ $t('message.cooperationUnit.back') }}
-
+
+
+
{{ $t('message.cooperationUnit.companyDetails') }}
@@ -700,22 +598,26 @@ import {
import {
getCooperatorListApi,
deleteBatchApi,
+ getEnterpriseInfoByIdApi
} from '@/assets/js/api/cooperationUnit'
+import {
+ getDictionaryItemApi
+} from '@/assets/js/api/companyDiagram'
import {
CheckSocialCreditCode,
checkPhone
} from '@/assets/js/util.js'
-
+import gdMap from "../../../components/map/gd-map";
export default {
components: {
- Detail,
+ Detail, gdMap
},
data() {
return {
checkedId: "",
- companyTypeId:"",
- companyTypeList:[],
- enterpriseTypeSelectId:"",
+ companyTypeId: "",
+ companyTypeList: [],
+ enterpriseTypeSelectId: "",
enterpriseTypeId: '',
enterpriseTypeName: '',
projectSn: '',
@@ -727,6 +629,32 @@ export default {
addEnterpriseDialog: false,
enterpriseDialogTitle: this.$t('message.laborMange.theNewEnterprise'),
enterpriseDialogType: 1,
+ addProjectForm: {
+ areaCode: "",
+ buildingNum: "",
+ bulidStatus: "",
+ cityCode: "",
+ companySn: "",
+ constructionStage: "",
+ engineeringPurpose: "",
+ households: "",
+ latitude: "",
+ layoutImage: "",
+ constructionMapUrl: '',
+ longitude: "",
+ projectAcreage: "",
+ projectAddress: "",
+ projectName: "",
+ projectNumber: "",
+ projectType: "",
+ provincesCode: "",
+ saleAcreage: "",
+ startWorkDate: "",
+ structureType: "",
+ projectManage: "",
+ projectTel: "",
+ majorProjectType: 0
+ },
//新增企业表单
enterpriseForm: {
bankcardnumber: '', //银行卡号
@@ -754,7 +682,35 @@ export default {
parentEnterpriseId: '',
departmentType: '', // 企业管理
sortNum: 0,
+
+ projectEnterprise: {
+ cbsName: "", // 承包商名称
+ projectBuildArea: "", // 项目施工区域
+ completionDate: "", // 竣工日期
+ cbsProjectType: "", // 项目类型
+ projectManage: "", // 项目经理
+ latitude: "", // 维度位置
+ longitude: "", // 经度位置
+ projectType: "", // 工程类别
+ projectNumber: "", // 项目编号
+ structureType: "", // 结构类型
+ projectAcreage: "", // 项目面积(m²)
+ bulidStatus: "", // 工程状态
+ startWorkDate: "", // 开工日期
+ constructionStage: "", // 施工阶段
+ layoutImage: "", // 现场布置图
+ constructionMapUrl: "", // 现场施工图
+ projectTel: "", // 联系电话
+ }
+
},
+ layoutImageList: [], // 现场布置图
+ constructionMapUrlList: [], // 现场施工图
+ dictionaryItemList: [],
+ structureTypeList: [],
+ dictionaryItemId:"",
+ constructionStageList: [],
+ projectTypeList: [],
//校验新增企业表单
enterpriseFormRules: this.$t('message.laborMange.enterpriseFormRules'),
enterpriseTypeList: [],
@@ -767,7 +723,7 @@ export default {
noDataList: false,
detailId: '',
projectEnterpriseId: '',
- enterpriseSn:"",
+ enterpriseSn: "",
pageType: 1, //1项目，2企业
moveEnterpriseDialog: false,
enterpriseType: '',
@@ -776,6 +732,7 @@ export default {
{ id: 1, name: '是' },
{ id: 2, name: '否' },
],
+ showMap: false,
}
},
created() {
@@ -791,15 +748,70 @@ export default {
this.projectSn = this.$store.state.projectSn
this.pageType = 1
}
-
+ this.getDictionaryItem();
this.getEnterpriseType()
this.getParentEnterpriseList()
+ this.getDictionaryList();
+ this.getDictionaryByStructure();
+ this.getDicProjectTypeList();
},
methods: {
+ //获取经纬度
+ toGetLocalFn() {
+ console.log(11111);
+ this.showMap = true;
+ // window.open("https://lbs.amap.com/console/show/picker");
+ },
+ closeMap(val) {
+ this.showMap = val;
+ },
+ getLngLat(v) {
+ this.showMap = false;
+ this.addProjectForm.longitude = v.lng;
+ this.addProjectForm.latitude = v.lat;
+ this.enterpriseForm.projectEnterprise.longitude = v.lng;
+ this.enterpriseForm.projectEnterprise.latitude = v.lat;
+ },
+ // 获取字典工程类别列表
+ // 获取字典工程类别列表
+ getDicProjectTypeList() {
+ getDictionaryItemApi({
+ dictionaryEncoding: 'project_type',
+ projectSn: this.projectSn
+ }).then(res => {
+ if (res.result.length > 0) {
+ this.projectTypeList = res.result
+ }
+ })
+ },
+ //获取字典施工阶段
+ getDictionaryList() {
+ getDictionaryItemApi({
+ dictionaryEncoding: 'project_construction_stage',
+ projectSn: this.projectSn
+ }).then(res => {
+ if (res.result.length > 0) {
+ this.constructionStageList = res.result
+ }
+
+ })
+ },
+ //获取字典 结构类型
+ getDictionaryByStructure() {
+ getDictionaryItemApi({
+ dictionaryEncoding: 'project_structure_type',
+ projectSn: this.projectSn
+ }).then(res => {
+ if (res.result.length > 0) {
+ this.structureTypeList = res.result
+ }
+
+ })
+ },
checkValue() {
var value = '' + this.enterpriseForm.registeredCapital.toString();
const maxConut = 999999999999999;
- if(Number(this.enterpriseForm.registeredCapital) > maxConut){
+ if (Number(this.enterpriseForm.registeredCapital) > maxConut) {
this.enterpriseForm.registeredCapital = maxConut.toFixed(2);
return
}
@@ -818,7 +830,7 @@ export default {
}
value = Number(value).toFixed(2); //不足补位
- console.log('1111111111111',value);
+ console.log('1111111111111', value);
this.enterpriseForm.registeredCapital = value;
},
@@ -829,6 +841,17 @@ export default {
this.$refs['enterpriseForm'].clearValidate()
})
},
+ getDictionaryItem() {
+ getDictionaryItemApi({
+ dictionaryEncoding: "project_enterprise_cbs_project_type",
+ projectSn: this.$store.state.projectSn,
+ }).then((res) => {
+ if (res.code == 200) {
+ console.log('11111111111', res);
+ this.dictionaryItemList = res.result;
+ }
+ })
+ },
//获取 单位类型
getEnterpriseType() {
let data = {}
@@ -837,19 +860,19 @@ export default {
console.log('获取企业类型列表', res)
this.enterpriseTypeList = [{
id: "",
- companyTypeName:"全部",
- },...res.result];
+ companyTypeName: "全部",
+ }, ...res.result];
// this.enterpriseTypeId = res.result[0].id
// console.log('==========单位名称', res)
// this.enterpriseTypeName = res.result[0].companyTypeName
// this.enterpriseForm.companyTypeName = res.result[0].companyTypeName
-
+
console.log('==========单位名称', res)
this.enterpriseTypeSelectId = this.enterpriseTypeList[0].id;
this.enterpriseTypeName = this.enterpriseTypeList[0].companyTypeName;
this.enterpriseTypeId = res.result[0].id;
this.enterpriseForm.companyTypeName = res.result[0].companyTypeName;
-
+
this.companyTypeList = res.result;
console.log(this.enterpriseTypeList)
this.getCooperatorList()
@@ -864,6 +887,7 @@ export default {
pageSize: this.pageSize,
enterpriseTypeId: this.enterpriseTypeSelectId,
enterpriseName: this.enterpriseName,
+ dictionaryItemId:this.dictionaryItemId
}
getCooperatorListApi(data).then((res) => {
if (res.code == 200) {
@@ -906,7 +930,7 @@ export default {
this.checkedId = value.id
this.enterpriseTypeName = value.companyTypeName;
this.enterpriseTypeSelectId = value.id;
- if(!(value.id == '' && value.companyTypeName == '全部')){
+ if (!(value.id == '' && value.companyTypeName == '全部')) {
this.enterpriseTypeId = value.id
this.enterpriseForm.companyTypeName = value.companyTypeName
}
@@ -939,10 +963,31 @@ export default {
parentEnterpriseId: '', //父级企业
departmentType: '', // 企业管理
sortNum: 0,
+
+ projectEnterprise: {
+ cbsName: "", // 承包商名称
+ projectBuildArea: "", // 项目施工区域
+ completionDate: "", // 竣工日期
+ cbsProjectType: "", // 项目类型
+ projectManage: "", // 项目经理
+ latitude: "", // 维度位置
+ longitude: "", // 经度位置
+ projectType: "", // 工程类别
+ projectNumber: "", // 项目编号
+ structureType: "", // 结构类型
+ projectAcreage: "", // 项目面积(m²)
+ bulidStatus: "", // 工程状态
+ startWorkDate: "", // 开工日期
+ constructionStage: "", // 施工阶段
+ projectTel: "", // 联系电话
+ }
+
}
// console.log('==========',this.enterpriseForm.companyTypeName)
- this.aptitudeFileList = []
- this.logoFileList = []
+ this.aptitudeFileList = [];
+ this.logoFileList = [];
+ this.layoutImageList = [];
+ this.constructionMapUrlList = [];
this.enterpriseDialogType = 1
this.enterpriseDialogTitle = this.$t(
'message.laborMange.theNewEnterprise'
@@ -952,6 +997,7 @@ export default {
},
//编辑按钮
editBtn(value) {
+ console.log('11111111', value);
this.parentEnterpriseList.forEach((item, index) => {
if (value.id == item.id) {
this.parentEnterpriseList.splice(index, 1)
@@ -965,7 +1011,7 @@ export default {
this.enterpriseDialogType = 2
this.aptitudeFileList = []
this.logoFileList = []
- this.enterpriseForm = JSON.parse(JSON.stringify(value))
+ this.enterpriseForm = {...JSON.parse(JSON.stringify(value))}
let aptitude = this.enterpriseForm.enterpriseQualificationUrl
? this.enterpriseForm.enterpriseQualificationUrl.split(',')
: []
@@ -987,7 +1033,22 @@ export default {
if (this.enterpriseForm.parentEnterpriseId == 0) {
this.enterpriseForm.parentEnterpriseId = ''
}
- this.addEnterpriseDialog = true
+ getEnterpriseInfoByIdApi({
+ enterpriseId: value.id,
+ projectSn: this.$store.state.projectSn,
+ }).then(res => {
+ if (res.code == 200) {
+ const projectEnterprise = res.result.projectEnterprise;
+ console.log('222222',projectEnterprise);
+ this.enterpriseForm.projectEnterprise = {
+ ...projectEnterprise
+ };
+ this.layoutImageList = JSON.parse(this.enterpriseForm.projectEnterprise.layoutImage);
+ this.constructionMapUrlList = JSON.parse(this.enterpriseForm.projectEnterprise.constructionMapUrl);
+ }
+ }).finally(() => {
+ this.addEnterpriseDialog = true
+ })
},
//新增 ||编辑 保存
@@ -1015,6 +1076,13 @@ export default {
}
}
+ if (this.enterpriseForm.projectTel) {
+ if (!checkPhone(this.enterpriseForm.projectTel)) {
+ this.$message.error('请输入正确的联系电话')
+ return
+ }
+ }
+
this.$refs[formName].validate((valid) => {
if (valid) {
this.enterpriseForm.projectSn = this.projectSn
@@ -1039,10 +1107,14 @@ export default {
}
this.enterpriseForm.logo = arr.join(',')
}
+ console.log(11111111111,this.constructionMapUrlList);
+ this.enterpriseForm.projectEnterprise.layoutImage = JSON.stringify(this.layoutImageList);
+ this.enterpriseForm.projectEnterprise.constructionMapUrl = JSON.stringify(this.constructionMapUrlList);
this.enterpriseForm.type = this.pageType
if (!this.enterpriseForm.parentEnterpriseId) {
this.enterpriseForm.parentEnterpriseId = '0'
}
+
if (this.enterpriseDialogType == 1) {
//新增提交
setEnterpriseInfo(this.enterpriseForm).then((res) => {
@@ -1052,6 +1124,8 @@ export default {
this.$refs[formName].resetFields()
this.aptitudeFileList = []
this.logoFileList = []
+ this.layoutImageList = []
+ this.constructionMapUrlList = []
this.getCooperatorList()
this.getParentEnterpriseList()
}
@@ -1077,6 +1151,8 @@ export default {
this.addEnterpriseDialog = false
this.aptitudeFileList = []
this.logoFileList = []
+ this.layoutImageList = []
+ this.constructionMapUrlList = []
this.getCooperatorList()
this.getParentEnterpriseList()
}
@@ -1189,7 +1265,7 @@ export default {
//批量选中的数据
getDeleteList(value) { },
//跳转详情页
- goDetailPage(id, projectEnterpriseId,enterpriseSn) {
+ goDetailPage(id, projectEnterpriseId, enterpriseSn) {
this.detailId = id;
this.projectEnterpriseId = projectEnterpriseId;
this.enterpriseSn = enterpriseSn;
@@ -1200,8 +1276,12 @@ export default {
handleRemove(file, fileList, type) {
if (type == 1) {
this.aptitudeFileList = fileList
- } else {
+ } else if (type == 2) {
this.logoFileList = fileList
+ } else if (type == 3) {
+ this.layoutImageList = fileList
+ } else if (type == 4) {
+ this.constructionMapUrlList = fileList
}
},
//文件上传成功
@@ -1210,8 +1290,14 @@ export default {
let data = { name: file.data[0].filename, url: file.data[0].imageUrl }
if (type == 1) {
this.aptitudeFileList.push(data)
- } else {
+ } else if (type == 2) {
this.logoFileList.push(data)
+ } else if (type == 3) {
+ this.layoutImageList.push(data)
+ console.log(this.layoutImageList);
+ } else if (type == 4) {
+ this.constructionMapUrlList.push(data);
+ console.log(this.constructionMapUrlList);
}
},
handleError(file) { },
@@ -1239,23 +1325,28 @@ export default {
.flex {
display: flex;
}
+
.flex2 {
display: flex;
align-items: center;
justify-content: space-between;
}
+
.flex3 {
display: flex;
align-items: center;
}
+
.cooperator {
width: 100%;
height: 100%;
+
.left {
height: 100%;
width: 16%;
margin-right: 15px;
font-size: 15px;
+
// background-color: #fbfbfb;
.title {
height: 41px;
@@ -1266,21 +1357,25 @@ export default {
border-bottom: 2px #ebf0fc solid;
font-weight: 600;
}
+
.el-menu-item2 {
border-bottom: 2px #ebf0fc solid;
height: 43px;
line-height: 43px;
padding: 0 30px !important;
}
+
.checked_item {
border-left: 3px solid #5181f6;
padding: 0 27px !important;
background-color: #e1e8fa !important;
}
}
+
.right {
height: 100%;
width: 84%;
+
.title {
font-size: 15px;
height: 41px;
@@ -1291,6 +1386,7 @@ export default {
// color: #282e49;
border-bottom: 2px #ebf0fc solid;
font-weight: 600;
+
.right_value {
// color: rgba(115, 121, 150, 100);
@@ -1300,20 +1396,24 @@ export default {
opacity: 0.8;
font-weight: 100;
}
+
.value {
color: #5181f6;
}
}
}
+
.content {
height: calc(100% - 41px);
// background-color: #fff;
box-sizing: border-box;
padding: 15px 20px;
+
.list_wrap {
width: 100%;
height: 85%;
flex-wrap: wrap;
+
.list {
width: 30%;
height: 150px;
@@ -1328,12 +1428,14 @@ export default {
font-size: 14px;
position: relative;
cursor: pointer;
+
.name {
// color: rgba(39, 46, 71, 100);
opacity: 1;
font-size: 15px;
font-weight: 600;
}
+
.btn_wrap {
position: absolute;
bottom: 5px;
@@ -1341,6 +1443,7 @@ export default {
z-index: 100;
// display: none;
}
+
.deleteList {
position: absolute;
top: 5px;
@@ -1348,6 +1451,7 @@ export default {
z-index: 100;
}
}
+
.list:hover {
box-shadow: 0px 6px 12px 2px rgba(81, 129, 246, 0.18);
border-color: #5181f6;
@@ -1356,12 +1460,15 @@ export default {
}
}
}
+
/deep/ .__view {
min-height: calc(100% - 41px) !important;
}
+
/deep/ .el-checkbox__label {
display: none;
}
+
.el-menu-vertical-demo {
width: 100%;
}
@@ -1371,6 +1478,7 @@ export default {
height: 100%;
background: #ffffff;
box-sizing: border-box;
+
.navigationTitle {
// border-bottom: 2px solid #ebf0fc;
// margin-bottom: 15px;
@@ -1384,10 +1492,12 @@ export default {
padding-top: 20%;
box-sizing: border-box;
color: #c3d4fd;
+
div {
margin-top: 10px;
}
}
+
.adddialog {
position: relative;
@@ -1395,9 +1505,11 @@ export default {
height: 500px;
overflow: auto;
}
+
::-webkit-scrollbar {
width: 2px;
}
+
.addpage {
position: absolute;
top: 80%;
diff --git a/src/views/projectFront/projectSummary/cooperatorDatails.vue b/src/views/projectFront/projectSummary/cooperatorDatails.vue
index dd67f220..0b61d7c8 100644
--- a/src/views/projectFront/projectSummary/cooperatorDatails.vue
+++ b/src/views/projectFront/projectSummary/cooperatorDatails.vue
@@ -27,12 +27,36 @@
style="width: 100%"
>
+
+ ![]()
+
+
+
+ {{ scope.row.value }}
+
+
+