diff --git a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
index f4ca2e8..dffe2fb 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
@@ -31,13 +31,20 @@
-
+
+
+
+
+
+
+
附件：
@@ -56,19 +63,19 @@
辨识内容
-
-
+
+
-
+
-
-
-
+
+
+
@@ -91,23 +98,23 @@
-
-
+
+
-
+
-
+
-
+
@@ -116,73 +123,96 @@
-
-
+
+
-
-
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增管控层级
+
-
-
-
-
-
-
-
-
- {{item1.Nav_Department?index1+1+'.管控部门 : ' +'.'+item1.Nav_Department.NAME:index1+1+'.'}}
+
+
+
+
+
+ {{item1.Nav_Department?index1+1+'.管控部门 : ' +item1.Nav_Department.NAME:index1+1+'.'}}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
@@ -231,13 +261,14 @@
EvaluationFullUpdate,
getUserLists,
GetEvaluationInfo,
- GetRiskAreaInfo,
- GetRiskTypeInfo,
+ GetNewRiskAreaInfo,
+ GetNewRiskTypeInfo,
GetDepartmentInfo,
GetRiskNameInfo,
GetScorel,
GetScoree,
- GetScorec
+ GetScorec,
+ GetPostOrderPaged
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum,
@@ -281,10 +312,10 @@
Nav_Files: [],
Nav_Details: [{
showPack: false,
- Nav_ProductionUnit:{
+ Nav_ProductionUnit: {
NAME: ''
},
- PRODUCTION_UNIT_ID:'',
+ PRODUCTION_UNIT_ID: '',
Nav_Area: {
NAME: ''
},
@@ -310,7 +341,6 @@
EVALUATE_LEVELName: '',
Nav_DetailDeparts: [],
Nav_DetailMeasures: [],
- isShowControl: false,
}]
},
dateRecitifyTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'),
@@ -321,7 +351,6 @@
nowName: '',
nowIndex: 0,
childList: ['管控措施', '管控层级'],
- curNow: 0,
comPickerInfo: {
showSheet: false,
dataItem: {},
@@ -352,7 +381,7 @@
onLoad(option) {
this.TaskID = option.taskID ? option.taskID : '';
this.ID = option.ID ? option.ID : '';
- this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
+ this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum', 'SKMarkEnum']);
},
methods: {
fetchEnums(enumNames) {
@@ -391,39 +420,44 @@
this.model.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
this.model.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
this.model.RequireName = res.Nav_Require.NAME
+ let Nav_RequiresName = ''
+ if (this.dataModel.Nav_Requires && this.dataModel.Nav_Requires.length > 0) {
+ this.dataModel.Nav_Requires.map(item => {
+ if (item.Nav_Require&&item.Nav_Require.NAME !== null) {
+ Nav_RequiresName += item.Nav_Require.NAME + ' ';
+ }
+ })
+ }
+ this.dataModel.Nav_RequiresName = Nav_RequiresName
this.model.Nav_Details.map(item => {
item['showPack'] = false
- item['isShowControl'] = false
- item['curNow'] = 0
- 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(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailDeparts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';
})
+ if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
+ item.Nav_DetailPosts.map(item1 => {
+ if (item1.Nav_PostDetails && item1.Nav_PostDetails.length > 0) {
+ let Nav_ResultPostDetsName = ''
+ item1.Nav_PostDetails.map(item2 => {
+ if (item2.Nav_Post && item2.Nav_Post.NAME !== null) {
+ Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' ';
+ }
+ })
+ item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName
+ }
+ })
+
+ }
})
this.stepLoad = false
})
},
- sectionChange(index, e) {
- this.model.Nav_Details[index].curNow = e
- this.model.Nav_Details = [...this.model.Nav_Details]
- },
- changeControl(index) {
- this.model.Nav_Details[index].isShowControl = this.model.Nav_Details[index].isShowControl == false ? true : false
- this.model.Nav_Details = [...this.model.Nav_Details]
- },
- handlePack(index) {
- this.model.Nav_Details[index].showPack = this.model.Nav_Details[index].showPack == false ? true : false
- this.model.Nav_Details = [...this.model.Nav_Details]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
},
handleChangeUnit(name, item) {
@@ -450,7 +484,6 @@
},
onConfirmPicker(e) {
- console.log(this.comPickerInfo.dataItem)
if (this.comPickerInfo.name == 'SKProductionUnit') {
this.comPickerInfo.dataItem.Nav_ProductionUnit = e.value[0]
this.comPickerInfo.dataItem.PRODUCTION_UNIT_ID = e.value[0].ID
@@ -488,10 +521,10 @@
handleNewCheckContent() {
this.model.Nav_Details.push({
showPack: false,
- Nav_ProductionUnit:{
+ Nav_ProductionUnit: {
NAME: ''
},
- PRODUCTION_UNIT_ID:'',
+ PRODUCTION_UNIT_ID: '',
Nav_Area: {
NAME: ''
},
@@ -517,20 +550,37 @@
EVALUATE_LEVELName: '低风险',
Nav_DetailDeparts: [],
Nav_DetailMeasures: [],
- isShowControl: false,
+ Nav_DetailPosts:[],
+ MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code,
+ MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name,
+ ID: guid()
})
this.model.Nav_Details = [...this.model.Nav_Details]
},
- handleNewControlMea(index) {
- this.model.Nav_Details[index].Nav_DetailMeasures.push({
- NUM: 0,
+ handleNewControlMea(item) {
+ item.Nav_DetailMeasures.push({
+ NUM: 1,
+ ID: guid(),
+ RISK_EVALUATION_DETAIL_ID: item.ID,
MEASURES_NAME: '',
- EMERGENCY: '',
+ IS_DELETED: false,
})
},
- handleNewControlLev(index) {
- this.model.Nav_Details[index].Nav_DetailDeparts.push({
+ handleNewPost(item) {
+ item.Nav_DetailPosts.unshift({
+ ID: guid(),
+ RISK_EVALUATION_DETAIL_ID: item.ID,
+ Nav_Department: {
+ NAME: ''
+ },
+ DEPARTMENT_ID: '',
+ Nav_PostDetails: [],
+ IS_DELETED: false,
+ })
+ },
+ handleNewControlLev(item) {
+ item.Nav_DetailDeparts.push({
DEPARTMENT_TYPE: '',
Nav_Department: {
NAME: ''
@@ -538,11 +588,12 @@
Nav_User: {
NAME: ''
},
+ RISK_EVALUATION_DETAIL_ID:item.ID
})
},
- handleDelRowBefore(index, index1, name) {
- this.showDelModalIndex = index
- this.nowIndex = [index, index1, name]
+ handleDelRowBefore(item) {
+ item.IS_DELETED = true
+ this.$forceUpdate()
},
@@ -581,89 +632,13 @@
this.showPopupRecitifyDate = false
},
- handleChangeStep(index, index1, name) {
- this.currentOperateStep = {}
- this.showPopupStep = true
- this.nowIndex = [index, index1, name]
- this.handleSearchStep('init')
- },
- handleClosePopupStep() {
- this.showPopupStep = false
- // this.showPopupCertificate = false
- },
- handleSearchStep(val, pageIndex) {
- let requestInfo = this.nowIndex[2] == 'demand' ? GetEvaluationInfo : this.nowIndex[2] == 'Area' ? GetRiskAreaInfo : this.nowIndex[2] == 'Category' ? GetRiskTypeInfo : this.nowIndex[2] == 'Dep' ?
- GetDepartmentInfo : this.nowIndex[1] == 'RiskName' ? GetRiskNameInfo : getUserLists
- const orgId = uni.getStorageSync('orgId')
- const json = initFilter(orgId, "", "", 0, pageIndex ?? 1)
- json.Limit = 20
- if (pageIndex) {
- json.Start = (pageIndex - 1) * json.Limit;
- }
- if (val !== 'init') {
- const tempGroup = initFilterGroup(false);
- extendGroupRule(tempGroup, 'NAME', 9, val)
- extendFilterGroup(json, tempGroup);
- }
- requestInfo(json).then(res => {
- // if (res.IsSuccessful) {
- this.stepLists = (res.Data || res).map(i => {
- return {
- ...i,
- id: i.ID,
- name: i.NAME,
- }
- })
- this.curTotalStep = res.TotalCount
- // }
- })
-
-
- },
- handleSelectedStep(val) {
- if (this.nowIndex[2] == 'demand') {
- this.model.Nav_Require.NAME = val.NAME
- this.model.REQUIRE_ID = val.ID
- this.model.RequireName = val.NAME
- } else if (this.nowIndex[2] == 'Area') {
- this.model.Nav_Details[this.nowIndex[0]].Nav_Area.NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].AREA_ID = val.ID
- } else if (this.nowIndex[2] == 'Category') {
- this.model.Nav_Details[this.nowIndex[0]].Nav_Type.NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].TYPE_ID = val.ID
- } else if (this.nowIndex[2] == 'Dep') {
- this.model.Nav_Details[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_Department.NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].DEPARTMENT_ID = val.ID
- } else if (this.nowIndex[1] == 'RiskName') {
- this.model.Nav_Details[this.nowIndex[0]].RISK_NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].RISK_NAME_ID = val.ID
- } else {
- this.model.Nav_Details[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].Nav_User.NAME = val.NAME
- this.model.Nav_Details[this.nowIndex[0]].Nav_DetailDeparts[this.nowIndex[1]].USER_ID = val.ID
- }
- this.showPopupStep = false
-
- },
- handleShowSheetForArea(item, todo) {
- const validDetails = this.model.Nav_Details.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)
- // const json = initFilter(this.ORG_ID, "", "", 0, p.pageIndex ?? 1)
let dataSelect = []
+ // this.selectorInfo.defaultChecked = []
var defaultChecked = []
this.selectorInfo.isMultiple = false
-
-
-
-
if (p.val) {
extendRule(json, 'NAME', 9, p.val);
}
@@ -671,10 +646,7 @@
if (p.pageIndex) {
json.Start = (p.pageIndex - 1) * json.Limit;
}
- json.Sort = 'NAME'
- // json.SelectField = ["ID", "NAME", "NAME", "CODE"]
- // json.Sort = "NAME"
- // json.Order = 1
+ json.Sort = "NAME"
if (p.name == 'EVALUATE_L') {
// extendRule(json, 'DEVICE_STATUS', 1, '1');
@@ -683,6 +655,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
@@ -693,6 +666,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
@@ -701,6 +675,70 @@
dataSelect = await GetScorec(json).then(res => {
this.selectorInfo.totalCount = res.TotalCount
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
}
@@ -708,7 +746,6 @@
return res.Data
})
}
-
if (defaultChecked == null)
defaultChecked = []
if (dataSelect.length) {
@@ -721,8 +758,7 @@
title: p.title,
name: p.name,
dataLists: dataSelect,
- defaultChecked: defaultChecked,
- index: p.index
+ defaultChecked: defaultChecked
}
} else {
// 暂无数据
@@ -742,43 +778,85 @@
handleSelected(e) {
this.selectorInfo.showPopup = false
- const validDetails = this.model.Nav_Details.filter(i => !i.IS_DELETED);
- const index = this.selectorInfo.index;
- const realIndex = this.model.Nav_Details.findIndex(item => item === validDetails[index]);
- if (this.selectorInfo.name == 'EVALUATE_L') {
- this.model.Nav_Details[realIndex].Nav_SCOREL = e;
- this.model.Nav_Details[realIndex].SCOREL_ID = e.ID;
- } else if (this.selectorInfo.name == 'EVALUATE_E') {
- this.model.Nav_Details[realIndex].Nav_SCOREE = e;
- this.model.Nav_Details[realIndex].SCOREE_ID = e.ID;
- } else if (this.selectorInfo.name == 'EVALUATE_C') {
- this.model.Nav_Details[realIndex].Nav_SCOREC = e;
- this.model.Nav_Details[realIndex].SCOREC_ID = e.ID;
- }
- let l = this.model.Nav_Details[realIndex].Nav_SCOREL.SCORE
- let o = this.model.Nav_Details[realIndex].Nav_SCOREE.SCORE
- let c = this.model.Nav_Details[realIndex].Nav_SCOREC.SCORE
- this.model.Nav_Details[realIndex].EVALUATE_SCORE = l * o * c
- let D = this.model.Nav_Details[realIndex].EVALUATE_SCORE
- if (D >= 320) {
- this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "重大风险";
- } else if (D >= 160 && D < 320) {
- this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "较大风险";
- } else if (D >= 70 && D < 160) {
- this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "一般风险";
- } else {
- this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "低风险";
- }
- this.model.Nav_Details[realIndex].EVALUATE_LEVEL = this.model.Nav_Details[realIndex].EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this.model
- .Nav_Details[
- realIndex].EVALUATE_LEVELName).code : ''
+ 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()
+ }
+
+ 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
+ }
+
- this.$forceUpdate()
},
+
submit() {
let i = 1
- for (let item of this.model.Nav_Details) {
+ for (let item of this.model.Nav_Details.filter(i => !i.IS_DELETED)) {
if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({
title: '顺序' + i + '生产单元不能为空',
@@ -890,13 +968,7 @@
})
return
}
- if (!item1.Nav_User.NAME) {
- uni.showToast({
- title: '顺序' + i + '管控责任人不能为空',
- icon: 'none'
- })
- return
- }
+
}
}
i++
diff --git a/pages/apply/subPages/SK/riskSafeEvaluateShow.vue b/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
index ace4cde..252198a 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
@@ -15,12 +15,12 @@
-
+
-
+
@@ -41,7 +41,7 @@
-
+
附件：
@@ -62,8 +62,8 @@
-
-
+
+
@@ -107,47 +107,76 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+ {{item1.Nav_Department?index1+1+'.管控部门 : ' +item1.Nav_Department.NAME:index1+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -277,7 +306,7 @@
...this.$store.state.auditModel,
TaskID: option.taskID ? option.taskID : ''
}
- this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
+ this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum', 'SKMarkEnum']);
},
methods: {
fetchEnums(enumNames) {
@@ -319,40 +348,45 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2
this.model.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
this.model.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
+ let Nav_RequiresName = ''
+ if (this.model.Nav_Requires && this.model.Nav_Requires.length > 0) {
+ this.model.Nav_Requires.map(item => {
+ if (item.Nav_Require&&item.Nav_Require.NAME !== null) {
+ Nav_RequiresName += item.Nav_Require.NAME + ' ';
+ }
+ })
+ }
+ this.model.Nav_RequiresName = Nav_RequiresName
this.model.Nav_Details.map(item => {
item['showPack'] = false
- item['isShowControl'] = false
- item['curNow'] = 0
- 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(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailDeparts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';
})
+ if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
+ item.Nav_DetailPosts.map(item1 => {
+ if (item1.Nav_PostDetails && item1.Nav_PostDetails.length > 0) {
+ let Nav_ResultPostDetsName = ''
+ item1.Nav_PostDetails.map(item2 => {
+ if (item2.Nav_Post && item2.Nav_Post.NAME !== null) {
+ Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' ';
+ }
+ })
+ item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName
+ }
+ })
+
+ }
})
this.stepLoad = false
})
this.isLoadOK = true
},
- sectionChange(index, e) {
- this.model.Nav_Details[index].curNow = e
- this.model.Nav_Details = [...this.model.Nav_Details]
- },
- changeControl(index) {
- this.model.Nav_Details[index].isShowControl = this.model.Nav_Details[index].isShowControl == false ? true : false
- this.model.Nav_Details = [...this.model.Nav_Details]
- },
- handlePack(index) {
- this.model.Nav_Details[index].showPack = this.model.Nav_Details[index].showPack == false ? true : false
- this.model.Nav_Details = [...this.model.Nav_Details]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
},
diff --git a/services/apply/subPages/SK/SKServices.js b/services/apply/subPages/SK/SKServices.js
index 56da22d..274a8ba 100644
--- a/services/apply/subPages/SK/SKServices.js
+++ b/services/apply/subPages/SK/SKServices.js
@@ -883,6 +883,17 @@ export function GetRiskTypeInfo(params) {
reject(error)
})
})
+}
+export function GetNewRiskTypeInfo(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/SK/SKRiskType/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error) => {
+ reject(error)
+ })
+ })
}
export function GetRiskNameInfo(params) {
return new Promise((resolve, reject) => {