diff --git a/pages/apply/subPages/SK/riskDouPreEditNew.vue b/pages/apply/subPages/SK/riskDouPreEditNew.vue
index 2d38804..6756ad7 100644
--- a/pages/apply/subPages/SK/riskDouPreEditNew.vue
+++ b/pages/apply/subPages/SK/riskDouPreEditNew.vue
@@ -9,19 +9,19 @@
基本信息填写
-
+
-
+
-
+
@@ -52,19 +52,19 @@
辨识内容
-
-
+
+
-
+
-
-
-
+
+
+
@@ -80,104 +80,100 @@
-->
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+ 新增管控措施
+
+
+
+
+
+
+
-
+
-
+
+
+
-
-
-
-
-
- {{index2+1+'.检查内容 : ' +item2.Nav_Contents.CHECKCONTENT}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
+
-
+
-
+
@@ -185,13 +181,13 @@
-
-
+
-
-
+
@@ -201,31 +197,27 @@
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
@@ -239,79 +231,70 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+ 新增辨识层级
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增管控层级
+
+
+
-
+
- {{index1+1+'.管控部门 : ' +item1.Nav_Department.NAME}}
+ {{item1.Nav_Department?index1+1+'.管控部门 : ' +item1.Nav_Department.NAME:index1+1+'.'}}
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
- {{index1+1+'.辨识部门 : ' +item1.Nav_Department.NAME}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -376,7 +359,9 @@
GetRiskNameInfo,
GetScorel,
GetScoree,
- GetScorec
+ GetScorec,
+ GetNewRiskAreaInfo,
+ GetNewRiskTypeInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getRequest,
@@ -492,7 +477,7 @@
onLoad(option) {
this.TaskID = option.taskID ? option.taskID : '';
this.ID = option.ID ? option.ID : '';
- this.fetchEnums(['SKHiddenLevel', 'SKProductionUnit', 'SKEvaluateLevelEnum', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum']);
+ this.fetchEnums(['SKHiddenLevel', 'SKProductionUnit', 'SKEvaluateLevelEnum', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum', 'SKMarkEnum']);
},
methods: {
fetchEnums(enumNames) {
@@ -548,40 +533,34 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2
this.model.Nav_DoubleDetails.map(item => {
item['showPack'] = false
- item.Nav_SCOREL = item.Nav_SCOREL ? item.Nav_SCOREL : {
- SCORE: ''
- }
- item.Nav_SCOREE = item.Nav_SCOREE ? item.Nav_SCOREE : {
- SCORE: ''
- }
- item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
- SCORE: ''
- }
-
+ item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item4 => item4.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailPosts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item4 => item4.code === item1.DEPARTMENT_TYPE).name : '';
})
- item.Nav_DetailDeparts.map(item1 => { //辨识岗位
- if (item1.Nav_DepartDetails.length > 0) {
- let areaShow = ''
- item1.Nav_DepartDetails.map(o => {
- areaShow += o.Nav_Post.NAME
- })
- item1['Nav_DepartDetailsName'] = areaShow
- } else {
- item1['Nav_DepartDetailsName'] = ''
- }
- })
- if (item.Nav_DoubleDetailMeasures.length > 0) { //管控措施
+ if (item.Nav_DetailDeparts && item.Nav_DetailDeparts.length > 0) {
+ item.Nav_DetailDeparts.map(item1 => {
+ if (item1.Nav_DepartDetails && item1.Nav_DepartDetails.length > 0) {
+ let Nav_ResultPostDetsName = ''
+ item1.Nav_DepartDetails.map(item2 => {
+ if (item2.Nav_Post && item2.Nav_Post.NAME !== null) {
+ Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' ';
+ }
+ })
+ item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName
+ }
+ })
+
+ }
+ if (item.Nav_DoubleDetailMeasures && item.Nav_DoubleDetailMeasures.length > 0) { //管控措施
item.Nav_DoubleDetailMeasures.map(item1 => {
item1['ishowCheckCo'] = false
- if (item1.Nav_DetailMeasureContents.length > 0) { //检查内容
+ if (item1.Nav_DetailMeasureContents && item1.Nav_DetailMeasureContents.length > 0) { //检查内容
item1.Nav_DetailMeasureContents.map(item2 => {
item2['ishowCheckLe'] = false
item2['ishowRiskDes'] = false
- if (item2.Nav_DetailMeasureContentBasics.length > 0) {
+ if (item2.Nav_DetailMeasureContentBasics && item2.Nav_DetailMeasureContentBasics.length > 0) {
let areaShow = ''
item2.Nav_DetailMeasureContentBasics.map(o => {
if (o.Nav_Law && o.Nav_Law.NAME) {
@@ -593,7 +572,7 @@
} else {
item2['Nav_DetailMeasureContentBasicsName'] = ''
}
- if (item2.Nav_DetailMeasureContentPosts.length > 0) {
+ if (item2.Nav_DetailMeasureContentPosts && item2.Nav_DetailMeasureContentPosts.length > 0) {
item2.Nav_DetailMeasureContentPosts.map(item3 => {
item3.CHECK_CYCLEName = item3.CHECK_CYCLE !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item4 => item4.code === item3
.CHECK_CYCLE).name : '';
@@ -610,13 +589,10 @@
}
})
}
- if (item2.Nav_DetailMeasureContentHiddens.length > 0) {
+ if (item2.Nav_DetailMeasureContentHiddens && item2.Nav_DetailMeasureContentHiddens.length > 0) {
item2.Nav_DetailMeasureContentHiddens.map(item3 => {
- item3.Nav_Question = item3.Nav_Question ? item3.Nav_Question : {
- DESCREPTION: ''
- },
- item3.HIDDEN_LEVELName = item3.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item4 => item4.code === item3
- .HIDDEN_LEVEL).name : '';
+ item3.HIDDEN_LEVELName = item3.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item4 => item4.code === item3
+ .HIDDEN_LEVEL).name : '';
})
}
@@ -625,21 +601,11 @@
}
})
}
-
})
})
},
- handleShowSheetForArea(item, todo) {
- const validDetails = this.model.Nav_DoubleDetails.filter(i => !i.IS_DELETED);
- const index = validDetails.indexOf(item);
- this.handleShowSheet({
- title: todo.title,
- name: todo.name,
- index: index
- });
- },
async handleShowSheet(p) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
@@ -670,6 +636,7 @@
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
}
}
return res.Data
@@ -680,6 +647,7 @@
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
}
}
return res.Data
@@ -690,6 +658,138 @@
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].SCORE
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == "Nav_Area") {
+ dataSelect = await GetNewRiskAreaInfo(json).then(res => {
+ this.selectorInfo.totalCount = res.TotalCount
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == "Nav_Type") {
+ dataSelect = await GetNewRiskTypeInfo(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == "Nav_Department") {
+ dataSelect = await GetDepartmentInfo(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == "Nav_ResultPostDets") {
+ this.selectorInfo.isMultiple = true
+ if (p.itemData.DEPARTMENT_ID) {
+ extendRule(json, 'DEPARTMENT_ID', 1, p.itemData.DEPARTMENT_ID);
+ }
+ json.SelectField = ["ID", "NAME", "NAME"]
+ dataSelect = await GetPostOrderPaged(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.length; i++) {
+ res[i].name = res.Data[i].NAME
+ res[i].code = res.Data[i].CODE
+ }
+ }
+ return res.Data
+ })
+ if (p.itemData.Nav_PostDetails && p.itemData.Nav_PostDetails.length > 0) {
+ // this.selectorInfo.defaultChecked = []
+
+ p.itemData.Nav_PostDetails.filter(i => !i.IS_DELETED).forEach(e => {
+ if (e.Nav_Post != null && e.Nav_Post.NAME != null)
+ defaultChecked.push(e.Nav_Post)
+ })
+ } else {
+ defaultChecked = null
+ }
+ } else if (p.name == 'Nav_DetailDeparts') {
+ json.Include = ['Nav_User']
+ dataSelect = await GetDepartmentInfo(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'Sub_Nav_Contents') {
+ json.Sort = 'CHECKCONTENT'
+ dataSelect = await GetCheckContentsInfo(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].CHECKCONTENT
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'CheckThreeDep') {
+ dataSelect = await GetDepartmentInfo(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'CheckThreeType') {
+ json.Include = ['Nav_ProductionUnit']
+ dataSelect = await CheckTypeNewOrderPaged(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ res.Data[i].code = res.Data[i].Nav_ProductionUnit.NAME
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'RiskDesThree') {
+ json.Sort = 'DESCREPTION'
+ dataSelect = await GetHiddenScripList(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].DESCREPTION
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'CheckArea') {
+ dataSelect = await GetRiskAreaInfo(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'CheckContent') {
+ dataSelect = await GetCheckContentsInfo(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].CHECKCONTENT
+ }
+ }
+ return res.Data
+ })
+ } else if (p.name == 'RiskDes') {
+ json.Sort = 'DESCREPTION'
+ dataSelect = await GetHiddenScripList(json).then(res => {
+ if (res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].DESCREPTION
}
}
return res.Data
@@ -729,57 +829,118 @@
handleSelected(e) {
this.selectorInfo.showPopup = false
- const validDetails = this.model.Nav_DoubleDetails.filter(i => !i.IS_DELETED);
- const index = this.selectorInfo.index;
- const realIndex = this.model.Nav_DoubleDetails.findIndex(item => item === validDetails[index]);
- if (this.selectorInfo.name == 'EVALUATE_L') {
- this.model.Nav_DoubleDetails[realIndex].Nav_SCOREL = e;
- this.model.Nav_DoubleDetails[realIndex].SCOREL_ID = e.ID;
- } else if (this.selectorInfo.name == 'EVALUATE_E') {
- this.model.Nav_DoubleDetails[realIndex].Nav_SCOREE = e;
- this.model.Nav_DoubleDetails[realIndex].SCOREE_ID = e.ID;
- } else if (this.selectorInfo.name == 'EVALUATE_C') {
- this.model.Nav_DoubleDetails[realIndex].Nav_SCOREC = e;
- this.model.Nav_DoubleDetails[realIndex].SCOREC_ID = e.ID;
+ if (this.selectorInfo.name == 'EVALUATE_L' || this.selectorInfo.name == 'EVALUATE_E' || this.selectorInfo.name == 'EVALUATE_C') {
+ if (this.selectorInfo.name == 'EVALUATE_L') {
+ this.selectorInfo.itemData.Nav_SCOREL = e;
+ this.selectorInfo.itemData.SCOREL_ID = e.ID;
+ } else if (this.selectorInfo.name == 'EVALUATE_E') {
+ this.selectorInfo.itemData.Nav_SCOREE = e;
+ this.selectorInfo.itemData.SCOREE_ID = e.ID;
+ } else if (this.selectorInfo.name == 'EVALUATE_C') {
+ this.selectorInfo.itemData.Nav_SCOREC = e;
+ this.selectorInfo.itemData.SCOREC_ID = e.ID;
+ }
+
+ let l = this.selectorInfo.itemData.Nav_SCOREL.SCORE
+ let o = this.selectorInfo.itemData.Nav_SCOREE.SCORE
+ let c = this.selectorInfo.itemData.Nav_SCOREC.SCORE
+ this.selectorInfo.itemData.EVALUATE_SCORE = Math.round(l * o * c)
+ let D = this.selectorInfo.itemData.EVALUATE_SCORE
+ if (D >= 320) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "重大风险";
+ } else if (D >= 160 && D < 320) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "较大风险";
+ } else if (D >= 70 && D < 160) {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "一般风险";
+ } else {
+ this.selectorInfo.itemData.EVALUATE_LEVELName = "低风险";
+ }
+ this.selectorInfo.itemData.EVALUATE_LEVEL = this.selectorInfo.itemData.EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this.selectorInfo.itemData
+ .EVALUATE_LEVELName).code : ''
+
+ this.$forceUpdate()
}
- let l = this.model.Nav_DoubleDetails[realIndex].Nav_SCOREL.SCORE
- let o = this.model.Nav_DoubleDetails[realIndex].Nav_SCOREE.SCORE
- let c = this.model.Nav_DoubleDetails[realIndex].Nav_SCOREC.SCORE
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_SCORE = l * o * c
- let D = this.model.Nav_DoubleDetails[realIndex].EVALUATE_SCORE
- if (D >= 320) {
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName = "重大风险";
- } else if (D >= 160 && D < 320) {
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName = "较大风险";
- } else if (D >= 70 && D < 160) {
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName = "一般风险";
- } else {
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName = "低风险";
+ if (this.selectorInfo.name == 'Nav_Area') {
+ this.selectorInfo.itemData.Nav_Area = e
+ this.selectorInfo.itemData.AREA_ID = e.ID
+ } else if (this.selectorInfo.name == 'Nav_Type') {
+ this.selectorInfo.itemData.Nav_Type = e
+ this.selectorInfo.itemData.TYPE_ID = e.ID
+ } else if (this.selectorInfo.name == 'Nav_Department') {
+ this.selectorInfo.itemData.Nav_Department = e
+ this.selectorInfo.itemData.DEPARTMENT_ID = e.ID
+ } else if (this.selectorInfo.name == 'Nav_DetailDeparts') {
+ this.selectorInfo.itemData.Nav_Department = e
+ this.selectorInfo.itemData.DEPARTMENT_ID = e.ID
+ this.selectorInfo.itemData.Nav_User = e.Nav_User
+ this.selectorInfo.itemData.USER_ID = e.Nav_User?.ID
+
+ } else if (this.selectorInfo.name == 'Nav_ResultPostDets') {
+ let listArea = []
+ let areaShow = ''
+ if (e.length > 0) {
+ e.forEach((item, i) => {
+ if (item.name != null || item.NAME != null) {
+ if (i > 0) {
+ areaShow += ' '
+ }
+ listArea.push({
+ ID: guid(),
+ RISK_EVALUATION_DETAIL_POST_ID: this.selectorInfo.itemData.ID,
+ POST_ID: item.ID,
+ ORG_ID: item.ORG_ID,
+ Nav_Post: item
+ })
+ areaShow += item.NAME
+ }
+ })
+ }
+ this.selectorInfo.itemData.Nav_PostDetails = listArea
+ this.selectorInfo.itemData.Nav_ResultPostDetsName = areaShow
+ } else if (this.selectorInfo.name == 'Sub_Nav_Contents') {
+ this.selectorInfo.itemData.Nav_Contents = e
+ this.selectorInfo.itemData.CHECK_CONTENTS_ID = e.ID
+ } else if (this.selectorInfo.name == 'CheckThreeDep') {
+ this.selectorInfo.itemData.Nav_Department = e
+ this.selectorInfo.itemData.DEPARTMENT_ID = e.ID
+ } else if (this.selectorInfo.name == 'CheckThreeType') {
+ this.selectorInfo.itemData.Nav_CheckType = e
+ this.selectorInfo.itemData.CHECK_TYPE_ID = e.ID
+ } else if (this.selectorInfo.name == 'RiskDesThree') {
+ this.selectorInfo.itemData.Nav_Question = e
+ this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID
+ this.selectorInfo.itemData.HIDDEN_LEVEL = e.QUESTION_LEVEL
+ this.selectorInfo.itemData.HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item => item.code == e.QUESTION_LEVEL).NAME
+ this.selectorInfo.itemData.RECTIFICATION_MEASURES = e.DEMAND
+ } else if (this.selectorInfo.name == 'CheckArea') {
+ this.model.Nav_RiskArea = e
+ this.model.RISK_AREA_ID = e.ID
+ } else if (this.selectorInfo.name == 'CheckContent') {
+ this.model.Nav_Contents = e
+ this.model.CHECK_CONTENTS_ID = e.ID
+ } else if (this.selectorInfo.name == 'RiskDes') {
+ this.model.Nav_Question = e
+ this.model.CHECK_QUESTION_ID = e.ID
}
- this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVEL = this.model.Nav_DoubleDetails[realIndex].EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this
- .model
- .Nav_DoubleDetails[
- realIndex].EVALUATE_LEVELName).code : ''
+
},
- handlePack(index) {
- this.model.Nav_DoubleDetails[index].showPack = this.model.Nav_DoubleDetails[index].showPack == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
},
- ishowCheckCo(index, index1) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].ishowCheckCo = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].ishowCheckCo == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowCheckCo(item) {
+ item.ishowCheckCo = item.ishowCheckCo == false ? true : false
+ this.$forceUpdate()
},
- ishowCheckLe(index, index1, index2) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].Nav_DetailMeasureContents[index2].ishowCheckLe = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1]
- .Nav_DetailMeasureContents[index2].ishowCheckLe == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowCheckLe(item) {
+ item.ishowCheckLe = item.ishowCheckLe == false ? true : false
+ this.$forceUpdate()
},
- ishowRiskDes(index, index1, index2) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].Nav_DetailMeasureContents[index2].ishowRiskDes = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1]
- .Nav_DetailMeasureContents[index2].ishowRiskDes == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowRiskDes(item) {
+ item.ishowRiskDes = item.ishowRiskDes == false ? true : false
+ this.$forceUpdate()
},
cancelUnit() {
this.showPopupUnit = false
@@ -878,7 +1039,7 @@
Nav_ProductionUnit: {
NAME: ''
},
- PRODUCTION_UNIT_ID:'',
+ PRODUCTION_UNIT_ID: '',
Nav_Area: {
NAME: ''
},
@@ -901,101 +1062,91 @@
Nav_DetailPosts: [],
Nav_DoubleDetailMeasures: [],
Nav_DetailDeparts: [],
+ DOUBLE_PREVENT_MECHANISM_ID: this.ID,
})
this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
},
- handleNewControlMea(name, index) {
- if (name == 'Mea') {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures.push({
- NUM: 0,
- MEASURES_NAME: '',
- EMERGENCY: '',
- Nav_DetailMeasureContents: []
- })
- } else if (name == 'Lel') {
- this.model.Nav_DoubleDetails[index].Nav_DetailPosts.push({
- DEPARTMENT_TYPE: '',
- Nav_Department: {
- NAME: ''
- },
- Nav_User: {
- NAME: ''
- },
- })
- } else if (name == 'Post') {
- this.model.Nav_DoubleDetails[index].Nav_DetailDeparts.push({
- Nav_Department: {
- NAME: '',
- ID: ''
- },
- Nav_DepartDetails: []
- })
- } else if (name == 'CheckCo') {
- this.model.Nav_DoubleDetails[index[0]].Nav_DoubleDetailMeasures[index[1]].Nav_DetailMeasureContents.push({
- Nav_Contents: {
- CHECKCONTENT: ''
- },
- Nav_DetailMeasureContentBasicsName: '',
- Nav_DetailMeasureContentBasics: [],
- CHECK_STANDARD: '',
- Nav_DetailMeasureContentPosts: [],
- Nav_DetailMeasureContentHiddens: []
- })
- } else if (name == 'CheckThreeLel') {
- this.model.Nav_DoubleDetails[index[0]].Nav_DoubleDetailMeasures[index[1]].Nav_DetailMeasureContents[index[2]].Nav_DetailMeasureContentPosts.push({
- NUM: 0,
- CHECK_TYPE: '',
- Nav_Department: {
- NAME: '',
- ID: ''
- },
- Nav_CheckType: {
- NAME: ''
- },
- CHECK_CYCLE: '',
- Nav_DetailPosts: '',
- })
- } else if (name == 'RiskDesThree') {
- this.model.Nav_DoubleDetails[index[0]].Nav_DoubleDetailMeasures[index[1]].Nav_DetailMeasureContents[index[2]].Nav_DetailMeasureContentHiddens.push({
- Nav_Question: {
- DESCREPTION: ''
- },
- HIDDEN_LEVEL: '一般',
- RECTIFICATION_MEASURES: '',
- })
- }
+ handleNewControlMea(item) {
+ item.Nav_DoubleDetailMeasures.unshift({
+ NUM: 1,
+ ID: guid(),
+ DOUBLE_PREVENT_MECHANISM_DETAIL_ID: item.ID,
+ MEASURES_NAME: '',
+ IS_DELETED: false,
+ Nav_DetailMeasureContents: []
+ })
+ },
+ handleNewPost(item) {
+ item.Nav_DetailDeparts.unshift({
+ ID: guid(),
+ DOUBLE_PREVENT_MECHANISM_DETAIL_ID: item.ID,
+ Nav_Department: {
+ NAME: ''
+ },
+ DEPARTMENT_ID: '',
+ Nav_DepartDetails: [],
+ Nav_ResultPostDetsName: '',
+ IS_DELETED: false,
+ })
+ },
+ handleNewControlLev(item) {
+ item.Nav_DetailPosts.unshift({
+ DEPARTMENT_TYPE: '',
+ Nav_Department: {
+ NAME: ''
+ },
+ Nav_User: {
+ NAME: ''
+ },
+ DOUBLE_PREVENT_MECHANISM_DETAIL_ID: item.ID
+ })
+ },
+ handleNewSubCheck(item) {
+ item.Nav_DetailMeasureContents.unshift({
+ Nav_Contents: {
+ CHECKCONTENT: ''
+ },
+ NUM: 1,
+ ishowCheckLe: false,
+ Nav_DetailMeasureContentPosts: [],
+ ishowRiskDes: false,
+ Nav_DetailMeasureContentHiddens: [],
+ DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_ID: item.ID
+ })
+ },
+ handleNewSubPost(item) {
+ item.Nav_DetailMeasureContentPosts.unshift({
+ NUM: 1,
+ CHECK_TYPEName: '',
+ CHECK_TYPE: '',
+ Nav_Department: {
+ NAME: ''
+ },
+ Nav_CheckType: {
+ NAME: ''
+ },
+ CHECK_CYCLEName: '',
+ CHECK_CYCLE: '',
+ DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID: item.ID
+ })
+ },
+ handleNewSubRisk(item) {
+ item.Nav_DetailMeasureContentHiddens.unshift({
+ NUM: 1,
+ Nav_Question: {
+ DESCREPTION: ''
+ },
+ HIDDEN_LEVEL: '',
+ HIDDEN_LEVELName: '',
+ RECTIFICATION_MEASURES: '',
+ DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID: item.ID
+ })
+ },
- // this.$nextTick(() => {
- // this.$refs.collapse.resize();
- // });
- },
- handleDelRowBefore(name, nowIndex) {
- this.showDelModalIndex = nowIndex[0]
- this.nowName = name
- this.nowIndex = nowIndex
- },
- confirmDel() {
- if (this.nowName == 'Area') {
- this.model.Nav_DoubleDetails.splice(this.nowIndex[0], 1)
- } else if (this.nowName == 'Num') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures.splice(this.nowIndex[1], 1)
- } else if (this.nowName == 'RecDep') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts.splice(this.nowIndex[1], 1)
- } else if (this.nowName == 'CheckCoTwo') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents.splice(this.nowIndex[2], 1)
- } else if (this.nowName == 'CheckNum') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts.splice(this.nowIndex[3], 1)
- } else if (this.nowName == 'RiskDesThree') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentHiddens.splice(this.nowIndex[3], 1)
- } else {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts.splice(this.nowIndex[1], 1)
- }
- this.showDelModalIndex = undefined
-
- },
- cacelDel() {
- this.showDelModalIndex = undefined
+ handleDelRowBefore(item) {
+ item.IS_DELETED = true
+ this.$forceUpdate()
},
cancelRecitifyDate() {
this.showPopupRecitifyDate = false
@@ -1018,275 +1169,10 @@
this.showPopupRecitifyDate = false
},
- handleChangeStep(name, nowIndex) {
- this.currentOperateStep = {}
- this.showPopupStep = true
- this.nowName = name
- this.nowIndex = nowIndex
- this.handleSearchStep('init')
- },
- handleClosePopupStep() {
- this.showPopupStep = false
- this.isMultiple = false
- this.defaultChecked = []
- // this.showPopupCertificate = false
- },
- handleSearchStep(val, pageIndex) {
- const orgId = uni.getStorageSync('orgId')
- const json = initFilter(orgId, "", "", 0, pageIndex ?? 1)
- json.Limit = 20
- if (pageIndex) {
- json.Start = (pageIndex - 1) * json.Limit;
- }
- this.defaultChecked = []
-
- if (val !== 'init') {
- const tempGroup = initFilterGroup(false);
- if (this.nowName == 'CheckContent' || this.nowName == 'CheckCoTwo') {
- extendGroupRule(tempGroup, 'CHECKCONTENT', 9, val)
- } else if (this.nowName == 'RecPost' || this.nowName == 'CheckThreePost') {
- extendGroupRule(tempGroup, 'DESCREPTION', 9, val)
- } else {
- extendGroupRule(tempGroup, 'NAME', 9, val)
- }
- extendFilterGroup(json, tempGroup);
- }
- let requestInfo = this.nowName == 'CheckArea' || this.nowName == 'Area' ? GetRiskAreaInfo :
- this.nowName == 'CheckContent' || this.nowName == 'CheckCoTwo' ? GetCheckContentsInfo :
- this.nowName == 'RiskDes' || this.nowName == 'RiskDesThree' ? GetHiddenScripList :
- this.nowName == 'demand' ? GetSKRequestInfo :
- this.nowName == 'Category' ? GetRiskTypeInfo :
- this.nowName == 'RecPost' || this.nowName == 'CheckThreePost' ? GetPostOrderPaged :
- this.nowName == 'Inspection' ? GetCheckInspection :
- this.nowName == 'CheckThreeType' ? CheckTypeNewOrderPaged :
- this.nowName == 'Dep' || this.nowName == 'RecDep' || this.nowName == 'CheckThreeDep' ?
- GetDepartmentInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : getUserLists
- if (this.nowName == 'CheckThreeType') {
- if (this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID !== undefined && this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID !== null) {
- extendRule(json, 'PRODUCTION_UNIT_ID', 1, String(this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID));
- }
-
- }
- if (this.nowName == 'Inspection') {
- this.isMultiple = true
- let p = this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]]
- if (p.Nav_DetailMeasureContentBasics && p.Nav_DetailMeasureContentBasics.length > 0) {
-
- p.Nav_DetailMeasureContentBasics.map(item => {
- let newId = item.LAW_ID;
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- ID: newId
- };
- // 将新对象添加到 this.defaultChecked 数组中
- this.defaultChecked.push(newItem);
- })
- } else {
- this.defaultChecked = []
- }
- } else if (this.nowName == 'RecPost') {
- this.isMultiple = true
- let p = this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]]
- if (p.Nav_DepartDetails && p.Nav_DepartDetails.length > 0) {
-
- p.Nav_DepartDetails.map(item => {
- let newId = item.Nav_Post ? item.Nav_Post.ID : item.ID;
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- ID: newId
- };
- this.defaultChecked.push(newItem)
- })
- } else {
- this.defaultChecked = []
- }
- if (p.Nav_Department.ID) {
- extendFilterGroupGroupRules(json, 'DEPARTMENT_ID', 1, p.Nav_Department.ID)
- }
-
-
- } else if (this.nowName == 'CheckThreePost') {
- this.isMultiple = true
- let p = this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]]
- if (p.Nav_DetailPosts && p.Nav_DetailPosts.length > 0) {
- p.Nav_DetailPosts.map(item => {
- let newId = item.Nav_Post ? item.Nav_Post.ID : item.ID;
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- ID: newId
- };
- this.defaultChecked.push(newItem)
- })
- } else {
- this.defaultChecked = []
- }
- if (p.Nav_Department.ID) {
- extendFilterGroupGroupRules(json, 'DEPARTMENT_ID', 1, p.Nav_Department.ID)
- }
-
- } else {
- this.isMultiple = false
- }
- json.Limit = 100
- requestInfo(json).then(res => {
- this.stepLists = (res.Data || res).map(i => {
- return {
- ...i,
- id: i.ID,
- name: i.NAME || i.CHECKCONTENT || i.DEMAND,
- }
- })
- this.curTotalStep = res.TotalCount
- // }
- })
-
-
-
- },
- handleSelectedStep(val) {
- this.defaultChecked = []
- if (this.nowName == 'demand') {
- this.model.Nav_Require.NAME = val.NAME
- this.model.REQUIRE_ID = val.ID
- this.model.RequireName = val.NAME
- } else if (this.nowName == 'Area') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_Area.NAME = val.NAME
- this.model.Nav_DoubleDetails[this.nowIndex[0]].AREA_ID = val.ID
- } else if (this.nowName == 'Category') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_Type.NAME = val.NAME
- this.model.Nav_DoubleDetails[this.nowIndex[0]].TYPE_ID = val.ID
- } else if (this.nowName == 'Dep') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts[this.nowIndex[1]].Nav_Department = val
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts[this.nowIndex[1]].DEPARTMENT_ID = val.ID
- } else if (this.nowName == 'RecDep') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_Department = val
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].DEPARTMENT_ID = val.ID
- } else if (this.nowName == 'RecPost') {
- let listArea = []
- let areaShow = ''
- if (val.length > 0) {
- val.forEach((item, i) => {
- if (i > 0) {
- areaShow += ' '
- }
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- MECHANISM_DETAIL_DEPART_ID: item.ID,
- POST_ID: item.ID,
- NAME: item.NAME || item.Nav_Post.NAME,
- };
- listArea.push(newItem)
- if (item.NAME && item.NAME != null) {
- areaShow += item.NAME
- } else if (item.Nav_Post && item.Nav_Post.NAME != null) {
- areaShow += item.Nav_Post.NAME
- }
-
- })
- }
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_DepartDetails = listArea
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_DepartDetailsName = areaShow
- } else if (this.nowName == 'CheckCoTwo') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_Contents.CHECKCONTENT = val.CHECKCONTENT
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].CHECK_CONTENTS_ID = val.ID
- } else if (this.nowName == 'Inspection') {
- let listArea = []
- let areaShow = ''
- if (val.length > 0) {
- val.forEach((item, i) => {
- if (i > 0) {
- areaShow += ' '
- }
- let newItem = {
- ...item,
- LAW_ID: item.ID,
- DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID: item.ID,
- NAME: item.NAME || item.Nav_Law.NAME,
- };
- listArea.push(newItem)
- if (item.NAME && item.NAME != null) {
- areaShow += item.NAME
- } else if (item.Nav_Law && item.Nav_Law.NAME != null) {
- areaShow += item.Nav_Law.NAME
- }
- })
- }
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentBasics = listArea
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentBasicsName = areaShow
- } else if (this.nowName == 'CheckThreePost') {
- let listArea = []
- let areaShow = ''
- if (val.length > 0) {
- val.forEach((item, i) => {
- if (i > 0) {
- areaShow += ' '
- }
- // 创建一个新对象，ID 为 item.LAW_ID，其他属性和 item 相同
- let newItem = {
- ...item,
- POST_ID: item.ID,
- DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID: item.ID,
- NAME: item.NAME || item.Nav_Post.NAME,
- };
- listArea.push(newItem)
- if (item.NAME && item.NAME != null) {
- areaShow += item.NAME
- } else if (item.Nav_Post && item.Nav_Post.NAME != null) {
- areaShow += item.Nav_Post.NAME
- }
- })
- }
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]].Nav_DetailPosts =
- listArea
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]]
- .Nav_DetailPostsName = areaShow
- } else if (this.nowName == 'CheckThreeDep') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]].Nav_Department =
- val
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]]
- .DEPARTMENT_ID = val.ID
- } else if (this.nowName == 'CheckThreeType') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]].Nav_CheckType =
- val
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentPosts[this.nowIndex[3]]
- .CHECK_TYPE_ID = val.ID
- } else if (this.nowName == 'RiskDesThree') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentHiddens[this.nowIndex[3]]
- .CHECK_QUESTION_ID = val.ID
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentHiddens[this.nowIndex[3]].Nav_Question
- .DESCREPTION = val.DESCREPTION
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DoubleDetailMeasures[this.nowIndex[1]].Nav_DetailMeasureContents[this.nowIndex[2]].Nav_DetailMeasureContentHiddens[this.nowIndex[3]]
- .RECTIFICATION_MEASURES = val.DEMAND
- } else if (this.nowName == 'CheckArea') {
- this.model.Nav_RiskArea.NAME = val.NAME
- this.model.RISK_AREA_ID = val.ID
-
- } else if (this.nowName == 'CheckContent') {
- this.model.Nav_Contents.CHECKCONTENT = val.CHECKCONTENT
- this.model.CHECK_CONTENTS_ID = val.ID
- } else if (this.nowName == 'RiskDes') {
- this.model.Nav_Question.DESCREPTION = val.DESCREPTION
- this.model.CHECK_QUESTION_ID = val.ID
- this.model.HIDDEN_LEVEL = val.QUESTION_LEVEL == 0 ? '一般' : '重大'
- this.model.HIDDEN_DESCRIPTION = val.DEMAND
- } else if (this.nowName == 'RiskName') {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].RISK_NAME = val.NAME
- this.model.Nav_DoubleDetails[this.nowIndex[0]].RISK_NAME_ID = val.ID
- } else {
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts[this.nowIndex[1]].Nav_User.NAME = val.NAME
- this.model.Nav_DoubleDetails[this.nowIndex[0]].Nav_DetailPosts[this.nowIndex[1]].USER_ID = val.ID
- }
- this.showPopupStep = false
-
- },
submit() {
let i = 1
- for (let item of this.model.Nav_DoubleDetails) {
+ for (let item of this.model.Nav_DoubleDetails.filter(i => !i.IS_DELETED)) {
if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({
title: '顺序' + i + '生产单元不能为空',
@@ -1364,8 +1250,8 @@
})
return
}
- if (item.Nav_DoubleDetailMeasures.length !== 0) {
- for (let item1 of item.Nav_DoubleDetailMeasures) {
+ if (item.Nav_DoubleDetailMeasures.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item1 of item.Nav_DoubleDetailMeasures.filter(i => !i.IS_DELETED)) {
if (!item1.MEASURES_NAME) {
uni.showToast({
title: '顺序' + i + '管控措施不能为空',
@@ -1380,8 +1266,8 @@
// })
// return
// }
- if (item1.Nav_DetailMeasureContents.length !== 0) {
- for (let item2 of item1.Nav_DetailMeasureContents) {
+ if (item1.Nav_DetailMeasureContents.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item2 of item1.Nav_DetailMeasureContents.filter(i => !i.IS_DELETED)) {
if (!item2.CHECK_CONTENTS_ID) {
uni.showToast({
title: '顺序' + i + '检查内容不能为空',
@@ -1389,8 +1275,8 @@
})
return
}
- if (item2.Nav_DetailMeasureContentPosts.length !== 0) {
- for (let item3 of item2.Nav_DetailMeasureContentPosts) {
+ if (item2.Nav_DetailMeasureContentPosts.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item3 of item2.Nav_DetailMeasureContentPosts.filter(i => !i.IS_DELETED)) {
if (!item3.CHECK_TYPEName) {
uni.showToast({
title: '顺序' + i + '检查层级不能为空',
@@ -1419,17 +1305,10 @@
})
return
}
- if (item3.Nav_DetailPosts.length == 0) {
- uni.showToast({
- title: '顺序' + i + '检查岗位不能为空',
- icon: 'none'
- })
- return
- }
}
}
- if (item2.Nav_DetailMeasureContentHiddens.length !== 0) {
- for (let item3 of item2.Nav_DetailMeasureContentHiddens) {
+ if (item2.Nav_DetailMeasureContentHiddens.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item3 of item2.Nav_DetailMeasureContentHiddens.filter(i => !i.IS_DELETED)) {
if (!item3.CHECK_QUESTION_ID) {
uni.showToast({
title: '顺序' + i + '隐患描述不能为空',
@@ -1458,8 +1337,8 @@
}
}
}
- if (item.Nav_DetailPosts.length !== 0) {
- for (let item1 of item.Nav_DetailPosts) {
+ if (item.Nav_DetailPosts.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item1 of item.Nav_DetailPosts.filter(i => !i.IS_DELETED)) {
if (!item1.DEPARTMENT_TYPEName) {
uni.showToast({
title: '顺序' + i + '管控层级不能为空',
@@ -1483,8 +1362,8 @@
}
}
}
- if (item.Nav_DetailDeparts.length !== 0) {
- for (let item1 of item.Nav_DetailDeparts) {
+ if (item.Nav_DetailDeparts.filter(i => !i.IS_DELETED).length !== 0) {
+ for (let item1 of item.Nav_DetailDeparts.filter(i => !i.IS_DELETED)) {
if (!item1.DEPARTMENT_ID) {
uni.showToast({
title: '顺序' + i + '辨识部门不能为空',
diff --git a/pages/apply/subPages/SK/riskDouPreShow.vue b/pages/apply/subPages/SK/riskDouPreShow.vue
index b8b5209..bd2d562 100644
--- a/pages/apply/subPages/SK/riskDouPreShow.vue
+++ b/pages/apply/subPages/SK/riskDouPreShow.vue
@@ -66,8 +66,8 @@
-
-
+
+
@@ -125,7 +125,7 @@
-
+
@@ -149,7 +149,7 @@
-->
-
+
@@ -175,14 +175,10 @@
-
-
-
-
-
+
-
+
@@ -227,7 +223,7 @@
-
+
@@ -246,9 +242,9 @@
-
-
+
+
@@ -561,29 +557,22 @@
})
this.isLoadOK = true
},
- sectionChange(index, e) {
- this.model.Nav_DoubleDetails[index].curNow = e
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
+
},
-
- handlePack(index) {
- this.model.Nav_DoubleDetails[index].showPack = this.model.Nav_DoubleDetails[index].showPack == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
-
+ ishowCheckCo(item) {
+ item.ishowCheckCo = item.ishowCheckCo == false ? true : false
+ this.$forceUpdate()
},
- ishowCheckCo(index, index1) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].ishowCheckCo = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].ishowCheckCo == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowCheckLe(item) {
+ item.ishowCheckLe = item.ishowCheckLe == false ? true : false
+ this.$forceUpdate()
},
- ishowCheckLe(index, index1, index2) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].Nav_DetailMeasureContents[index2].ishowCheckLe = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1]
- .Nav_DetailMeasureContents[index2].ishowCheckLe == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
- },
- ishowRiskDes(index, index1, index2) {
- this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1].Nav_DetailMeasureContents[index2].ishowRiskDes = this.model.Nav_DoubleDetails[index].Nav_DoubleDetailMeasures[index1]
- .Nav_DetailMeasureContents[index2].ishowRiskDes == false ? true : false
- this.model.Nav_DoubleDetails = [...this.model.Nav_DoubleDetails]
+ ishowRiskDes(item) {
+ item.ishowRiskDes = item.ishowRiskDes == false ? true : false
+ this.$forceUpdate()
},
diff --git a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
index dffe2fb..71d344d 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
@@ -98,7 +98,7 @@
-
+