diff --git a/pages/apply/subPages/SK/riskSafeEvaSumShow.vue b/pages/apply/subPages/SK/riskSafeEvaSumShow.vue
index 432b771..504154d 100644
--- a/pages/apply/subPages/SK/riskSafeEvaSumShow.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaSumShow.vue
@@ -15,12 +15,12 @@
-
+
-
+
@@ -41,7 +41,7 @@
-
+
附件：
@@ -59,11 +59,11 @@
-
+
-
-
+
+
@@ -81,7 +81,7 @@
-
+
@@ -107,45 +107,76 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{item1.Nav_Department?index1+1+'.管控部门 : ' +item1.Nav_Department.NAME:index1+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -274,7 +305,7 @@
...this.$store.state.auditModel,
TaskID: option.taskID ? option.taskID : ''
}
- this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
+ this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum', 'SKMarkEnum']);
},
methods: {
fetchEnums(enumNames) {
@@ -316,40 +347,45 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2
this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
+ 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.dataModel.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.dataModel.Nav_Details[index].curNow = e
- this.dataModel.Nav_Details = [...this.dataModel.Nav_Details]
- },
- changeControl(index) {
- this.dataModel.Nav_Details[index].isShowControl = this.dataModel.Nav_Details[index].isShowControl == false ? true : false
- this.dataModel.Nav_Details = [...this.dataModel.Nav_Details]
- },
- handlePack(index) {
- this.dataModel.Nav_Details[index].showPack = this.dataModel.Nav_Details[index].showPack == false ? true : false
- this.dataModel.Nav_Details = [...this.dataModel.Nav_Details]
+ handlePack(item) {
+ item.showPack = item.showPack == false ? true : false
+ this.$forceUpdate()
},
diff --git a/pages/apply/subPages/SK/riskSafeEvaluateShow.vue b/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
index 5d43532..3fd8b85 100644
--- a/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
+++ b/pages/apply/subPages/SK/riskSafeEvaluateShow.vue
@@ -41,7 +41,7 @@
-
+
附件：