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

flx:调整承包商入场审批

Browse Source
This commit is contained in:
X_Rian 2024-07-19 18:55:01 +08:00
parent 7f59ea8afc
commit b59482262f
4 changed files with 306 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/assets/js/http.js
View File

@ -174,7 +174,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
@ -187,11 +187,11 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址 // axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
// axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
// axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址
// axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
} else if (process.env.NODE_ENV == "debug") { } else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com"; axios.defaults.baseURL = "https://www.ceshi.com";
} else if (process.env.NODE_ENV == "production") { } else if (process.env.NODE_ENV == "production") {

13
src/store/index.js
View File

@ -56,14 +56,15 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/', // FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
WORKFLOWURL: "http://192.168.34.129:89/#/workspace/forms", //罗峰工作流地址(本地) // WORKFLOWURL: "http://192.168.34.129:89/#/workspace/forms", //罗峰工作流地址(本地)
CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
// FILEURL: 'http://42.180.188.17:11211/image/', //测试 FILEURL: 'http://42.180.188.17:11211/image/', //测试
// BASEURL: baseUrl ? // BASEURL: baseUrl ?
// baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 // baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
@ -71,7 +72,7 @@ export default new Vuex.Store({
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
// BASEURL: baseUrl // BASEURL: baseUrl
// ? baseUrl // ? baseUrl

394
src/views/projectFront/projectSummary/contractorAudit.vue
View File

@ -35,7 +35,9 @@
<el-button type="warning" plain @click="refresh">{{ <el-button type="warning" plain @click="refresh">{{
$t("message.laborMange.refresh") $t("message.laborMange.refresh")
}}</el-button> }}</el-button>
<el-button type="primary" plain @click="inviteCBS">邀请新承包商入场</el-button> <el-button type="primary" plain @click="inviteCBS"
>邀请新承包商入场</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -168,9 +170,7 @@
</div> </div>
<div class="flex3"> <div class="flex3">
<span class="width_35 bg_color">企业类型</span> <span class="width_35 bg_color">企业类型</span>
<span class="width_65 bg_color">{{ <span class="width_65 bg_color">{{ supplierDetail.companyTypeName }}</span>
supplierDetail.companyTypeName
}}</span>
</div> </div>
<div class="flex3"> <div class="flex3">
<span class="width_35">开户行</span> <span class="width_35">开户行</span>
@ -232,13 +232,14 @@
<span class="width_35 border_l">资质图片</span> <span class="width_35 border_l">资质图片</span>
<span class="width_65" <span class="width_65"
><img ><img
v-show="supplierDetail.enterpriseQualificationUrl"
:src="supplierDetail.enterpriseQualificationUrl" :src="supplierDetail.enterpriseQualificationUrl"
style=" style="
width: 40px; width: 40px;
height: 40px; height: 40px;
margin-top: 2px; margin-top: 2px;
cursor: pointer; cursor: pointer;
" "
@click=" @click="
bigImageDialog = true; bigImageDialog = true;
bigImageUrl = supplierDetail.enterpriseQualificationUrl; bigImageUrl = supplierDetail.enterpriseQualificationUrl;
@ -289,13 +290,14 @@
<span class="width_35 border_l">logo</span> <span class="width_35 border_l">logo</span>
<span class="width_65" <span class="width_65"
><img ><img
v-show="supplierDetail.logo"
:src="supplierDetail.logo" :src="supplierDetail.logo"
style=" style="
width: 40px; width: 40px;
height: 40px; height: 40px;
margin-top: 2px; margin-top: 2px;
cursor: pointer; cursor: pointer;
" "
@click=" @click="
bigImageDialog = true; bigImageDialog = true;
bigImageUrl = supplierDetail.logo; bigImageUrl = supplierDetail.logo;
@ -314,89 +316,137 @@
</div> </div>
<vue-scroll v-show="activeTab == 3" style="height: 580px"> <vue-scroll v-show="activeTab == 3" style="height: 580px">
<div class="basic-info"> <div class="basic-info">
<div class="custom_tab" v-for="(item, index) in supplierDetailCBS" :key="item.id"> <div
<div class="flex4"> class="custom_tab"
<div class="type_content" style="z-index: 2"> v-for="(item, index) in supplierDetailCBS"
<div class="flex3"> :key="item.id"
<span class="width_35">承包项目名称</span> >
<span class="width_65">{{ item.cbsName }}</span> <div class="flex4">
</div> <div class="type_content" style="z-index: 2">
<div class="flex3"> <div class="flex3">
<span class="width_35 bg_color">项目施工区域</span> <span class="width_35">承包项目名称</span>
<span class="width_65 bg_color">{{ item.projectBuildArea }}</span> <span class="width_65">{{ item.cbsName }}</span>
</div>
<div class="flex3">
<span class="width_35"> 竣工日期</span>
<span class="width_65">{{ item.completionDate }}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color">维度位置</span>
<span class="width_65 bg_color">{{ item.latitude }}</span>
</div>
<div class="flex3">
<span class="width_35">经度位置</span>
<span class="width_65">{{ item.longitude }}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color">工程类别</span>
<span class="width_65 bg_color">{{ item.projectType }}</span>
</div>
<div class="flex3">
<span class="width_35">结构类型</span>
<span class="width_65" style="white-space: nowrap">{{
item.structureType
}}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color">项目面积(m²)</span>
<span class="width_65 bg_color">{{ item.projectAcreage }}</span>
</div>
</div>
<div class="type_content">
<div class="flex3">
<span class="width_35 border_l">项目类型</span>
<span class="width_65">{{ item.cbsProjectType }}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color border_l">项目经理</span>
<span class="width_65 bg_color">{{ item.projectManage }}</span>
</div>
<div class="flex3">
<span class="width_35 border_l">联系电话</span>
<span class="width_65">{{ item.projectTel }}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color border_l">工程状态</span>
<span class="width_65 bg_color">{{ item.bulidStatus }}</span>
</div>
<div class="flex3">
<span class="width_35 border_l">开工日期</span>
<span class="width_65">{{ item.startWorkDate }}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color border_l">施工阶段</span>
<span class="width_65 bg_color">{{ item.constructionStage }}</span>
</div>
<div class="flex3">
<span class="width_35 border_l">现场布置图</span>
<span class="width_65"><img v-show="item.layoutImage" :src="item.layoutImage"
style="width: 40px; height: 40px; margin-top: 2px; cursor: pointer" @click="
bigImageDialog = true;
bigImageUrl = item.layoutImage;
" /></span>
</div>
<div class="flex3">
<span class="width_35 bg_color border_l">现场施工图</span>
<span class="width_65 bg_color"><img v-show="item.constructionMapUrl.length > 0"
:src="item.constructionMapUrl"
style="width: 40px; height: 40px; margin-top: 2px; cursor: pointer" @click="
bigImageDialog = true;
bigImageUrl = item.constructionMapUrl;
" /></span>
</div>
</div>
</div> </div>
<div class="flex3">
<span class="width_35 bg_color">项目经理</span>
<span class="width_65 bg_color">{{
item.projectManage
}}</span>
</div>
<div class="flex3">
<span class="width_35">施工阶段</span>
<span class="width_65">{{
item.constructionStageName
}}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color">经度位置</span>
<span class="width_65 bg_color">{{ item.longitude }}</span>
</div>
<div class="flex3">
<span class="width_35">项目编号</span>
<span class="width_65">{{
item.projectNumber
}}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color">项目面积(m²)</span>
<span class="width_65 bg_color">{{
item.projectAcreage
}}</span>
</div>
<div class="flex3">
<span class="width_35">开工日期</span>
<span class="width_65">{{ item.startWorkDate }}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color">现场布置图</span>
<span class="width_65 bg_color"
><img
v-show="item.layoutImage"
:src="item.layoutImage"
style="
width: 40px;
height: 40px;
margin-top: 2px;
cursor: pointer;
"
@click="
bigImageDialog = true;
bigImageUrl = item.layoutImage;
"
/></span>
</div>
<div class="flex3">
<span class="width_35">联系电话</span>
<span class="width_65">{{ item.projectTel }}</span>
</div>
</div>
<div class="type_content">
<div class="flex3">
<span class="width_35 border_l">项目施工区域</span>
<span class="width_65 ">{{
item.projectBuildArea
}}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color border_l">项目类型</span>
<span class="width_65 bg_color">{{ item.cbsProjectTypeName }}</span>
</div>
<div class="flex3">
<span class="width_35 border_l">维度位置</span>
<span class="width_65">{{ item.latitude }}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color border_l">工程类别</span>
<span class="width_65 bg_color">{{
item.projectTypeName
}}</span>
</div>
<div class="flex3">
<span class="width_35 border_l">结构类型</span>
<span class="width_65" style="white-space: nowrap">{{
item.structureTypeName
}}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color border_l">工程状态</span>
<span class="width_65 bg_color">{{
typeof item.bulidStatus === 'number' ?
$t("message.companyDiagram.BUILDSTATUS")[item.bulidStatus]
.name : ''
}}</span>
</div>
<div class="flex3">
<span class="width_35 border_l"> 竣工日期</span>
<span class="width_65">{{ item.completionDate }}</span>
</div>
<div class="flex3">
<span class="width_35 bg_color border_l">现场施工图</span>
<span class="width_65 bg_color"
><img
v-show="item.constructionMapUrl.length > 0"
:src="item.constructionMapUrl"
style="
width: 40px;
height: 40px;
margin-top: 2px;
cursor: pointer;
"
@click="
bigImageDialog = true;
bigImageUrl = item.constructionMapUrl;
"
/></span>
</div>
<div class="flex3">
<span class="width_35 border_l"></span>
<span class="width_65"></span>
</div>
</div>
</div> </div>
</div>
</div> </div>
</vue-scroll> </vue-scroll>
<div class="company-qualification" v-show="activeTab == 1"> <div class="company-qualification" v-show="activeTab == 1">
@ -407,6 +457,17 @@
align="center" align="center"
label="序号" label="序号"
></el-table-column> ></el-table-column>
<el-table-column
prop="qualificationType"
label="资质类型"
align="center"
>
<template slot slot-scope="scope">
{{
scope.row.qualificationTypeName
}}
</template>
</el-table-column>
<el-table-column <el-table-column
prop="fileName" prop="fileName"
label="资质文件名称" label="资质文件名称"
@ -419,7 +480,7 @@
></el-table-column> ></el-table-column>
<el-table-column label="资质文件" align="center"> <el-table-column label="资质文件" align="center">
<div slot slot-scope="scope"> <div slot slot-scope="scope">
<img <!-- <img
:src="scope.row.fileUrl ? scope.row.fileUrl : []" :src="scope.row.fileUrl ? scope.row.fileUrl : []"
alt="" alt=""
width="50px" width="50px"
@ -427,7 +488,10 @@
bigImageDialog = true; bigImageDialog = true;
bigImageUrl = scope.row.fileUrl; bigImageUrl = scope.row.fileUrl;
" "
/> /> -->
<a :href="scope.row.fileUrl" target="_blank">{{
scope.row.originFileName
}}</a>
</div> </div>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -465,7 +529,7 @@
disabled disabled
type="textarea" type="textarea"
:rows="5" :rows="5"
style="flex: 1;align-self: flex-start" style="flex: 1; align-self: flex-start"
></el-input> ></el-input>
</div> </div>
</div> </div>
@ -492,7 +556,7 @@
type="textarea" type="textarea"
:rows="5" :rows="5"
placeholder="请输入" placeholder="请输入"
style="width: 300px;align-self: flex-start" style="width: 300px; align-self: flex-start"
></el-input> ></el-input>
</div> </div>
</div> </div>
@ -531,26 +595,22 @@
> >
<div class="invitecbs"> <div class="invitecbs">
<div> <div>
{{$store.state.userInfo.account}}邀请您加入{{ $store.state.currentProDetail.name }} {{ $store.state.userInfo.account }}邀请您加入{{
</div> $store.state.currentProDetail.name
<div> }}
邀请时间: {{ selectNowDate() }}
</div>
<div>
点击链接进入承包商入场申请:
</div> </div>
<div>邀请时间: {{ selectNowDate() }}</div>
<div>点击链接进入承包商入场申请:</div>
<div> <div>
<a :href="inviteCBSUrl" target="_blank">{{ inviteCBSUrl }}</a> <a :href="inviteCBSUrl" target="_blank">{{ inviteCBSUrl }}</a>
</div> </div>
</div> </div>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="inviteCBSDialog = false">取消</el-button> <el-button @click="inviteCBSDialog = false">取消</el-button>
<el-button type="primary" @click="onCopy"> <el-button type="primary" @click="onCopy"> 复制链接 </el-button>
复制链接 </div>
</el-button> </template>
</div>
</template>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -563,9 +623,11 @@ import {
qualificationApplyInfoApi, qualificationApplyInfoApi,
getEnterpriseSupplierInfoListApi, getEnterpriseSupplierInfoListApi,
auditQualificationApplyPassApi, auditQualificationApplyPassApi,
auditQualificationApplyRefuseApi auditQualificationApplyRefuseApi,
} from "@/assets/js/api/supplier.js"; } from "@/assets/js/api/supplier.js";
import { getComapnyStatisticsListApi } from "@/assets/js/api/company/project"; import { getComapnyStatisticsListApi } from "@/assets/js/api/company/project";
import { getEnterpriseTypeList } from "@/assets/js/api/laborPerson";
import { getDictionaryItemApi } from "@/assets/js/api/companyDiagram";
import moment from "moment"; import moment from "moment";
export default { export default {
name: "temporary", name: "temporary",
@ -586,7 +648,7 @@ export default {
{ name: "待审批", value: 1 }, { name: "待审批", value: 1 },
{ name: "已审批", value: 2 }, { name: "已审批", value: 2 },
{ name: "已驳回", value: 3 }, { name: "已驳回", value: 3 },
{ name: "已撤销", value: 4 }, // { name: "已撤销", value: 4 },
], ],
tableParameter: { tableParameter: {
applyStatus: "", applyStatus: "",
@ -625,35 +687,60 @@ export default {
}, },
supplierDetailCBS: [ supplierDetailCBS: [
{ {
cbsName: "", // 承包项目名称 cbsName: "", // 承包项目名称
projectBuildArea: "", // 项目施工区域 projectBuildArea: "", // 项目施工区域
completionDate: "", // 竣工日期 completionDate: "", // 竣工日期
cbsProjectType: "", // 项目类型 cbsProjectType: "", // 项目类型
projectManage: "", // 项目经理 projectManage: "", // 项目经理
latitude: "", // 维度位置 latitude: "", // 维度位置
longitude: "", // 经度位置 longitude: "", // 经度位置
projectType: "", // 工程类别 projectType: "", // 工程类别
projectNumber: "", // 项目编号 projectNumber: "", // 项目编号
structureType: "", // 结构类型 structureType: "", // 结构类型
projectAcreage: "", // 项目面积(m²) projectAcreage: "", // 项目面积(m²)
bulidStatus: "", // 工程状态 bulidStatus: "", // 工程状态
startWorkDate: "", // 开工日期 startWorkDate: "", // 开工日期
constructionStage: "", // 施工阶段 constructionStage: "", // 施工阶段
layoutImage: "", // 现场布置图 layoutImage: "", // 现场布置图
constructionMapUrl: "", // 现场施工图 constructionMapUrl: "", // 现场施工图
projectTel: "", // 联系电话 projectTel: "", // 联系电话
}, },
], ],
rowData: {}, rowData: {},
replyData: {}, replyData: {},
inviteCBSDialog: false, inviteCBSDialog: false,
inviteCBSUrl: "" inviteCBSUrl: "",
companyTypeList: [],
}; };
}, },
computed: {
xzSupplierType() {
const find = this.companyTypeList.find(
(item) => item.id == this.supplierDetail.xzSupplierTypeId
);
console.log(
find,
this.companyTypeList,
this.supplierDetail.xzSupplierTypeId
);
if (find) {
return find.companyTypeName;
}
},
constructionStageUp() {
return (typeList, constructionStage) => {
const find = typeList.find((item) => item.data == constructionStage);
if (find) {
return find.name;
}
};
},
},
created() { created() {
this.projectSn = this.$store.state.projectSn; this.projectSn = this.$store.state.projectSn;
this.getTableList(); this.getTableList();
this.loadData(); this.loadData();
this.getCompanyTypeList();
}, },
watch: { watch: {
filterText(val) { filterText(val) {
@ -661,13 +748,22 @@ export default {
}, },
}, },
methods: { methods: {
// 获取企业类型列表
getCompanyTypeList() {
getEnterpriseTypeList({}).then((res) => {
console.log(res, "企业类型列表");
if (res.result) {
this.companyTypeList = res.result;
}
});
},
// 邀请新承包商入场 // 邀请新承包商入场
inviteCBS() { inviteCBS() {
console.log(this.inviteCBSDialog) console.log(this.inviteCBSDialog);
this.inviteCBSUrl =`http://192.168.34.175:5173/#/contractorApply?sn=${this.$store.state.projectSn}` this.inviteCBSUrl = `${this.$store.state.CONTRACTORURL}?sn=${this.$store.state.projectSn}`;
this.inviteCBSDialog = true; this.inviteCBSDialog = true;
}, },
onCopy(){ onCopy() {
navigator.clipboard.writeText(this.inviteCBSUrl); navigator.clipboard.writeText(this.inviteCBSUrl);
this.$message.success("复制成功"); this.$message.success("复制成功");
}, },
@ -685,7 +781,18 @@ export default {
hours >= 0 && hours <= 9 ? (hours = "0" + hours) : ""; hours >= 0 && hours <= 9 ? (hours = "0" + hours) : "";
minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : ""; minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : "";
seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : ""; seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : "";
var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds // 获取至当前的时间 var timer =
year +
"-" +
month +
"-" +
day +
" " +
hours +
":" +
minutes +
":" +
seconds; // 获取至当前的时间
console.log(timer); console.log(timer);
return timer; return timer;
}, },
@ -714,8 +821,9 @@ export default {
// item.fileUrl = this.$store.state.FILEURL + item.fileUrl; // item.fileUrl = this.$store.state.FILEURL + item.fileUrl;
// } // }
if (!item.fileUrl.includes(this.$store.state.FILEURL)) { if (!item.fileUrl.includes(this.$store.state.FILEURL)) {
if(item.fileUrl.includes("name")){ if (item.fileUrl.includes("name")) {
item.fileUrl = this.$store.state.FILEURL + JSON.parse(item.fileUrl)[0].url; item.fileUrl =
this.$store.state.FILEURL + JSON.parse(item.fileUrl)[0].url;
} else { } else {
item.fileUrl = this.$store.state.FILEURL + item.fileUrl; item.fileUrl = this.$store.state.FILEURL + item.fileUrl;
} }
@ -796,7 +904,7 @@ export default {
getEnterpriseSupplierInfoListApi(requestData).then((res) => { getEnterpriseSupplierInfoListApi(requestData).then((res) => {
console.log(res, "承包项目信息"); console.log(res, "承包项目信息");
if (res.result) { if (res.result) {
this.supplierDetailCBS = res.result this.supplierDetailCBS = res.result;
} }
}); });
}, },
@ -841,7 +949,7 @@ export default {
applyContent: this.auditReplyVal, applyContent: this.auditReplyVal,
applyUser: this.$store.state.userInfo.realName, applyUser: this.$store.state.userInfo.realName,
replyTime: moment().format("YYYY-MM-DD HH:mm:ss"), replyTime: moment().format("YYYY-MM-DD HH:mm:ss"),
resubmitApplicationUrl: `http://192.168.34.175:5173/#/contractorApply?sn=${this.$store.state.projectSn}&xzSupplierQualificationApplyId=${this.rowData.id}`, resubmitApplicationUrl: `${this.$store.state.CONTRACTORURL}?sn=${this.$store.state.projectSn}&xzSupplierQualificationApplyId=${this.rowData.id}`,
}).then((res) => { }).then((res) => {
this.$message.error("已拒绝"); this.$message.error("已拒绝");
this.relativeGroupDialog = false; this.relativeGroupDialog = false;
@ -895,7 +1003,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.invitecbs { .invitecbs {
>div{ > div {
line-height: 30px; line-height: 30px;
} }
} }

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

@ -143,7 +143,7 @@
}" }"
>项目信息填报</el-button >项目信息填报</el-button
> >
<vue-scroll style="height: 650px"> <vue-scroll style="height: 590px">
<div <div
:style="index > 0 ? 'margin-top: 20px' : ''" :style="index > 0 ? 'margin-top: 20px' : ''"
v-for="(item, index) in enterpriseInfo2" v-for="(item, index) in enterpriseInfo2"
@ -291,6 +291,8 @@
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column prop="qualificationTypeName" label="资质类型">
</el-table-column>
<el-table-column <el-table-column
prop="fileName" prop="fileName"
:label="$t('message.cooperationUnit.aptitudeFileName')" :label="$t('message.cooperationUnit.aptitudeFileName')"
@ -334,7 +336,7 @@
scope.row.fileUrl.indexOf('.') scope.row.fileUrl.indexOf('.')
) )
" --> " -->
<!-- v-if="!scope.row.flag" --> <!-- v-if="!scope.row.flag" -->
<a <a
:href="scope.row.fileUrl" :href="scope.row.fileUrl"
target="self" target="self"
@ -781,6 +783,7 @@
:on-remove=" :on-remove="
(file, flexList) => handleRemove1(file, flexList, 4, item) (file, flexList) => handleRemove1(file, flexList, 4, item)
" "
:on-exceed="onExceed"
:on-success="(file) => handleSuccess1(file, 4, item)" :on-success="(file) => handleSuccess1(file, 4, item)"
name="files" name="files"
:file-list="item.constructionMapUrlList" :file-list="item.constructionMapUrlList"
@ -798,6 +801,7 @@
:on-remove=" :on-remove="
(file, flexList) => handleRemove1(file, flexList, 3, item) (file, flexList) => handleRemove1(file, flexList, 3, item)
" "
:on-exceed="onExceed"
:on-success="(file) => handleSuccess1(file, 3, item)" :on-success="(file) => handleSuccess1(file, 3, item)"
name="files" name="files"
:file-list="item.layoutImageList" :file-list="item.layoutImageList"
@ -1134,9 +1138,12 @@ export default {
fieldName: "项目面积(m²)", fieldName: "项目面积(m²)",
fieldName2: "工程状态", fieldName2: "工程状态",
value: item.projectAcreage ? item.projectAcreage : "", value: item.projectAcreage ? item.projectAcreage : "",
value2: this.$t("message.companyDiagram.BUILDSTATUS")[ value2:
item.bulidStatus typeof item.bulidStatus === "number"
].name, ? this.$t("message.companyDiagram.BUILDSTATUS")[
item.bulidStatus
].name
: "",
}, },
{ {
fieldName: "开工日期", fieldName: "开工日期",
@ -1187,9 +1194,9 @@ export default {
if (item.constructionMapUrl) { if (item.constructionMapUrl) {
if (item.constructionMapUrl.includes("http://")) { if (item.constructionMapUrl.includes("http://")) {
const resName = item.constructionMapUrl.substring( const resName = item.constructionMapUrl.substring(
item.constructionMapUrl.lastIndexOf("\/") + 1, item.constructionMapUrl.lastIndexOf("\/") + 1,
item.constructionMapUrl.length item.constructionMapUrl.length
) );
constructionMapList = [ constructionMapList = [
{ {
name: resName, name: resName,
@ -1213,10 +1220,10 @@ export default {
if (item.layoutImage) { if (item.layoutImage) {
if (item.layoutImage.includes("http://")) { if (item.layoutImage.includes("http://")) {
const resName = item.layoutImage.substring( const resName = item.layoutImage.substring(
item.layoutImage.lastIndexOf("\/") + 1, item.layoutImage.lastIndexOf("\/") + 1,
item.layoutImage.length item.layoutImage.length
); );
constructionMapList = [ layoutImageList = [
{ {
name: resName, name: resName,
url: resName, url: resName,
@ -1226,24 +1233,22 @@ export default {
JSON.parse(item.layoutImage) instanceof Array && JSON.parse(item.layoutImage) instanceof Array &&
JSON.parse(item.layoutImage).length > 0 JSON.parse(item.layoutImage).length > 0
) { ) {
constructionMapList = JSON.parse(item.layoutImage).map( layoutImageList = JSON.parse(item.layoutImage).map((item) => {
(item) => { return {
return { name: item.name,
name: item.name, url: item.url,
url: item.url, };
}; });
}
);
} }
} }
return { return {
...item, ...item,
constructionMapUrlList: constructionMapList, constructionMapUrlList: constructionMapList,
layoutImageList:layoutImageList, layoutImageList: layoutImageList,
}; };
}); });
console.log(this.supplierList) console.log(this.supplierList);
// basicInfo.supplierDetail = res.result // basicInfo.supplierDetail = res.result
// enterpriseInfo2 // enterpriseInfo2
// [ // [
@ -1430,7 +1435,7 @@ export default {
? this.$t("message.cooperationUnit.subpackage11") ? this.$t("message.cooperationUnit.subpackage11")
: res.result.enterpriseTypeId == 12 : res.result.enterpriseTypeId == 12
? this.$t("message.cooperationUnit.subpackage12") ? this.$t("message.cooperationUnit.subpackage12")
: "", : res.result.companyTypeName,
value2: res.result.enterpriseLegalPerson, value2: res.result.enterpriseLegalPerson,
}, },
{ {
@ -1734,9 +1739,12 @@ export default {
row.constructionMapUrlList = fileList; row.constructionMapUrlList = fileList;
} }
}, },
onExceed() {
this.$message.warning("超出最大上传限制!");
},
//文件上传成功 //文件上传成功
handleSuccess1(file, type, row) { handleSuccess1(file, type, row) {
this.$message.success('上传成功') this.$message.success("上传成功");
let data = { let data = {
name: file.data[0].fileInfo.originalFilename name: file.data[0].fileInfo.originalFilename
? file.data[0].fileInfo.originalFilename ? file.data[0].fileInfo.originalFilename
@ -1821,6 +1829,16 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.projectDialog {
/deep/ .upload-demo {
display: flex;
width: 286px;
}
/deep/ .el-upload-list {
margin: 0;
}
}
.projectDialog /deep/ .el-dialog { .projectDialog /deep/ .el-dialog {
margin-top: 5vh !important; margin-top: 5vh !important;
margin-bottom: 0 !important; margin-bottom: 0 !important;