diff --git a/pages/apply/subPages/SK/safeCheckEditNew.vue b/pages/apply/subPages/SK/safeCheckEditNew.vue
index c417aba..259c7da 100644
--- a/pages/apply/subPages/SK/safeCheckEditNew.vue
+++ b/pages/apply/subPages/SK/safeCheckEditNew.vue
@@ -84,7 +84,7 @@
-
+
@@ -99,9 +99,9 @@
-
-
+
+
@@ -343,7 +343,29 @@
})
return
}
- this.stepsPageList = this.stepsPageList + 1
+ let json = {
+ CHECK_TYPE_ID: this.model.CHECK_TYPE_ID,
+ DEPARTMENT_TYPE: this.model.DEPARTMENT_TYPE,
+ ID: this.model.ID,
+ ORG_ID: this.ORG_ID,
+ PLANCHECKFREQUENCY: this.model.PLANCHECKFREQUENCY,
+ PRODUCTION_UNIT_ID: this.model.PRODUCTION_UNIT_ID,
+ Nav_ApplyDepartment: {
+ NAME: uni.getStorageSync('appInfo').User.Nav_Department.NAME
+ },
+ Nav_ApplyUser: {
+ NAME: uni.getStorageSync('appInfo').User.NAME
+ }
+ }
+ getRequest(json, "/SK/SKSecurityInspectionNotice/GetCheckContentsNew").then(res => {
+ console.log(res, '9999')
+ if (res) {
+ this.model.Nav_CheckNoticeDetails = res
+ }
+
+ this.stepsPageList = this.stepsPageList + 1
+ })
+
},
stepReduce() {
this.stepsPageList = this.stepsPageList - 1
@@ -402,10 +424,7 @@
this.showPopupDate = false
},
handleSelectorPeople(e) {
- const {
- index: key
- } = this.peopleSelectOption
- this.model.Nav_CheckNoticeDetails[key].Nav_CheckNoticeDetailUsers = e.map(i => {
+ this.peopleSelectOption.value.Nav_CheckNoticeDetailUsers = e.map(i => {
return {
USER_ID: i.USER_ID,
IS_DELETED: i.IS_DELETED,
@@ -417,11 +436,10 @@
}
})
},
- handleShowUserSelector(item, index) {
+ handleShowUserSelector(item) {
this.peopleSelectOption = {
showSelector: true,
value: item,
- index,
defaultChecked: item.Nav_CheckNoticeDetailUsers?.map(i => {
return {
...i,
@@ -540,7 +558,7 @@
if (p.val) {
extendRule(json, 'CHECKCONTENT', 9, p.val);
}
- if(this.model.PRODUCTION_UNIT_ID){
+ if (this.model.PRODUCTION_UNIT_ID) {
extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
}
dataSelect = await GetNewCheckContentsInfo(json).then(res => {
@@ -632,21 +650,21 @@
submit() {
console.log(this.model)
for (let item of this.model.Nav_CheckNoticeDetails.filter(i => !i.IS_DELETED)) {
- if (item.Nav_CheckNoticeDetailUsers.length == 0) {
+ if (!item.Nav_CheckNoticeDetailUsers || item.Nav_CheckNoticeDetailUsers.length == 0) {
uni.showToast({
title: '请选择检查人员',
icon: 'none'
})
return
}
- if (!item.Nav_Contents.CHECKCONTENT) {
+ if (!item.Nav_Contents || !item.Nav_Contents.CHECKCONTENT) {
uni.showToast({
title: '请选择检查内容',
icon: 'none'
})
return
}
- if (!item.Nav_RiskArea.NAME) {
+ if (!item.Nav_RiskArea || !item.Nav_RiskArea.NAME) {
uni.showToast({
title: '请选择检查区域',
icon: 'none'
diff --git a/pages/apply/subPages/SK/safeCheckRecordEditNew.vue b/pages/apply/subPages/SK/safeCheckRecordEditNew.vue
index 70416d5..49f74c3 100644
--- a/pages/apply/subPages/SK/safeCheckRecordEditNew.vue
+++ b/pages/apply/subPages/SK/safeCheckRecordEditNew.vue
@@ -9,11 +9,11 @@
基本信息填写
-
+
-
-
+
@@ -81,7 +81,7 @@
-
+
@@ -96,9 +96,9 @@
-
-
+
+
@@ -447,10 +447,7 @@
this.showPopupDate = false
},
handleSelectorPeople(e) {
- const {
- index: key
- } = this.peopleSelectOption
- this.model.Nav_CheckRecordDetails[key].Nav_CheckRecordDetailUsers = e.map(i => {
+ this.peopleSelectOption.value.Nav_CheckRecordDetailUsers = e.map(i => {
return {
USER_ID: i.USER_ID,
IS_DELETED: i.IS_DELETED,
@@ -462,11 +459,10 @@
}
})
},
- handleShowUserSelector(item, index) {
+ handleShowUserSelector(item) {
this.peopleSelectOption = {
showSelector: true,
value: item,
- index,
defaultChecked: item.Nav_CheckRecordDetailUsers.map(i => {
return {
...i,
diff --git a/pages/apply/subPages/SK/safeCheckRecordShow.vue b/pages/apply/subPages/SK/safeCheckRecordShow.vue
index 0dd623b..62c7cad 100644
--- a/pages/apply/subPages/SK/safeCheckRecordShow.vue
+++ b/pages/apply/subPages/SK/safeCheckRecordShow.vue
@@ -83,9 +83,9 @@
-
-
+
+
diff --git a/pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue b/pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue
index 1509eca..8123d32 100644
--- a/pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue
+++ b/pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue
@@ -99,9 +99,10 @@
-
-
+
+
diff --git a/pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue b/pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue
index e4b820b..626a7b5 100644
--- a/pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue
+++ b/pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue
@@ -84,9 +84,10 @@
-
-
+
+
diff --git a/pages/apply/subPages/SK/safeCheckShow.vue b/pages/apply/subPages/SK/safeCheckShow.vue
index 5d04dc3..b7c19c6 100644
--- a/pages/apply/subPages/SK/safeCheckShow.vue
+++ b/pages/apply/subPages/SK/safeCheckShow.vue
@@ -90,9 +90,10 @@
-
-
+
+