diff --git a/pages/apply/subPages/SK/riskReportEditNew.vue b/pages/apply/subPages/SK/riskReportEditNew.vue
index bddf33a..c5e525d 100644
--- a/pages/apply/subPages/SK/riskReportEditNew.vue
+++ b/pages/apply/subPages/SK/riskReportEditNew.vue
@@ -13,28 +13,28 @@
-
-
+
+
-
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
+
@@ -100,8 +100,13 @@
+
+
+
+
+
-
+
@@ -110,6 +115,11 @@
+
+
+
+
+
@@ -124,9 +134,13 @@
-
+
+
-
+
+
+
+
@@ -187,7 +201,9 @@
getUserLists,
CheckTypeNewOrderPaged,
GetCheckInspection,
- GetHiddenScripList
+ GetHiddenScripList,
+ CheckSKTypeNewOrderPaged,
+ SKHiddenReason
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getRequest,
@@ -388,6 +404,14 @@
this.model.Nav_ReportDetails.map(item => {
item.HIDDEN_LEVELName = item.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.HIDDEN_LEVEL).name : ''
// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name;
+ let ReasonsNAME = ''
+ if (item.Nav_ReportDetailReasons && item.Nav_ReportDetailReasons.length > 0) {
+ for (let i = 0; i < item.Nav_ReportDetailReasons.length; i++) {
+ ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+ .Nav_ReportDetailReasons[i].Nav_Reason.NAME;
+ }
+ }
+ item.ReasonsNAME = ReasonsNAME
})
}
@@ -462,6 +486,23 @@
}
return res.Data
})
+ }else if (p.name == 'Nav_CheckType') {
+ if (p.val) {
+ extendRule(json, 'NAME', 9, p.val);
+ }
+ if (this.model.PRODUCTION_UNIT_ID) {
+ extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
+ }
+
+ dataSelect = await CheckSKTypeNewOrderPaged(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
+ }
+ }
+ return res.Data
+ })
} else if (p.name == 'Nav_Question') {
if (p.val) {
extendRule(json, 'DESCREPTION', 9, p.val);
@@ -494,6 +535,37 @@
}
return res.Data
})
+ } else if (p.name == 'Nav_Reasons') {
+ if (p.val) {
+ extendRule(json, 'NAME', 9, p.val);
+ }
+
+ this.selectorInfo.isMultiple = true
+ json.Sort = 'NAME'
+ json.Limit = 20
+ if (p.pageIndex) {
+ json.Start = (p.pageIndex - 1) * json.Limit;
+ }
+ // extendRule(json, 'CHECKOBJECT', 1, this.model.CHECKOBJECT);
+ dataSelect = await SKHiddenReason(json).then(res => {
+ this.selectorInfo.totalCount = res.TotalCount
+ if (res != undefined && res.Data != undefined && res.Data.length > 0) {
+ for (let i = 0; i < res.Data.length; i++) {
+ res.Data[i].name = res.Data[i].NAME
+ // res[i].code = res[i].CODE
+ }
+ }
+ return res.Data
+ })
+ if (p.itemData.Nav_ReportDetailReasons.length > 0 && p.itemData.Nav_ReportDetailReasons[0]
+ .Nav_Reason != null) {
+ // this.selectorInfo.defaultChecked = []
+ p.itemData.Nav_ReportDetailReasons.forEach(e => {
+ defaultChecked.push(e.Nav_Reason)
+ })
+ } else {
+ defaultChecked = null
+ }
}
if (defaultChecked == null)
@@ -543,29 +615,78 @@
} else if (this.selectorInfo.name == 'Nav_RecitifyUser') {
this.selectorInfo.itemData.Nav_RecitifyUser = e;
this.selectorInfo.itemData.RECITIFY_USER_ID = e.ID;
+ } else if (this.selectorInfo.name == 'Nav_CheckType') {
+ this.model.Nav_CheckType = e;
+ this.model.CHECK_TYPE_ID = e.ID;
+ } else if (this.selectorInfo.name == 'Nav_Reasons') {
+ let listProject = []
+ let projectShow = ''
+ if (e.length > 0) {
+ e.forEach((item, i) => {
+ if (item.name != null || item.NAME != null) {
+ if (i > 0) {
+ projectShow += ' '
+ }
+ listProject.push({
+ ID: guid(),
+ SECURITY_INSPECTION_RECORD_DETAIL_ID: this.selectorInfo.itemData.ID,
+ REASON_ID: item.ID,
+ ORG_ID: item.ORG_ID,
+ Nav_Reason: item
+ })
+ projectShow += item.NAME
+ }
+ })
+ }
+ this.selectorInfo.itemData.Nav_ReportDetailReasons = listProject
+ this.selectorInfo.itemData.ReasonsNAME = projectShow
}
},
- handleChange(item) {
+ handleChange(name,item) {
+ if (name == 'SKProductionUnit') {
+ const json = initFilter(this.ORG_ID)
+ getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
+ this.comPickerInfo = {
+ showSheet: true,
+ columns: [res],
+ name: name,
+ dataItem: item,
+ }
+ })
+ } else {
this.comPickerInfo = {
showSheet: true,
- columns: [this.enumsText['SKHiddenLevel']],
+ columns: [this.enumsData[name]],
+ name: name,
dataItem: item,
- name: name
}
+ }
},
onConfirmPicker(e) {
+ if (this.comPickerInfo.name == 'SKProductionUnit') {
+ this.model.Nav_ProductionUnit = e.value[0]
+ this.model.PRODUCTION_UNIT_ID = e.value[0].ID
+ } else if (this.comPickerInfo.name == 'SKPLANCHECKFREQUENCYEnum') {
+ this.model.PLANCHECKFREQUENCYName = e.value[0].name
+ this.model.PLANCHECKFREQUENCY = this.enumsData['SKPLANCHECKFREQUENCYEnum'][e.indexs[0]].code
+ } else if (this.comPickerInfo.name == 'SKDepartmentTypeEnum') {
+ this.model.DEPARTMENT_TYPEName = e.value[0].name
+ this.model.DEPARTMENT_TYPE = this.enumsData['SKDepartmentTypeEnum'][e.indexs[0]].code
+ } else if (this.comPickerInfo.name == 'SKHiddenLevel') {
+
+ this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0].NAME
+ this.comPickerInfo.dataItem.HIDDEN_LEVEL = e.value[0].ID
+ }
this.comPickerInfo = {
showSheet: false,
- dataItem: this.comPickerInfo.dataItem,
columns: [],
title: '',
- formIndex: undefined
+ formIndex: undefined,
+ dataItem: this.comPickerInfo.dataItem,
}
- this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0]
- this.comPickerInfo.dataItem.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
},
@@ -618,7 +739,8 @@
Nav_ReportDetailFiles: [],
Nav_RiskArea: {
NAME: ''
- }
+ },
+ Nav_ReportDetailReasons:[]
})
this.model.Nav_ReportDetails = [...this.model.Nav_ReportDetails]
diff --git a/pages/apply/subPages/SK/riskReportShow.vue b/pages/apply/subPages/SK/riskReportShow.vue
index 58103a8..5db22e7 100644
--- a/pages/apply/subPages/SK/riskReportShow.vue
+++ b/pages/apply/subPages/SK/riskReportShow.vue
@@ -81,6 +81,11 @@
+
+
+
+
+
@@ -90,6 +95,11 @@
+
+
+
+
+
@@ -101,9 +111,13 @@
-
+
+
-
+
+
+
+
@@ -249,6 +263,14 @@
this.model.Nav_ReportDetails.map(item => {
item.HIDDEN_LEVELName = item.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.HIDDEN_LEVEL).name : ''
// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name;
+ let ReasonsNAME = ''
+ if (item.Nav_ReportDetailReasons && item.Nav_ReportDetailReasons.length > 0) {
+ for (let i = 0; i < item.Nav_ReportDetailReasons.length; i++) {
+ ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+ .Nav_ReportDetailReasons[i].Nav_Reason.NAME;
+ }
+ }
+ item.ReasonsNAME = ReasonsNAME
})
}
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 10 ? 1 : res.STATUS == 20 ? 2 : 3