diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 11bebe0a..4b7ef25b 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -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:28889/' //郭圣雄本地 // 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://182.90.224.237:51234/' //郭圣雄远程 // 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://42.180.188.17:9809/' //鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 - // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 - // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 - // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 - // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 + axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 + // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 + // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/store/index.js b/src/store/index.js index 70e4f9f9..7d02d50a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -56,14 +56,15 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 - UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 - FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 + // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // 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/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 - // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 - // FILEURL: 'http://42.180.188.17:11211/image/', //测试 + UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 + FILEURL: 'http://42.180.188.17:11211/image/', //测试 // BASEURL: baseUrl ? // baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 // 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:19098/#/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 diff --git a/src/views/projectFront/projectSummary/contractorAudit.vue b/src/views/projectFront/projectSummary/contractorAudit.vue index 59a6ce35..abf15da1 100644 --- a/src/views/projectFront/projectSummary/contractorAudit.vue +++ b/src/views/projectFront/projectSummary/contractorAudit.vue @@ -35,7 +35,9 @@ {{ $t("message.laborMange.refresh") }} - 邀请新承包商入场 + 邀请新承包商入场 @@ -168,9 +170,7 @@
企业类型 - {{ - supplierDetail.companyTypeName - }} + {{ supplierDetail.companyTypeName }}
开户行 @@ -232,13 +232,14 @@ 资质图片 logo
-
-
-
-
- 承包项目名称 - {{ item.cbsName }} -
-
- 项目施工区域 - {{ item.projectBuildArea }} -
-
- 竣工日期 - {{ item.completionDate }} -
-
- 维度位置 - {{ item.latitude }} -
-
- 经度位置 - {{ item.longitude }} -
-
- 工程类别 - {{ item.projectType }} -
-
- 结构类型 - {{ - item.structureType - }} -
-
- 项目面积(m²) - {{ item.projectAcreage }} -
-
-
-
- 项目类型 - {{ item.cbsProjectType }} -
-
- 项目经理 - {{ item.projectManage }} -
-
- 联系电话 - {{ item.projectTel }} -
-
- 工程状态 - {{ item.bulidStatus }} -
-
- 开工日期 - {{ item.startWorkDate }} -
-
- 施工阶段 - {{ item.constructionStage }} -
-
- 现场布置图 - -
-
- 现场施工图 - -
-
+
+
+
+
+ 承包项目名称 + {{ item.cbsName }}
+
+ 项目经理 + {{ + item.projectManage + }} +
+
+ 施工阶段 + {{ + item.constructionStageName + }} +
+
+ 经度位置 + {{ item.longitude }} +
+ +
+ 项目编号 + {{ + item.projectNumber + }} +
+
+ 项目面积(m²) + {{ + item.projectAcreage + }} +
+
+ 开工日期 + {{ item.startWorkDate }} +
+
+ 现场布置图 + +
+
+ 联系电话 + {{ item.projectTel }} +
+
+
+
+ 项目施工区域 + {{ + item.projectBuildArea + }} +
+
+ 项目类型 + {{ item.cbsProjectTypeName }} +
+
+ 维度位置 + {{ item.latitude }} +
+
+ 工程类别 + {{ + item.projectTypeName + }} +
+
+ 结构类型 + {{ + item.structureTypeName + }} +
+
+ 工程状态 + {{ + typeof item.bulidStatus === 'number' ? + $t("message.companyDiagram.BUILDSTATUS")[item.bulidStatus] + .name : '' + }} +
+
+ 竣工日期 + {{ item.completionDate }} +
+
+ 现场施工图 + +
+
+ + +
+
+
@@ -407,6 +457,17 @@ align="center" label="序号" > + + +
@@ -492,7 +556,7 @@ type="textarea" :rows="5" placeholder="请输入" - style="width: 300px;align-self: flex-start" + style="width: 300px; align-self: flex-start" >
@@ -531,26 +595,22 @@ >
- {{$store.state.userInfo.account}}邀请您加入{{ $store.state.currentProDetail.name }} -
-
- 邀请时间: {{ selectNowDate() }} -
-
- 点击链接进入承包商入场申请: + {{ $store.state.userInfo.account }}邀请您加入{{ + $store.state.currentProDetail.name + }}
+
邀请时间: {{ selectNowDate() }}
+
点击链接进入承包商入场申请:
{{ inviteCBSUrl }}
+
+ 取消 + 复制链接 +
+ @@ -563,9 +623,11 @@ import { qualificationApplyInfoApi, getEnterpriseSupplierInfoListApi, auditQualificationApplyPassApi, - auditQualificationApplyRefuseApi + auditQualificationApplyRefuseApi, } from "@/assets/js/api/supplier.js"; 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"; export default { name: "temporary", @@ -586,7 +648,7 @@ export default { { name: "待审批", value: 1 }, { name: "已审批", value: 2 }, { name: "已驳回", value: 3 }, - { name: "已撤销", value: 4 }, + // { name: "已撤销", value: 4 }, ], tableParameter: { applyStatus: "", @@ -625,35 +687,60 @@ export default { }, supplierDetailCBS: [ { - cbsName: "", // 承包项目名称 - projectBuildArea: "", // 项目施工区域 - completionDate: "", // 竣工日期 - cbsProjectType: "", // 项目类型 - projectManage: "", // 项目经理 - latitude: "", // 维度位置 - longitude: "", // 经度位置 - projectType: "", // 工程类别 - projectNumber: "", // 项目编号 - structureType: "", // 结构类型 - projectAcreage: "", // 项目面积(m²) - bulidStatus: "", // 工程状态 - startWorkDate: "", // 开工日期 - constructionStage: "", // 施工阶段 - layoutImage: "", // 现场布置图 - constructionMapUrl: "", // 现场施工图 - projectTel: "", // 联系电话 + cbsName: "", // 承包项目名称 + projectBuildArea: "", // 项目施工区域 + completionDate: "", // 竣工日期 + cbsProjectType: "", // 项目类型 + projectManage: "", // 项目经理 + latitude: "", // 维度位置 + longitude: "", // 经度位置 + projectType: "", // 工程类别 + projectNumber: "", // 项目编号 + structureType: "", // 结构类型 + projectAcreage: "", // 项目面积(m²) + bulidStatus: "", // 工程状态 + startWorkDate: "", // 开工日期 + constructionStage: "", // 施工阶段 + layoutImage: "", // 现场布置图 + constructionMapUrl: "", // 现场施工图 + projectTel: "", // 联系电话 }, - ], + ], rowData: {}, replyData: {}, 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() { this.projectSn = this.$store.state.projectSn; this.getTableList(); this.loadData(); + this.getCompanyTypeList(); }, watch: { filterText(val) { @@ -661,13 +748,22 @@ export default { }, }, methods: { + // 获取企业类型列表 + getCompanyTypeList() { + getEnterpriseTypeList({}).then((res) => { + console.log(res, "企业类型列表"); + if (res.result) { + this.companyTypeList = res.result; + } + }); + }, // 邀请新承包商入场 inviteCBS() { - console.log(this.inviteCBSDialog) - this.inviteCBSUrl =`http://192.168.34.175:5173/#/contractorApply?sn=${this.$store.state.projectSn}` + console.log(this.inviteCBSDialog); + this.inviteCBSUrl = `${this.$store.state.CONTRACTORURL}?sn=${this.$store.state.projectSn}`; this.inviteCBSDialog = true; }, - onCopy(){ + onCopy() { navigator.clipboard.writeText(this.inviteCBSUrl); this.$message.success("复制成功"); }, @@ -685,7 +781,18 @@ export default { hours >= 0 && hours <= 9 ? (hours = "0" + hours) : ""; minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : ""; 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); return timer; }, @@ -714,8 +821,9 @@ export default { // item.fileUrl = this.$store.state.FILEURL + item.fileUrl; // } if (!item.fileUrl.includes(this.$store.state.FILEURL)) { - if(item.fileUrl.includes("name")){ - item.fileUrl = this.$store.state.FILEURL + JSON.parse(item.fileUrl)[0].url; + if (item.fileUrl.includes("name")) { + item.fileUrl = + this.$store.state.FILEURL + JSON.parse(item.fileUrl)[0].url; } else { item.fileUrl = this.$store.state.FILEURL + item.fileUrl; } @@ -796,7 +904,7 @@ export default { getEnterpriseSupplierInfoListApi(requestData).then((res) => { console.log(res, "承包项目信息"); if (res.result) { - this.supplierDetailCBS = res.result + this.supplierDetailCBS = res.result; } }); }, @@ -841,7 +949,7 @@ export default { applyContent: this.auditReplyVal, applyUser: this.$store.state.userInfo.realName, 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) => { this.$message.error("已拒绝"); this.relativeGroupDialog = false; @@ -895,7 +1003,7 @@ export default {