diff --git a/pages.json b/pages.json
index 204f170..630b1d3 100644
--- a/pages.json
+++ b/pages.json
@@ -1716,6 +1716,11 @@
"style": {
"navigationBarTitleText": "检查内容维护"
}
+ }, {
+ "path": "riskContentEdit",
+ "style": {
+ "navigationBarTitleText": "隐患描述维护"
+ }
}, {
"path": "SK003List",
"style": {
diff --git a/pages/apply/subPages/SK/riskContentEdit.vue b/pages/apply/subPages/SK/riskContentEdit.vue
new file mode 100644
index 0000000..11d24e4
--- /dev/null
+++ b/pages/apply/subPages/SK/riskContentEdit.vue
@@ -0,0 +1,632 @@
+
+
+
+
+
+
+
+
+ *
+
+
+ 基本信息填写
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *
+
+
+ 隐患描述
+
+
+
+
+
+
+ {{item.DESCREPTION?index+1+'.'+item.DESCREPTION:index+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/apply/subPages/SK/riskReportEditNew.vue b/pages/apply/subPages/SK/riskReportEditNew.vue
index 3aeea18..a1e779f 100644
--- a/pages/apply/subPages/SK/riskReportEditNew.vue
+++ b/pages/apply/subPages/SK/riskReportEditNew.vue
@@ -91,6 +91,10 @@
+
+
+
+
@@ -413,6 +417,11 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3
})
},
+ handleNewRisk(item) {
+ uni.navigateTo({
+ url: 'riskContentEdit?CHECK_CONTENTS_ID=' + item.CHECK_CONTENTS_ID
+ })
+ },
stepAdd() {
if (!this.model.CHECK_TIME) {
uni.showToast({
@@ -565,8 +574,8 @@
} else if (this.selectorInfo.name == 'Nav_Question') {
this.model.Nav_ReportDetails[realIndex].Nav_Question = e;
this.model.Nav_ReportDetails[realIndex].CHECK_QUESTION_ID = e.ID;
- this.model.Nav_CheckRecordDetails[realIndex].HIDDEN_LEVEL =e.QUESTION_LEVEL
- this.model.Nav_CheckRecordDetails[realIndex].HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item1 => item1.code ===e.QUESTION_LEVEL).name;
+ this.model.Nav_CheckRecordDetails[realIndex].HIDDEN_LEVEL = e.QUESTION_LEVEL
+ this.model.Nav_CheckRecordDetails[realIndex].HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item1 => item1.code === e.QUESTION_LEVEL).name;
} else if (this.selectorInfo.name == 'Nav_RecitifyUser') {
this.model.Nav_ReportDetails[realIndex].Nav_RecitifyUser = e;
this.model.Nav_ReportDetails[realIndex].RECITIFY_USER_ID = e.ID;
@@ -668,9 +677,9 @@
this.cancleJob()
},
cancleJob() {
- let json={};
- json.ID=this.ID;
- json.TaskID=this.TaskID;
+ let json = {};
+ json.ID = this.ID;
+ json.TaskID = this.TaskID;
DangerReportCancel(json).then(res => {
uni.$showMsgFunc('操作成功!', () => {
uni.navigateBack()
diff --git a/pages/apply/subPages/SK/riskVerifyEditNew.vue b/pages/apply/subPages/SK/riskVerifyEditNew.vue
index 384060e..e885af4 100644
--- a/pages/apply/subPages/SK/riskVerifyEditNew.vue
+++ b/pages/apply/subPages/SK/riskVerifyEditNew.vue
@@ -304,7 +304,7 @@
return
}
uni.navigateTo({
- url: 'checkContentEdit?CHECK_CONTENTS_ID=' + this.model.CHECK_CONTENTS_ID
+ url: 'riskContentEdit?CHECK_CONTENTS_ID=' + this.model.CHECK_CONTENTS_ID
})
},
loadData() {
@@ -423,7 +423,8 @@
return res.Data
})
} else if (p.name == 'Nav_Contents') {
- json.Sort = 'CHECKCONTENT'
+ json.Sort = 'CREATE_TIME'
+ json.Order = 1
dataSelect = await GetCheckContentsInfo(json).then(res => {
this.selectorInfo.totalCount = res.TotalCount
if (res != undefined && res.Data.length > 0) {