Browse Source

修改

dev_kxc
xzt 1 year ago
parent
commit
3ab3836cf6
  1. 197
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue
  2. 16
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue
  3. 9
      jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue
  4. 15
      jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
  5. 7
      jwtech-admin-page/src/views/project/bid/options/announcementQualificationResult.vue
  6. 9
      jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
  7. 7
      jwtech-admin-page/src/views/project/bid/options/bidEvaluationReport.vue
  8. 1
      jwtech-admin-page/src/views/project/bid/options/biddingFile.vue
  9. 10
      jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
  10. 7
      jwtech-admin-page/src/views/project/bid/options/investmentMargin.vue
  11. 7
      jwtech-admin-page/src/views/project/bid/options/prequalificationApplyDocuments.vue
  12. 7
      jwtech-admin-page/src/views/project/bid/options/prequalificationDocuments.vue
  13. 10
      jwtech-admin-page/src/views/project/bid/options/projectContract.vue
  14. 7
      jwtech-admin-page/src/views/project/bid/options/tenderFile.vue
  15. 10
      jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue
  16. 4
      jwtech-pc-page/config/index.js
  17. 2
      jwtech-pc-page/static/config.js

197
jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue

@ -156,14 +156,35 @@
prop="idNo"
min-width="180"
/>
<el-table-column
label="手机号"
align="center"
prop="phone"
min-width="150"
/>
<el-table-column
label="所属单位"
align="center"
prop="belowUnit"
min-width="120"
/>
<el-table-column
label="职务"
align="center"
prop="post"
:formatter="postFormatter"
min-width="120"
/>
<el-table-column
label="工种分类"
align="center"
prop="trades"
:formatter="tradesFormatter"
min-width="120"
/>
<!-- <el-table-column
label="所属单位统一社会信用代码"
align="center"
prop="socialCreditCode"
@ -189,7 +210,7 @@
label="籍贯"
align="center"
prop="nativePlace"
min-width="120"
min-width="120" -->
/>
<el-table-column
label="操作"
@ -237,7 +258,22 @@
>
<el-row>
<el-form ref="form" :model="form" :rules="rules" label-width="180px">
<el-col :span="24">
<el-col :span="12">
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号码" prop="idNo">
<el-input v-model="form.idNo" placeholder="请输入身份证号码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属施工单位" prop="belowUnit">
<!-- <el-input
v-model="form.belowUnit"
@ -261,7 +297,103 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="职务" prop="post">
<el-select
v-model="form.post"
placeholder="请选择职务"
filterable
clearable
size="small"
style="width: 100%"
>
<el-option
v-for="dict in postOptions"
:key="dict.dictLabel + dict.id"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.post == '2'">
<el-form-item label="工种分类" prop="trades">
<el-select
v-model="form.trades"
placeholder="请选择工种分类"
filterable
clearable
size="small"
style="width: 100%"
>
<el-option
v-for="dict in tradesOptions"
:key="dict.dictLabel + dict.id"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入场时间" prop="admissionTime">
<!-- <el-input v-model="form.admissionTime" placeholder="请输入入场时间" /> -->
<el-date-picker
clearable
size="small"
style="width: 100%"
v-model="form.admissionTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择入场时间"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="退场时间" prop="exitTime">
<!-- <el-input v-model="form.exitTime" placeholder="请输入退场时间" /> -->
<el-date-picker
clearable
size="small"
style="width: 100%"
v-model="form.exitTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择退场时间"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="劳动合同" prop="employmentContracts">
<MyUpload :fileList="fileList1" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="社保"
prop="socialSecurity"
v-if="form.post == '3'"
>
<MyUpload :fileList="fileList2" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="任命文件"
prop="appointmentDocuments"
v-if="form.post == '3'"
>
<MyUpload :fileList="fileList3" />
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item
label="所属单位统一社会信用代码"
prop="socialCreditCode"
@ -273,16 +405,6 @@
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="身份证号码" prop="idNo">
<el-input v-model="form.idNo" placeholder="请输入身份证号码" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="出生日期" prop="birthday">
<el-date-picker
@ -306,7 +428,7 @@
<el-form-item label="籍贯" prop="nativePlace">
<el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
</el-form-item>
</el-col>
</el-col> -->
</el-form>
</el-row>
<div slot="footer" class="dialog-footer">
@ -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("新增成功");

16
jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue

@ -56,7 +56,7 @@
</el-descriptions-item>
</el-descriptions>
<div class="listTitle">
<!-- <div class="listTitle">
<span>施工组织设计</span>
</div>
<el-descriptions
@ -101,9 +101,9 @@
<template slot="label"> 批复意见 </template>
{{ this.preMsg.approvalOpinion2 }}
</el-descriptions-item>
</el-descriptions>
</el-descriptions> -->
<div class="listTitle">
<!-- <div class="listTitle">
<span>施工准备措施</span>
</div>
<el-descriptions
@ -141,9 +141,9 @@
<template slot="label"> 施工准备措施内容 </template>
{{ this.preMsg.approvalOpinion3 }}
</el-descriptions-item>
</el-descriptions>
</el-descriptions> -->
<div class="listTitle">
<!-- <div class="listTitle">
<span>施工准备措施检查</span>
</div>
<el-descriptions
@ -181,8 +181,8 @@
<template slot="label"> 批复意见 </template>
{{ this.preMsg.approvalOpinion4 }}
</el-descriptions-item>
</el-descriptions>
</el-descriptions> -->
<!--
<div class="listTitle">
<span>项目开工文件</span>
</div>
@ -228,7 +228,7 @@
<template slot="label"> 批复意见 </template>
{{ this.preMsg.approvalOpinion5 }}
</el-descriptions-item>
</el-descriptions>
</el-descriptions> -->
<el-dialog
:title="title"

9
jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue

@ -591,10 +591,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;
getBidPrequ(id).then((response) => {
this.preMsg = response.data;

15
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;

7
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) {

9
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;

7
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) {

1
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;

10
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;

7
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) {

7
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) {

7
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) {

10
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;

7
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) {

10
jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue

@ -121,7 +121,6 @@
label="招标项目名称"
align="center"
prop="bidProjectName"
:formatter="projectNameFormat"
min-width="150"
/>
<el-table-column
@ -850,10 +849,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;
getBidResult(id).then((response) => {
this.resMsg = response.data;

4
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,

2
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",

Loading…
Cancel
Save