From 245c9bacf5a3ff269b79383b175874992bcfaa59 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Tue, 19 Mar 2024 18:04:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectStatistics/statistics/fwzbcb.js | 8 + .../projectStatistics/statistics/jszbcb.js | 10 + .../projectStatistics/statistics/zhzbcb.js | 8 + .../preparationForConstruction.vue | 10 +- .../options/engineeringQualityInspection.vue | 17 +- .../components/segmentProject.vue | 41 +- .../warning/options/warnMsg/index.vue | 46 +- .../comprehensiveInfo/index.vue | 86 +++ .../enterpriseInformation/index.vue | 12 + .../options/basePage.vue | 12 + .../comprehensiveStatistics.vue | 542 ++++++++++++++++ .../constructionInvestment.vue | 577 ++++++++++++++++++ .../indexSubmission/index.vue | 6 + .../indexSubmission/serviceIndustry.vue | 543 ++++++++++++++++ .../projectProcess/index.vue | 3 + .../projectStatisticsInvest/index.vue | 4 +- .../projectStatisticsMsg/index.vue | 4 +- .../projectStatisticsProgress/index.vue | 4 +- 18 files changed, 1889 insertions(+), 44 deletions(-) create mode 100644 jwtech-admin-page/src/views/projectStatistics/indexSubmission/comprehensiveStatistics.vue create mode 100644 jwtech-admin-page/src/views/projectStatistics/indexSubmission/constructionInvestment.vue create mode 100644 jwtech-admin-page/src/views/projectStatistics/indexSubmission/index.vue create mode 100644 jwtech-admin-page/src/views/projectStatistics/indexSubmission/serviceIndustry.vue diff --git a/jwtech-admin-page/src/api/projectStatistics/statistics/fwzbcb.js b/jwtech-admin-page/src/api/projectStatistics/statistics/fwzbcb.js index 5047d64a..324ca15c 100644 --- a/jwtech-admin-page/src/api/projectStatistics/statistics/fwzbcb.js +++ b/jwtech-admin-page/src/api/projectStatistics/statistics/fwzbcb.js @@ -1,5 +1,13 @@ import request from '@/utils/request' +// 修改多条服务业指标 +export function updateBatch(query) { + return request({ + url: '/statistics/fwzbcb/updateBatch', + method: 'put', + data: query + }) +} // 查询服务业指标从列表 export function listFwzbcb(query) { return request({ diff --git a/jwtech-admin-page/src/api/projectStatistics/statistics/jszbcb.js b/jwtech-admin-page/src/api/projectStatistics/statistics/jszbcb.js index 4bd3fe4d..2794d9f9 100644 --- a/jwtech-admin-page/src/api/projectStatistics/statistics/jszbcb.js +++ b/jwtech-admin-page/src/api/projectStatistics/statistics/jszbcb.js @@ -1,5 +1,15 @@ import request from '@/utils/request' + +// 修改多条建设指标 +export function updateBatch(query) { + return request({ + url: '/statistics/jszbcb/updateBatch', + method: 'put', + data: query + }) +} + // 查询建设指标从列表 export function listJszbcb(query) { return request({ diff --git a/jwtech-admin-page/src/api/projectStatistics/statistics/zhzbcb.js b/jwtech-admin-page/src/api/projectStatistics/statistics/zhzbcb.js index fefd2241..54b16692 100644 --- a/jwtech-admin-page/src/api/projectStatistics/statistics/zhzbcb.js +++ b/jwtech-admin-page/src/api/projectStatistics/statistics/zhzbcb.js @@ -1,5 +1,13 @@ import request from '@/utils/request' +// 修改多条综合指标 +export function updateBatch(query) { + return request({ + url: '/statistics/zhzbcb/updateBatch', + method: 'put', + data: query + }) +} // 查询综合指标从列表 export function listZhzbcb(query) { return request({ 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 a11060ee..c97241db 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue @@ -612,19 +612,19 @@ export default { // 表单校验 rules: { approvalOpinion1: [ - { max: 65500, message: "字符长度最大为65500", trigger: "blur" }, + { max: 500, message: "字符长度最大为500", trigger: "blur" }, ], approvalOpinion2: [ - { max: 65500, message: "字符长度最大为65500", trigger: "blur" }, + { max: 500, message: "字符长度最大为500", trigger: "blur" }, ], approvalOpinion3: [ - { max: 65500, message: "字符长度最大为65500", trigger: "blur" }, + { max: 500, message: "字符长度最大为500", trigger: "blur" }, ], approvalOpinion4: [ - { max: 65500, message: "字符长度最大为65500", trigger: "blur" }, + { max: 500, message: "字符长度最大为500", trigger: "blur" }, ], approvalOpinion5: [ - { max: 65500, message: "字符长度最大为65500", trigger: "blur" }, + { max: 500, message: "字符长度最大为500", trigger: "blur" }, ], }, // 请求头 diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue index 4b0e71da..1c65f2b8 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue @@ -11,10 +11,11 @@ clearable size="small" style="width: 100%" - v-model="queryParams.applyTime" + v-model="queryParams.data.applyTime" type="date" value-format="yyyy-MM-dd" placeholder="选择申请时间" + @change="handleQuery" > @@ -36,7 +37,7 @@ - + + - + - -
单元工程编号
-
位置
-
操作
-
-
+ --> - + - - - - - 删除 - + --> + +
@@ -603,7 +588,7 @@ export default { padding: 10px; .dialog-footer { display: flex; - justify-content: right; + justify-content: center; margin-bottom: 5px; } ::v-deep { diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue index 37b7c391..4122bc26 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue @@ -92,8 +92,9 @@ :visible.sync="open" direction="btt" :before-close="handleClose" + :wrapperClosable="false" > -
+ + + + + + {{ baseForm.projectName }} + + + + {{ baseForm.unit }} + + + + {{ $formatAdcd({ adcd: baseForm.adcd }) }} + + + + {{ baseForm.contractName }} + + + + {{ baseForm.warnType }} + + + + {{ baseForm.warnResult }} + + @@ -238,12 +276,12 @@ - + @@ -369,8 +437,10 @@ export default { zhxxList: [], // 弹出层标题 title: "", + viewTitle: "", // 是否显示弹出层 open: false, + viewOpen: false, // 查询参数 queryParams: { pageNum: 1, @@ -414,6 +484,7 @@ export default { jianwei: "jwtech " + getToken(), }, fileList1: [], + comMsg: {}, }; }, created() { @@ -441,6 +512,16 @@ export default { this.open = false; this.reset(); }, + viewInfo(row) { + getZhxx(row.id).then((res) => { + this.comMsg = res.data; + console.log("comMsg", row); + this.viewOpen = true; + }); + }, + closeView() { + this.comMsg = {}; + }, // 表单重置 reset() { this.fileList1 = []; @@ -593,6 +674,11 @@ export default { let file = JSON.parse(fileList)[index]; this.handlePreview(file); }, + // 查看信息中, 下载 + downloadFile2(info, index) { + console.log(info); + this.handleFilePreview(info); + }, // 点击预览的文件进行下载 handlePreview(file) { // console.log(file); diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue index c116b189..2a5d5b24 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue @@ -698,6 +698,12 @@ export default { ], corporateIdNumber: [ { max: 250, message: "字符长度最大为250", trigger: "blur" }, + { + pattern: + /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, + message: "请输入正确的身份证号", + trigger: "blur", + }, ], // score: [ // { required: true, message: "请输入信用分数", trigger: "blur" }, @@ -768,6 +774,12 @@ export default { ], unifiedSocialCreditCode: [ { max: 250, message: "字符长度最大为250", trigger: "blur" }, + { + pattern: + /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, + message: "请输入正确的统一社会信用代码", + trigger: "blur", + }, ], creditCodeIssuingAuthority: [ { max: 250, message: "字符长度最大为250", trigger: "blur" }, diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue index 316e5771..b9792f5f 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue @@ -374,6 +374,12 @@ export default { ], corporateIdNumber: [ { max: 250, message: "字符长度最大为250", trigger: "blur" }, + { + pattern: + /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, + message: "请输入正确的身份证号", + trigger: "blur", + }, ], // score: [ // { required: true, message: "请输入信用分数", trigger: "blur" }, @@ -444,6 +450,12 @@ export default { ], unifiedSocialCreditCode: [ { max: 250, message: "字符长度最大为250", trigger: "blur" }, + { + pattern: + /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, + message: "请输入正确的统一社会信用代码", + trigger: "blur", + }, ], creditCodeIssuingAuthority: [ { max: 250, message: "字符长度最大为250", trigger: "blur" }, diff --git a/jwtech-admin-page/src/views/projectStatistics/indexSubmission/comprehensiveStatistics.vue b/jwtech-admin-page/src/views/projectStatistics/indexSubmission/comprehensiveStatistics.vue new file mode 100644 index 00000000..eb3a0b71 --- /dev/null +++ b/jwtech-admin-page/src/views/projectStatistics/indexSubmission/comprehensiveStatistics.vue @@ -0,0 +1,542 @@ + + + + diff --git a/jwtech-admin-page/src/views/projectStatistics/indexSubmission/constructionInvestment.vue b/jwtech-admin-page/src/views/projectStatistics/indexSubmission/constructionInvestment.vue new file mode 100644 index 00000000..e4064244 --- /dev/null +++ b/jwtech-admin-page/src/views/projectStatistics/indexSubmission/constructionInvestment.vue @@ -0,0 +1,577 @@ + + + + diff --git a/jwtech-admin-page/src/views/projectStatistics/indexSubmission/index.vue b/jwtech-admin-page/src/views/projectStatistics/indexSubmission/index.vue new file mode 100644 index 00000000..dd355f15 --- /dev/null +++ b/jwtech-admin-page/src/views/projectStatistics/indexSubmission/index.vue @@ -0,0 +1,6 @@ + diff --git a/jwtech-admin-page/src/views/projectStatistics/indexSubmission/serviceIndustry.vue b/jwtech-admin-page/src/views/projectStatistics/indexSubmission/serviceIndustry.vue new file mode 100644 index 00000000..c6aa77ab --- /dev/null +++ b/jwtech-admin-page/src/views/projectStatistics/indexSubmission/serviceIndustry.vue @@ -0,0 +1,543 @@ + + + + diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/index.vue index bcbfce8f..cdb171ba 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/index.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/index.vue @@ -225,6 +225,9 @@ export default { created() { this.routeList = JSON.parse(this.$store.state.basePageData.routeList); this.getList(); + if (this.$route.query.activeName) { + this.activeName = this.$route.query.activeName; + } }, methods: { /** 查询专题项目前期背景信息列表 */ diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue index 836939f7..fbec59fd 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue @@ -338,7 +338,9 @@ export default { // 跳转到选项卡页面 this.$router.push({ // path: "/project/special/options", - path: "/projectStatistics/projectProcess?baseDataId=" + row.id, + path: + "/projectStatistics/projectProcess?activeName=investment&baseDataId=" + + row.id, }); }, // 项目类型字典翻译 diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue index 9e902c23..69f763f1 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue @@ -270,7 +270,9 @@ export default { // 跳转到选项卡页面 this.$router.push({ // path: "/project/special/options", - path: "/projectStatistics/projectProcess?baseDataId=" + row.id, + path: + "/projectStatistics/projectProcess?activeName=projectAcceptance&baseDataId=" + + row.id, }); }, // 项目类型字典翻译 diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue index bae5dcfb..91981409 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue @@ -268,7 +268,9 @@ export default { // 跳转到选项卡页面 this.$router.push({ // path: "/project/special/options", - path: "/projectStatistics/projectProcess?baseDataId=" + row.id, + path: + "/projectStatistics/projectProcess?activeName=scheduleManagement&baseDataId=" + + row.id, }); }, // 项目类型字典翻译