admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
X_Rian 2024-05-29 23:43:23 +08:00
parent 67a5524569
commit 0deedde0ed
2 changed files with 82 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/views/projectFront/projectSummary/cooperationUnit.vue
View File

@ -35,7 +35,7 @@
<span>{{ enterpriseTypeName }}</span> <span>{{ enterpriseTypeName }}</span>
<span class="right_value"> <span class="right_value">
<span>{{ enterpriseTypeName <span>{{ enterpriseTypeName
}}{{ $t('message.cooperationUnit.sum') }}：</span> }}{{ $t('message.cooperationUnit.sum') }}：</span>
<span class="value">{{ listData.length }}</span></span> <span class="value">{{ listData.length }}</span></span>
</div> </div>
<div class="content"> <div class="content">
@ -54,8 +54,7 @@
</el-form-item>--> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button v-permission="{ key: 'hzdw_delete_pl', menuPath: '/project/summary/cooperationUnit' }" <el-button v-permission="{ key: 'hzdw_delete_pl', menuPath: '/project/summary/cooperationUnit' }"
type="primary" style="height: 32px" :disabled="checkedDeleteList.length == 0" type="primary" style="height: 32px" :disabled="checkedDeleteList.length == 0" @click="deleteInBatches">{{
@click="deleteInBatches">{{
$t('message.cooperationUnit.deleteInBatches') }}</el-button> $t('message.cooperationUnit.deleteInBatches') }}</el-button>
</el-form-item> </el-form-item>
<!-- <el-form-item> <!-- <el-form-item>
@ -74,8 +73,8 @@
<el-form v-permission="{ key: 'hzdw_inquiry', menuPath: '/project/summary/cooperationUnit' }" :inline="true" <el-form v-permission="{ key: 'hzdw_inquiry', menuPath: '/project/summary/cooperationUnit' }" :inline="true"
class="demo-form-inline" size="small"> class="demo-form-inline" size="small">
<el-form-item> <el-form-item>
<el-input :placeholder="$t('message.laborMange.placeholder1')" v-model="enterpriseName" <el-input :placeholder="$t('message.laborMange.placeholder1')" v-model="enterpriseName" style="width: 260px"
style="width: 260px" clearable> clearable>
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -187,9 +186,8 @@
<!-- 企业类型 --> <!-- 企业类型 -->
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('message.laborMange.formOfBusiness')" prop="companyTypeName"> <el-form-item :label="$t('message.laborMange.formOfBusiness')" prop="companyTypeName">
<el-select v-model="enterpriseForm.companyTypeName" <el-select v-model="enterpriseForm.companyTypeName" :placeholder="$t('message.laborMange.pleaseChoose')"
:placeholder="$t('message.laborMange.pleaseChoose')" style="width: 100%" style="width: 100%" :disabled="enterpriseTypeName == '全部' ? false : true">
:disabled="enterpriseTypeName == '全部' ? false : true">
<el-option v-for="item in companyTypeList" :key="item.id" :label="item.companyTypeName" <el-option v-for="item in companyTypeList" :key="item.id" :label="item.companyTypeName"
:value="item.companyTypeName"></el-option> :value="item.companyTypeName"></el-option>
</el-select> </el-select>
@ -302,7 +300,7 @@
:placeholder="$t('message.laborMange.pleaseChoose')" style="width: 100%"> :placeholder="$t('message.laborMange.pleaseChoose')" style="width: 100%">
<el-option :label="$t('message.laborMange.stateOwnedBusiness')" :value="1"></el-option> <el-option :label="$t('message.laborMange.stateOwnedBusiness')" :value="1"></el-option>
<el-option :label="$t('message.laborMange.overseasInvestedEnterprises') <el-option :label="$t('message.laborMange.overseasInvestedEnterprises')
" :value="2"></el-option> " :value="2"></el-option>
<el-option :label="$t('message.laborMange.collectiveEnterprises')" :value="3"></el-option> <el-option :label="$t('message.laborMange.collectiveEnterprises')" :value="3"></el-option>
<el-option :label="$t('message.laborMange.privateEnterprise')" :value="4"></el-option> <el-option :label="$t('message.laborMange.privateEnterprise')" :value="4"></el-option>
</el-select> </el-select>
@ -315,9 +313,9 @@
<el-form-item :label="$t('message.projectInfo.theParentCompany')" prop="parentEnterpriseId"> <el-form-item :label="$t('message.projectInfo.theParentCompany')" prop="parentEnterpriseId">
<el-select v-model="enterpriseForm.parentEnterpriseId" :placeholder="$t('message.projectInfo.pleaseChoose') + <el-select v-model="enterpriseForm.parentEnterpriseId" :placeholder="$t('message.projectInfo.pleaseChoose') +
$t('message.projectInfo.theParentCompany') $t('message.projectInfo.theParentCompany')
" filterable clearable style="width: 100%"> " filterable clearable style="width: 100%">
<el-option v-for="(item, index) in parentEnterpriseList" :label="item.enterpriseName" <el-option v-for="(item, index) in parentEnterpriseList" :label="item.enterpriseName" :value="item.id"
:value="item.id" :key="index"> :key="index">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -325,8 +323,7 @@
<el-col :span="12"> <el-col :span="12">
<!-- 排序 --> <!-- 排序 -->
<el-form-item :label="$t('message.projectInfo.sort')" prop="num"> <el-form-item :label="$t('message.projectInfo.sort')" prop="num">
<el-input-number v-model="enterpriseForm.sortNum" @change="handleChangeNum" <el-input-number v-model="enterpriseForm.sortNum" @change="handleChangeNum" :min="0"></el-input-number>
:min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -336,20 +333,20 @@
<el-form-item :label="$t('message.projectInfo.departmentType')" prop="departmentType"> <el-form-item :label="$t('message.projectInfo.departmentType')" prop="departmentType">
<!-- 否 --> <!-- 否 -->
<el-radio v-model="enterpriseForm.departmentType" :label="1">{{ $t('message.laborDev.whetherList')[0] <el-radio v-model="enterpriseForm.departmentType" :label="1">{{ $t('message.laborDev.whetherList')[0]
}}</el-radio> }}</el-radio>
<!-- 是 --> <!-- 是 -->
<el-radio v-model="enterpriseForm.departmentType" :label="2">{{ $t('message.laborDev.whetherList')[1] <el-radio v-model="enterpriseForm.departmentType" :label="2">{{ $t('message.laborDev.whetherList')[1]
}}</el-radio> }}</el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('message.laborMange.photosOfQualification')" prop="enterpriseQualificationUrl"> <el-form-item :label="$t('message.laborMange.photosOfQualification')" prop="enterpriseQualificationUrl">
<el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 1) <el-upload class="upload-demo" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 1)
" :on-success="(file) => handleSuccess(file, 1)" :on-error="(file) => handleError(file, 1)" " :on-success="(file) => handleSuccess(file, 1)" :on-error="(file) => handleError(file, 1)"
:on-preview="(file) => handlePreview(file, 1)" :on-preview="(file) => handlePreview(file, 1)" :before-upload="(file) => handleBeforeUpload(file, 1)"
:before-upload="(file) => handleBeforeUpload(file, 1)" name="files" :file-list="aptitudeFileList"> name="files" :file-list="aptitudeFileList">
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload') $t('message.laborMange.clickOnTheUpload')
}}</el-button> }}</el-button>
@ -358,10 +355,10 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="logo" prop="logo"> <el-form-item label="logo" prop="logo">
<el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 2) <el-upload class="upload-demo" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 2)
" :on-success="(file) => handleSuccess(file, 2)" :on-error="(file) => handleError(file, 2)" " :on-success="(file) => handleSuccess(file, 2)" :on-error="(file) => handleError(file, 2)"
:on-preview="(file) => handlePreview(file, 2)" :on-preview="(file) => handlePreview(file, 2)" :before-upload="(file) => handleBeforeUpload(file, 2)"
:before-upload="(file) => handleBeforeUpload(file, 2)" name="files" :file-list="logoFileList"> name="files" :file-list="logoFileList">
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload') $t('message.laborMange.clickOnTheUpload')
}}</el-button> }}</el-button>
@ -488,8 +485,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="施工阶段" prop="constructionStage"> <el-form-item label="施工阶段" prop="constructionStage">
<el-select v-model="enterpriseForm.projectEnterprise.constructionStage" placeholder="请选择施工阶段" <el-select v-model="enterpriseForm.projectEnterprise.constructionStage" placeholder="请选择施工阶段" filterable
filterable clearable style="width: 100%"> clearable style="width: 100%">
<el-option v-for="(item, index) in constructionStageList" :label="item.name" <el-option v-for="(item, index) in constructionStageList" :label="item.name"
:value="Number(item.data)" :key="index"> :value="Number(item.data)" :key="index">
</el-option> </el-option>
@ -505,11 +502,10 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="现场施工图" prop="constructionMapUrl"> <el-form-item label="现场施工图" prop="constructionMapUrl">
<el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 4) <el-upload class="upload-demo" :limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 4)
" :on-success="(file) => handleSuccess(file, 4)" :on-error="(file) => handleError(file, 4)" " :on-success="(file) => handleSuccess(file, 4)" :on-error="(file) => handleError(file, 4)"
:on-preview="(file) => handlePreview(file, 4)" :on-preview="(file) => handlePreview(file, 4)" :before-upload="(file) => handleBeforeUpload(file, 4)"
:before-upload="(file) => handleBeforeUpload(file, 4)" lis name="files" lis name="files" :file-list="constructionMapUrlList">
:file-list="constructionMapUrlList">
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload') $t('message.laborMange.clickOnTheUpload')
}}</el-button> }}</el-button>
@ -520,10 +516,10 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="现场布置图" prop="layoutImage"> <el-form-item label="现场布置图" prop="layoutImage">
<el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 3) <el-upload class="upload-demo" :limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 3)
" :on-success="(file) => handleSuccess(file, 3)" :on-error="(file) => handleError(file, 3)" " :on-success="(file) => handleSuccess(file, 3)" :on-error="(file) => handleError(file, 3)"
:on-preview="(file) => handlePreview(file, 3)" :on-preview="(file) => handlePreview(file, 3)" :before-upload="(file) => handleBeforeUpload(file, 3)"
:before-upload="(file) => handleBeforeUpload(file, 3)" name="files" :file-list="layoutImageList"> name="files" :file-list="layoutImageList">
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload') $t('message.laborMange.clickOnTheUpload')
}}</el-button> }}</el-button>
@ -533,9 +529,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div class="dialog-footer addpage"> <div class="dialog-footer addpage">
<el-button class="cancleBtn" @click="addEnterpriseDialog = false" icon="el-icon-circle-close" <el-button class="cancleBtn" @click="addEnterpriseDialog = false" icon="el-icon-circle-close" size="medium">{{
size="medium">{{ $t('message.laborMange.cancel') }}</el-button>
$t('message.laborMange.cancel') }}</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="saveEnterpriseFn('enterpriseForm')" <el-button type="primary" icon="el-icon-circle-check" @click="saveEnterpriseFn('enterpriseForm')"
size="medium">{{ size="medium">{{
$t('message.laborMange.confirm') }}</el-button> $t('message.laborMange.confirm') }}</el-button>
@ -543,14 +538,14 @@
</div> </div>
</vue-scroll> </vue-scroll>
</el-dialog> </el-dialog>
<el-dialog :modal-append-to-body="false" :title="$t('message.projectInfo.batchMobile')" <el-dialog :modal-append-to-body="false" :title="$t('message.projectInfo.batchMobile')" :close-on-click-modal="false"
:close-on-click-modal="false" :visible.sync="moveEnterpriseDialog" width="750px"> :visible.sync="moveEnterpriseDialog" width="750px">
<el-form :inline="true" size="medium" ref="selectForm"> <el-form :inline="true" size="medium" ref="selectForm">
<!-- 目标企业类型 --> <!-- 目标企业类型 -->
<el-form-item :label="$t('message.projectInfo.targetCompanyType')" prop="enterpriseType"> <el-form-item :label="$t('message.projectInfo.targetCompanyType')" prop="enterpriseType">
<el-select v-model="enterpriseType" :placeholder="$t('message.projectInfo.pleaseChoose') + <el-select v-model="enterpriseType" :placeholder="$t('message.projectInfo.pleaseChoose') +
$t('message.projectInfo.targetCompanyType') $t('message.projectInfo.targetCompanyType')
" filterable clearable> " filterable clearable>
<el-option v-for="(item, index) in enterpriseTypeList" :label="item.companyTypeName" :value="item.id" <el-option v-for="(item, index) in enterpriseTypeList" :label="item.companyTypeName" :value="item.id"
:key="index"> :key="index">
</el-option> </el-option>
@ -1030,6 +1025,7 @@ export default {
if (this.enterpriseForm.parentEnterpriseId == 0) { if (this.enterpriseForm.parentEnterpriseId == 0) {
this.enterpriseForm.parentEnterpriseId = '' this.enterpriseForm.parentEnterpriseId = ''
} }
console.log(this.aptitudeFileList);
getEnterpriseInfoByIdApi({ getEnterpriseInfoByIdApi({
enterpriseId: value.id, enterpriseId: value.id,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
@ -1353,9 +1349,6 @@ export default {
// color: #282e49; // color: #282e49;
border-bottom: 2px #ebf0fc solid; border-bottom: 2px #ebf0fc solid;
font-weight: 600; font-weight: 600;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
} }
.el-menu-item2 { .el-menu-item2 {
@ -1434,6 +1427,9 @@ export default {
opacity: 1; opacity: 1;
font-size: 15px; font-size: 15px;
font-weight: 600; font-weight: 600;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
} }
.btn_wrap { .btn_wrap {

48
src/views/projectFront/projectSummary/cooperatorDatails.vue
View File

@ -56,7 +56,25 @@
<el-table-column prop="value2" min-width="35%"> <el-table-column prop="value2" min-width="35%">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
v-if="scope.row.value2 && typeof(scope.row.value2) == 'string' && scope.row.value2.indexOf('http://') >= 0" v-if="scope.row.value2 instanceof Array && scope.row.value2.length > 0"
class="showImg_wrap"
>
<!-- <img
v-for="(item, index) in getUrl(scope.row.value2, 1)"
:key="index"
:src="item"
class="showImg"
@click="showImgBtn(item)"
/> -->
<img
v-for="item in scope.row.value2"
:src="item.url"
class="showImg"
@click="showImgBtn(item.url)"
/>
</div>
<div
v-else-if="scope.row.value2 && typeof(scope.row.value2) == 'string' && scope.row.value2.indexOf('http://') >= 0"
class="showImg_wrap" class="showImg_wrap"
> >
<!-- <img <!-- <img
@ -444,8 +462,13 @@ export default {
fieldName2: this.$t("message.laborMange.photosOfQualification"), fieldName2: this.$t("message.laborMange.photosOfQualification"),
value: res.result.enterpriseName, value: res.result.enterpriseName,
value2: value2:
res.result.enterpriseQualificationUrl && res.result.enterpriseQualificationUrl && res.result.enterpriseQualificationUrl.split(',').length > 0?
res.result.enterpriseQualificationUrl, res.result.enterpriseQualificationUrl.split(',').map(item => {
return {
name: item.split('*')[0],
url: this.$store.state.FILEURL + item.split('*')[1],
}
}) : res.result.enterpriseQualificationUrl.indexOf('http://') >= 0 ? res.result.enterpriseQualificationUrl: res.result.enterpriseQualificationUrl,
}, },
{ {
fieldName: this.$t("message.laborMange.formOfBusiness"), fieldName: this.$t("message.laborMange.formOfBusiness"),
@ -510,7 +533,14 @@ export default {
fieldName: this.$t("message.laborMange.laborCertificateNo"), fieldName: this.$t("message.laborMange.laborCertificateNo"),
fieldName2: this.$t("message.laborMange.safetyProductionLicense"), fieldName2: this.$t("message.laborMange.safetyProductionLicense"),
value: res.result.qualificationNumber, value: res.result.qualificationNumber,
value2: res.result.enterpriseSafeAllow ? this.$store.state.FILEURL + res.result.enterpriseSafeAllow : '', value2: res.result.enterpriseSafeAllow && res.result.enterpriseSafeAllow.split(',').length > 0 ? res.result.enterpriseSafeAllow.split(',').map(item => {
return {
name: item.split('*')[0],
url: this.$store.state.FILEURL + item.split('*')[1],
}
}) : res.result.enterpriseSafeAllow.indexOf('http://') >= 0 || !res.result.enterpriseSafeAllow ? res.result.enterpriseQualificationUrl : this.$store.state.FILEURL + res.result.enterpriseSafeAllow
// res.result.enterpriseSafeAllow ? this.$store.state.FILEURL + res.result.enterpriseSafeAllow : '',
}, },
{ {
fieldName: this.$t("message.laborMange.natureOfUnit"), fieldName: this.$t("message.laborMange.natureOfUnit"),
@ -523,7 +553,13 @@ export default {
: res.result.enterpriseProperty == 3 : res.result.enterpriseProperty == 3
? this.$t("message.laborMange.collectiveEnterprises") ? this.$t("message.laborMange.collectiveEnterprises")
: this.$t("message.laborMange.privateEnterprise"), : this.$t("message.laborMange.privateEnterprise"),
value2: res.result.logo ? this.$store.state.FILEURL +res.result.logo : "", value2: res.result.logo && res.result.logo.split(',').length > 0 ? res.result.logo.split(',').map(item => {
return {
name: item.split('*')[0],
url: this.$store.state.FILEURL + item.split('*')[1],
}
}) : res.result.logo.indexOf('http://') >= 0 || !res.result.logo ? res.result.logo : this.$store.state.FILEURL + res.result.logo
// res.result.logo ? this.$store.state.FILEURL +res.result.logo : "",
}, },
{ {
fieldName: this.$t("message.projectInfo.projectLeader"), fieldName: this.$t("message.projectInfo.projectLeader"),
@ -565,7 +601,7 @@ export default {
fieldName: "项目面积(m²)", fieldName: "项目面积(m²)",
fieldName2: "工程状态", fieldName2: "工程状态",
value: res.result.projectEnterprise.projectAcreage ? res.result.projectEnterprise.projectAcreage:"", value: res.result.projectEnterprise.projectAcreage ? res.result.projectEnterprise.projectAcreage:"",
value2: res.result.projectEnterprise.bulidStatus ? res.result.projectEnterprise.bulidStatus:"", value2: this.$t('message.companyDiagram.BUILDSTATUS')[res.result.projectEnterprise.bulidStatus].name,
}, },
{ {
fieldName: "开工日期", fieldName: "开工日期",