diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue index 41cc628a..7a2201ce 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue @@ -156,14 +156,35 @@ prop="idNo" min-width="180" /> - + + + + + /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -368,6 +490,8 @@ export default { proCode: null, proNo: null, owerDept: null, + post: null, + trades: null, }, // 排序方式 params: { @@ -412,10 +536,24 @@ export default { proCode: this.proCode, }, }, + // 职务字典 + postOptions: [], + // 工种分类字典 + tradesOptions: [], + fileList1: [], + fileList2: [], + fileList3: [], }; }, created() { this.getList(); + this.getDicts("roster_positions_for_migrant_workers").then((response) => { + this.postOptions = response.data; + }); + this.getDicts("job_classification").then((response) => { + this.tradesOptions = response.data; + }); + listInfo(this.firmInfoQuery).then((response) => { this.firmInfo = response.data.enterpriseInfoList.filter( (item) => item.enterpriseType == "1" @@ -438,6 +576,12 @@ export default { this.loading = false; }); }, + postFormatter(row) { + return this.selectDictLabel(this.postOptions, row.post); + }, + tradesFormatter(row) { + return this.selectDictLabel(this.tradesOptions, row.trades); + }, // 取消按钮 cancel() { this.open = false; @@ -445,6 +589,9 @@ export default { }, // 表单重置 reset() { + this.fileList1 = []; + this.fileList2 = []; + this.fileList3 = []; this.form = { id: null, socialCreditCode: null, @@ -525,6 +672,15 @@ export default { const id = row.id || this.ids; getRealName(id).then((response) => { this.form = response.data; + if (this.form.employmentContracts) { + this.fileList1 = JSON.parse(this.form.employmentContracts); + } + if (this.form.socialSecurity) { + this.fileList2 = JSON.parse(this.form.socialSecurity); + } + if (this.form.appointmentDocuments) { + this.fileList3 = JSON.parse(this.form.appointmentDocuments); + } this.open = true; this.title = "修改农民工人员实名制信息"; }); @@ -533,8 +689,15 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { - this.form.proNo = this.proNo; - this.form.proCode = this.proCode; + if (this.fileList1.length) { + this.form.employmentContracts = JSON.stringify(this.fileList1); + } + if (this.fileList2.length) { + this.form.socialSecurity = JSON.stringify(this.fileList2); + } + if (this.fileList3.length) { + this.form.appointmentDocuments = JSON.stringify(this.fileList3); + } if (this.form.id != null) { updateRealName(this.form).then((response) => { if (response.code === 200) { @@ -544,6 +707,8 @@ export default { } }); } else { + this.form.proNo = this.proNo; + this.form.proCode = this.proCode; addRealName(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue index 6e15438c..a70a1d9e 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue @@ -56,7 +56,7 @@ -
+ -
+ -
+ + { this.preMsg = response.data; diff --git a/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue b/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue index 48d7223f..fbcb16f7 100644 --- a/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue +++ b/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue @@ -1510,6 +1510,12 @@ export default { this.$refs["form"].validate((valid) => { // 附件 this.form.attachment = JSON.stringify(this.fileList); + if (this.form.xmName && this.form.xmName.indexOf("[") != -1) { + this.form.xmName = this.form.xmName.slice( + 0, + this.form.xmName.indexOf("[") + ); + } // 项目编码 // this.form.projectCode = this.form.bidProjectName.slice( // this.form.bidProjectName.indexOf("[") + 1, @@ -1549,10 +1555,11 @@ export default { // 查看信息 viewInfo(row) { - this.viewTitle = row.bidProjectName.slice( - 0, - row.bidProjectName.indexOf("[") - ); + this.viewTitle = row.bidProjectName; + // this.viewTitle = row.bidProjectName.slice( + // 0, + // row.bidProjectName.indexOf("[") + // ); const id = row.id; getBidNotice(id).then((response) => { this.tenderMsg = response.data; diff --git a/jwtech-admin-page/src/views/project/bid/options/announcementQualificationResult.vue b/jwtech-admin-page/src/views/project/bid/options/announcementQualificationResult.vue index ec272d1b..abc2d8e7 100644 --- a/jwtech-admin-page/src/views/project/bid/options/announcementQualificationResult.vue +++ b/jwtech-admin-page/src/views/project/bid/options/announcementQualificationResult.vue @@ -449,6 +449,7 @@ export default { if (this.form.attachment) { this.fileList = JSON.parse(this.form.attachment); } + this.form.xmName = this.form.xmName + "[" + this.form.projectCode + "]"; this.open = true; this.title = "修改资格结果公示"; }); @@ -458,6 +459,12 @@ export default { this.$refs["form"].validate((valid) => { if (valid) { this.form.attachment = JSON.stringify(this.fileList); + if (this.form.xmName && this.form.xmName.indexOf("[") != -1) { + this.form.xmName = this.form.xmName.slice( + 0, + this.form.xmName.indexOf("[") + ); + } if (this.form.id != null) { updateZgjg(this.form).then((response) => { if (response.code === 200) { diff --git a/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue b/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue index 90745a53..b3963231 100644 --- a/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue +++ b/jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue @@ -1438,10 +1438,11 @@ export default { }, // 查看信息 viewInfo(row) { - this.viewTitle = row.bidProjectName.slice( - 0, - row.bidProjectName.indexOf("[") - ); + this.viewTitle = row.bidProjectName; + // this.viewTitle = row.bidProjectName.slice( + // 0, + // row.bidProjectName.indexOf("[") + // ); const id = row.id; getBidInfoVO(id).then((response) => { this.infoMsg = response.data.specialProjectBidInfo; diff --git a/jwtech-admin-page/src/views/project/bid/options/bidEvaluationReport.vue b/jwtech-admin-page/src/views/project/bid/options/bidEvaluationReport.vue index 8a55381b..27bb95c3 100644 --- a/jwtech-admin-page/src/views/project/bid/options/bidEvaluationReport.vue +++ b/jwtech-admin-page/src/views/project/bid/options/bidEvaluationReport.vue @@ -392,6 +392,7 @@ export default { const id = row.id || this.ids; getPbbg(id).then((response) => { this.form = response.data; + this.form.xmName = this.form.xmName + "[" + this.form.projectCode + "]"; this.open = true; this.title = "修改评标报告"; }); @@ -400,6 +401,12 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + if (this.form.xmName && this.form.xmName.indexOf("[") != -1) { + this.form.xmName = this.form.xmName.slice( + 0, + this.form.xmName.indexOf("[") + ); + } if (this.form.id != null) { updatePbbg(this.form).then((response) => { if (response.code === 200) { diff --git a/jwtech-admin-page/src/views/project/bid/options/biddingFile.vue b/jwtech-admin-page/src/views/project/bid/options/biddingFile.vue index bc73fe5f..fda6e5e8 100644 --- a/jwtech-admin-page/src/views/project/bid/options/biddingFile.vue +++ b/jwtech-admin-page/src/views/project/bid/options/biddingFile.vue @@ -578,6 +578,7 @@ export default { /** 查询招标文件列表 */ getList() { this.loading = true; + this.queryParams.data.proNo = this.proNo; listContractFile(this.queryParams).then((response) => { this.contractFileList = response.records; this.total = response.total; diff --git a/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue b/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue index 196441a9..6cda6ca3 100644 --- a/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue +++ b/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue @@ -1290,6 +1290,7 @@ export default { // this.publicityForm.bidProjectName.indexOf("[") + 1, // this.publicityForm.bidProjectName.indexOf("]") // ); + this.viewTitle = row.bidProjectName; this.publicityForm.attachmentAddress = JSON.stringify( this.fileList ); @@ -1336,10 +1337,11 @@ export default { // 查看信息 viewInfo(row) { - this.viewTitle = row.bidProjectName.slice( - 0, - row.bidProjectName.indexOf("[") - ); + this.viewTitle = row.bidProjectName; + // this.viewTitle = row.bidProjectName.slice( + // 0, + // row.bidProjectName.indexOf("[") + // ); const id = row.id; getBidWinningVO(id).then((response) => { this.infoMsg = response.data.projectBidWining; diff --git a/jwtech-admin-page/src/views/project/bid/options/investmentMargin.vue b/jwtech-admin-page/src/views/project/bid/options/investmentMargin.vue index 18efdb71..0f1ff290 100644 --- a/jwtech-admin-page/src/views/project/bid/options/investmentMargin.vue +++ b/jwtech-admin-page/src/views/project/bid/options/investmentMargin.vue @@ -1025,6 +1025,7 @@ export default { const id = row.id || this.ids; getTbbzj(id).then((response) => { this.form = response.data; + this.form.xmName = this.form.xmName + "[" + this.form.projectCode + "]"; this.open = true; this.title = "修改工资保证金账户管理"; }); @@ -1033,6 +1034,12 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + if (this.form.xmName && this.form.xmName.indexOf("[") != -1) { + this.form.xmName = this.form.xmName.slice( + 0, + this.form.xmName.indexOf("[") + ); + } if (this.form.id != null) { updateTbbzj(this.form).then((response) => { if (response.code === 200) { diff --git a/jwtech-admin-page/src/views/project/bid/options/prequalificationApplyDocuments.vue b/jwtech-admin-page/src/views/project/bid/options/prequalificationApplyDocuments.vue index c9931df7..f5739ecc 100644 --- a/jwtech-admin-page/src/views/project/bid/options/prequalificationApplyDocuments.vue +++ b/jwtech-admin-page/src/views/project/bid/options/prequalificationApplyDocuments.vue @@ -546,6 +546,7 @@ export default { if (this.form.attachment) { this.fileList = JSON.parse(this.form.attachment); } + this.form.xmName = this.form.xmName + "[" + this.form.projectCode + "]"; this.open = true; this.title = "修改资格预审申请文件"; }); @@ -555,6 +556,12 @@ export default { this.$refs["form"].validate((valid) => { if (valid) { this.form.attachment = JSON.stringify(this.fileList); + if (this.form.xmName && this.form.xmName.indexOf("[") != -1) { + this.form.xmName = this.form.xmName.slice( + 0, + this.form.xmName.indexOf("[") + ); + } if (this.form.id != null) { updateZzys(this.form).then((response) => { if (response.code === 200) { diff --git a/jwtech-admin-page/src/views/project/bid/options/prequalificationDocuments.vue b/jwtech-admin-page/src/views/project/bid/options/prequalificationDocuments.vue index d29161d1..7676b5d7 100644 --- a/jwtech-admin-page/src/views/project/bid/options/prequalificationDocuments.vue +++ b/jwtech-admin-page/src/views/project/bid/options/prequalificationDocuments.vue @@ -546,6 +546,7 @@ export default { if (this.form.attachment) { this.fileList = JSON.parse(this.form.attachment); } + this.form.xmName = this.form.xmName + "[" + this.form.projectCode + "]"; this.open = true; this.title = "修改资格预审文件"; }); @@ -555,6 +556,12 @@ export default { this.$refs["form"].validate((valid) => { if (valid) { this.form.attachment = JSON.stringify(this.fileList); + if (this.form.xmName && this.form.xmName.indexOf("[") != -1) { + this.form.xmName = this.form.xmName.slice( + 0, + this.form.xmName.indexOf("[") + ); + } if (this.form.id != null) { updateZzys(this.form).then((response) => { if (response.code === 200) { diff --git a/jwtech-admin-page/src/views/project/bid/options/projectContract.vue b/jwtech-admin-page/src/views/project/bid/options/projectContract.vue index a6795fd9..a3c49b77 100644 --- a/jwtech-admin-page/src/views/project/bid/options/projectContract.vue +++ b/jwtech-admin-page/src/views/project/bid/options/projectContract.vue @@ -878,6 +878,7 @@ export default { /** 查询项目合同及履行公示详情列表 */ getList() { this.loading = true; + this.queryParams.data.proNo = this.proNo; listFulfillingNotice(this.queryParams).then((response) => { this.fulfillingNoticeList = response.records; this.total = response.total; @@ -1054,10 +1055,11 @@ export default { }, // 查看信息 viewInfo(row) { - this.viewTitle = row.bidProjectName.slice( - 0, - row.bidProjectName.indexOf("[") - ); + this.viewTitle = row.bidProjectName; + // this.viewTitle = row.bidProjectName.slice( + // 0, + // row.bidProjectName.indexOf("[") + // ); const id = row.id; getFulfillingNotice(id).then((response) => { this.projectContractMsg = response.data; diff --git a/jwtech-admin-page/src/views/project/bid/options/tenderFile.vue b/jwtech-admin-page/src/views/project/bid/options/tenderFile.vue index ef5c5565..aa4ad0ac 100644 --- a/jwtech-admin-page/src/views/project/bid/options/tenderFile.vue +++ b/jwtech-admin-page/src/views/project/bid/options/tenderFile.vue @@ -465,6 +465,7 @@ export default { const id = row.id || this.ids; getTbwj(id).then((response) => { this.form = response.data; + this.form.xmName = this.form.xmName + "[" + this.form.projectCode + "]"; this.open = true; this.title = "修改投标文件"; }); @@ -473,6 +474,12 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + if (this.form.xmName && this.form.xmName.indexOf("[") != -1) { + this.form.xmName = this.form.xmName.slice( + 0, + this.form.xmName.indexOf("[") + ); + } if (this.form.id != null) { updateTbwj(this.form).then((response) => { if (response.code === 200) { diff --git a/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue b/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue index c9e2b474..159263e7 100644 --- a/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue +++ b/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue @@ -121,7 +121,6 @@ label="招标项目名称" align="center" prop="bidProjectName" - :formatter="projectNameFormat" min-width="150" /> { this.resMsg = response.data; diff --git a/jwtech-pc-page/config/index.js b/jwtech-pc-page/config/index.js index f4807639..9dedb52d 100644 --- a/jwtech-pc-page/config/index.js +++ b/jwtech-pc-page/config/index.js @@ -33,7 +33,7 @@ module.exports = { proxyTable: { '/kms-pc-web': { // target: 'http://127.0.0.1:18080/kms-pc-web', - target: 'http://192.168.2.100:18080/kms-pc-web', + target: 'http://192.168.2.103:18080/kms-pc-web', // target: 'http://192.168.2.100:18082/tianhui-admin-web', changeOrigin: true, pathRewrite: { @@ -43,7 +43,7 @@ module.exports = { }, // 使用 localhost:18080 或者 本机地址:18080 访问系统页面 - host: '192.168.2.100', // can be overwritten by process.env.HOST + host: '192.168.2.103', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, diff --git a/jwtech-pc-page/static/config.js b/jwtech-pc-page/static/config.js index 4e1a63ee..115fb086 100644 --- a/jwtech-pc-page/static/config.js +++ b/jwtech-pc-page/static/config.js @@ -10,7 +10,7 @@ window.g = { // url: "http://106.2.224.58:1036/kms-pc-web/api", // url: "http://106.2.224.58:1039/kms-pc-web", // url: "http://192.168.2.100:18082/tianhui-admin-web", - url: "http://192.168.2.100:18080/kms-pc-web", + url: "http://192.168.2.103:18080/kms-pc-web", // url: "http://127.0.0.1:18082/kms-pc-web", // url: "http://192.168.1.113:8083/kms-pc-web",