From 276f2937898e3114e27060bd8e907d17fb7be915 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Mon, 8 Jul 2024 11:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=99=BB=E8=AE=B0=20?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=8B=E5=8A=A8=E6=B7=BB=E5=8A=A0=E6=98=8E?=
=?UTF-8?q?=E7=BB=86=20=E6=A3=80=E6=9F=A5=E7=99=BB=E8=AE=B0=E9=80=82?=
=?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 6 +
pages/apply/subPages/BS/safeCheckCheck.vue | 21 +-
pages/apply/subPages/BS/safeCheckSign.vue | 74 ++-
pages/apply/subPages/BS/safeCheckSignDIY.vue | 511 +++++++++++++++++++
services/apply/subPages/BS/safeCheck.js | 13 +
5 files changed, 604 insertions(+), 21 deletions(-)
create mode 100644 pages/apply/subPages/BS/safeCheckSignDIY.vue
diff --git a/pages.json b/pages.json
index fd116cf..aeb63bb 100644
--- a/pages.json
+++ b/pages.json
@@ -794,6 +794,12 @@
"style": {
"navigationBarTitleText": "检查内容设置"
}
+ },
+ {
+ "path": "safeCheckSignDIY",
+ "style": {
+ "navigationBarTitleText": "新增检查登记"
+ }
}
]
},
diff --git a/pages/apply/subPages/BS/safeCheckCheck.vue b/pages/apply/subPages/BS/safeCheckCheck.vue
index 7a24a97..939a1ce 100644
--- a/pages/apply/subPages/BS/safeCheckCheck.vue
+++ b/pages/apply/subPages/BS/safeCheckCheck.vue
@@ -82,8 +82,8 @@
检查问题描述
-
-
+
@@ -92,9 +92,9 @@
v-model="item.QUESTION_LEVEL_DESCRIPTION" border="none"
inputAlign="right">
-
-
+
+
0) {
+ res.Nav_ListSafeCheckDetail[i].Nav_ListCheckDetailQuestion.forEach(e => {
+ DESCREPTION += ' ' + e.Nav_Question.DESCREPTION
+ })
+ }
+ res.Nav_ListSafeCheckDetail[i].DESCREPTION = DESCREPTION
}
}
diff --git a/pages/apply/subPages/BS/safeCheckSign.vue b/pages/apply/subPages/BS/safeCheckSign.vue
index 82a031f..e77a8c3 100644
--- a/pages/apply/subPages/BS/safeCheckSign.vue
+++ b/pages/apply/subPages/BS/safeCheckSign.vue
@@ -70,12 +70,15 @@
-
+
+
-
+
- -->
+
+
@@ -96,7 +99,7 @@
-
@@ -104,6 +107,12 @@
border="none" inputAlign="right">
+
+
+
+
-
+
+
+
+
-
+
-
-
+
+
附件
-
@@ -304,7 +317,22 @@
this.showDelModalIndex = undefined
},
handleAdd() {
- this.model.Nav_ListSafeCheckDetail.unshift(this.subDataModel)
+ //页面跳转
+ var linkToUrl = 'safeCheckSignDIY?tableKey=' + this.tableKey + '&ID=' + this.model.ID + '&taskID=' + this
+ .TaskID //Url 传参
+
+ // this.model.DEPARTMENT_ID = option.DEPARTMENT_ID
+ // this.model.CHECK_TYPE_LEVEL_ID = option.CHECK_TYPE_LEVEL_ID
+ //BS077 需要的传参
+ linkToUrl += '&ROW_NO=' + this.model.Nav_ListSafeCheckDetail.length + '&SAFE_CHECK_ID=' + this.model.ID +
+ '&CHECKOBJECT=' + this.model.CHECKOBJECT + '&CHECK_TYPE_ID=' + this.model.CHECK_TYPE_ID +
+ '&DEPARTMENT_ID=' + this.model.DEPARTMENTID + '&CHECK_TYPE_LEVEL_ID=' + this.model
+ .CHECK_TYPE_LEVEL_ID + '&Nav_ListUserCheck=' + encodeURIComponent(JSON.stringify(this.model
+ .Nav_ListSafeCheckDetail[0]
+ .Nav_ListCheckDetailUser))
+ uni.navigateTo({
+ url: linkToUrl
+ })
},
handleTab(t) {
this.currentTab = t
@@ -315,7 +343,6 @@
const orgId = uni.getStorageSync('orgId')
this.model.Nav_ListSafeCheckDetail[0].Nav_ListCheckDetailUser[0].SAFECHECKSTATE = 80;
this.model.TaskID = this.TaskID
-
if (this.model.Nav_ListSafeCheckDetail != null && this.model.Nav_ListSafeCheckDetail.length >
0) {
this.model.Nav_ListSafeCheckDetail.forEach(e => {
@@ -328,7 +355,6 @@
}
})
}
-
FullCheckUpdateBS057(this.model).then(res => {
uni.$showMsgFunc('操作成功!', () => {
if (this.tableKey == null || this.tableKey == 0) {
@@ -336,7 +362,15 @@
url: 'safeCheckIndex'
})
} else {
- uni.navigateBack()
+ // uni.navigateBack()// 如果有手动操作 跳转页面不对
+
+ // uni.switchTab({
+ // url: '../../../index/index2',
+ // })
+ uni.switchTab({
+ url: '/pages/index/index2'
+ })
+
}
}, 'success', 1000)
})
@@ -437,6 +471,16 @@
res.Nav_ListSafeCheckDetail[i].DEMAND = DEMAND.substring(1)
}
}
+
+ if (!res.Nav_ListSafeCheckDetail[i].ISAUTOLOAD && res.Nav_ListSafeCheckDetail[i]
+ .Nav_ListCheckDetailReason != null && res.Nav_ListSafeCheckDetail[i]
+ .Nav_ListCheckDetailReason.length > 0) {
+ var listCheckDetailReason = ''
+ res.Nav_ListSafeCheckDetail[i].Nav_ListCheckDetailReason.forEach(e => {
+ listCheckDetailReason += ' ' + e.Nav_RiskReason?.NAME
+ })
+ res.Nav_ListSafeCheckDetail[i].listCheckDetailReason = listCheckDetailReason
+ }
}
}
diff --git a/pages/apply/subPages/BS/safeCheckSignDIY.vue b/pages/apply/subPages/BS/safeCheckSignDIY.vue
new file mode 100644
index 0000000..446ac66
--- /dev/null
+++ b/pages/apply/subPages/BS/safeCheckSignDIY.vue
@@ -0,0 +1,511 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/services/apply/subPages/BS/safeCheck.js b/services/apply/subPages/BS/safeCheck.js
index b9c8147..1729954 100644
--- a/services/apply/subPages/BS/safeCheck.js
+++ b/services/apply/subPages/BS/safeCheck.js
@@ -301,3 +301,16 @@ export function FullUpdateContents(params) {
})
})
}
+
+//手动新增检查登记
+export function AddCheckRecord(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/BS/BSSafeCheck/AddCheckRecord", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result.Data);
+ }
+ }).catch((error) => {
+ reject(error)
+ })
+ })
+}