From f5c05688d7d8db870f2b7daed6f09d8e965d17da Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 17 Jul 2024 15:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=20=E5=8E=BB=E9=99=A4=20=E6=A3=80=E6=9F=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=B6=E5=AE=9A=20=E6=96=B0=E5=A2=9E=E6=97=A0?= =?UTF-8?q?=E6=96=B0=E8=A1=8C=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/BS/checkPlanNotice.vue | 22 ++--- pages/apply/subPages/BS/plan.vue | 98 +++++++++++--------- pages/apply/subPages/BS/safeCheckAudit.vue | 20 ++-- pages/apply/subPages/BS/safeCheckCheck.vue | 26 +++--- pages/apply/subPages/BS/safeCheckSign.vue | 24 ++--- pages/apply/subPages/BS/safeCheckSignDIY.vue | 4 +- 6 files changed, 101 insertions(+), 93 deletions(-) diff --git a/pages/apply/subPages/BS/checkPlanNotice.vue b/pages/apply/subPages/BS/checkPlanNotice.vue index 90c915b..d69b36a 100644 --- a/pages/apply/subPages/BS/checkPlanNotice.vue +++ b/pages/apply/subPages/BS/checkPlanNotice.vue @@ -34,12 +34,12 @@ - 检查项目分类 + 检查人员 0) { - for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) { - CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? " " : "") + res - .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; - } - } + // let CheckProjectCategoryNAME = '' + // if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) { + // for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) { + // CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? " " : "") + res + // .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; + // } + // } this.model.RiskAreaNAME = strRiskAreaNAME this.model.CheckProjectNAME = strCheckProjectNAME - this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME + // this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME // Nav_ListSafeCheckDetail: [{ diff --git a/pages/apply/subPages/BS/plan.vue b/pages/apply/subPages/BS/plan.vue index 3e5139c..0ae36aa 100644 --- a/pages/apply/subPages/BS/plan.vue +++ b/pages/apply/subPages/BS/plan.vue @@ -64,12 +64,12 @@ - - + --> - - + --> { e.Nav_CheckProject = null }) - this.modelEdit.Nav_ListCheckProjectCategory.forEach(e => { - e.Nav_CheckProjectCategory = null - }) + // this.modelEdit.Nav_ListCheckProjectCategory.forEach(e => { + // e.Nav_CheckProjectCategory = null + // }) // 行数据处理 把选择人 分别插入 每行的人员信息 this.modelEdit.Nav_ListSafeCheckDetail.forEach(e => { @@ -565,8 +572,8 @@ extendInclude(json, "Nav_ListCheckRiskArea.Nav_RiskArea"); extendInclude(json, "Nav_ListCheckProject"); extendInclude(json, "Nav_ListCheckProject.Nav_CheckProject"); - extendInclude(json, "Nav_ListCheckProjectCategory"); - extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory"); + // extendInclude(json, "Nav_ListCheckProjectCategory"); + // extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory"); extendInclude(json, "Nav_Files.Nav_ImgFile.Nav_File"); extendInclude(json, "Nav_ListSafeCheckDetail"); extendInclude(json, "Nav_ListSafeCheckDetail.Nav_CheckArea"); @@ -609,18 +616,18 @@ } let CheckProjectCategoryNAME = '' - if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) { - for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) { - if (idCheck.indexOf(res.Nav_ListCheckProjectCategory[i] - .CHECK_PROJECT_CATEGORY_ID) == - - 1) { - idCheck.push(res.Nav_ListCheckProjectCategory[i].CHECK_PROJECT_CATEGORY_ID) - CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") + - res - .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; - } - } - } + // if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) { + // for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) { + // if (idCheck.indexOf(res.Nav_ListCheckProjectCategory[i] + // .CHECK_PROJECT_CATEGORY_ID) == - + // 1) { + // idCheck.push(res.Nav_ListCheckProjectCategory[i].CHECK_PROJECT_CATEGORY_ID) + // CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") + + // res + // .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; + // } + // } + // } let CheckProjectNAME = '' if (res.Nav_ListCheckProject && res.Nav_ListCheckProject.length > 0) { @@ -641,12 +648,12 @@ .total) } this.model.RiskAreaNAME = strRiskAreaNAME - this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME + // this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME this.model.CheckProjectNAME = CheckProjectNAME } else { this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail this.model.RiskAreaNAME = strRiskAreaNAME - this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME + // this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME this.model.CheckProjectNAME = CheckProjectNAME this.total = 0 } @@ -882,7 +889,7 @@ extendRule(json, 'NAME', 9, p.val); } json.Sort = 'NAME' - + // if (this.model.CHECKOBJECT != 0) { // json.FilterGroup.Rules.push({ // 'Field': "MineType", @@ -1175,12 +1182,13 @@ OrderPagedSafeCheckDetail(json).then(res => { this.model.Nav_ListSafeCheckDetail = [] this.model.Nav_ListSafeCheckDetail = res - + this.total = this.model.Nav_ListSafeCheckDetail.length if (this.total > 10) { this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10) } else { - this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this.total) + this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this + .total) } }) } diff --git a/pages/apply/subPages/BS/safeCheckAudit.vue b/pages/apply/subPages/BS/safeCheckAudit.vue index d68b946..decbda8 100644 --- a/pages/apply/subPages/BS/safeCheckAudit.vue +++ b/pages/apply/subPages/BS/safeCheckAudit.vue @@ -40,11 +40,11 @@ border="surround"> - 检查项目分类 + @@ -228,17 +228,17 @@ } } - let CheckProjectCategoryNAME = '' - if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) { - for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) { - CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") + res - .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; - } - } + // let CheckProjectCategoryNAME = '' + // if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) { + // for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) { + // CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") + res + // .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; + // } + // } this.model.RiskAreaNAME = strRiskAreaNAME this.model.CheckProjectNAME = strCheckProjectNAME - this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME + // this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME // this.isLoadOK = true if (this.model.Nav_ListSafeCheckDetail != null && this.model.Nav_ListSafeCheckDetail.length > diff --git a/pages/apply/subPages/BS/safeCheckCheck.vue b/pages/apply/subPages/BS/safeCheckCheck.vue index 939a1ce..9413629 100644 --- a/pages/apply/subPages/BS/safeCheckCheck.vue +++ b/pages/apply/subPages/BS/safeCheckCheck.vue @@ -24,11 +24,11 @@ - 检查项目分类 + 附件 @@ -186,7 +186,7 @@ }], CHECKTIME: '', RiskAreaNAME: '', - CheckProjectCategoryNAME: '', + // CheckProjectCategoryNAME: '', Nav_ListSafeCheckDetail: { ID: '', SAFE_CHECK_ID: '', @@ -289,8 +289,8 @@ extendInclude(json, "Nav_ListCheckRiskArea.Nav_RiskArea"); // extendInclude(json, "Nav_ListCheckProject"); // extendInclude(json, "Nav_ListCheckProject.Nav_CheckProject"); - extendInclude(json, "Nav_ListCheckProjectCategory"); - extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory"); + // extendInclude(json, "Nav_ListCheckProjectCategory"); + // extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory"); extendInclude(json, "Nav_Files.Nav_ImgFile.Nav_File"); extendInclude(json, "Nav_ListSafeCheckDetail"); extendInclude(json, "Nav_ListSafeCheckDetail.Nav_CheckArea"); @@ -364,16 +364,16 @@ i].Nav_RiskArea.NAME; } } - let CheckProjectCategoryNAME = '' - if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) { - for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) { - CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? " " : "") + res - .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; - } - } + // let CheckProjectCategoryNAME = '' + // if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) { + // for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) { + // CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? " " : "") + res + // .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME; + // } + // } this.model.RiskAreaNAME = strRiskAreaNAME - this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME + // this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME this.isLoadOK = true }) }, diff --git a/pages/apply/subPages/BS/safeCheckSign.vue b/pages/apply/subPages/BS/safeCheckSign.vue index e77a8c3..3e25879 100644 --- a/pages/apply/subPages/BS/safeCheckSign.vue +++ b/pages/apply/subPages/BS/safeCheckSign.vue @@ -38,11 +38,11 @@ - 检查项目分类 +