diff --git a/pages/apply/subPages/SK/safeCheckEditNew.vue b/pages/apply/subPages/SK/safeCheckEditNew.vue
index 186cd6e..c417aba 100644
--- a/pages/apply/subPages/SK/safeCheckEditNew.vue
+++ b/pages/apply/subPages/SK/safeCheckEditNew.vue
@@ -160,7 +160,7 @@
FullUpdate,
GetNewRiskAreaInfo,
GetIdentityUserEditNew,
- CheckTypeNewOrderPaged
+ CheckSKTypeNewOrderPaged
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum,
@@ -560,7 +560,7 @@
extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
}
- dataSelect = await CheckTypeNewOrderPaged(json).then(res => {
+ 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++) {
diff --git a/pages/apply/subPages/SK/safeCheckRecordEditNew.vue b/pages/apply/subPages/SK/safeCheckRecordEditNew.vue
index f32a554..70416d5 100644
--- a/pages/apply/subPages/SK/safeCheckRecordEditNew.vue
+++ b/pages/apply/subPages/SK/safeCheckRecordEditNew.vue
@@ -9,16 +9,15 @@
基本信息填写
-
+
-
+
+
-
-
-
+
+
+
@@ -93,6 +92,13 @@
+
+
+
+
+
+
+
@@ -115,6 +121,11 @@
+
+
+
+
+
@@ -124,6 +135,12 @@
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
@@ -263,6 +276,24 @@
this.model.Nav_CheckRecordDetails.map(item => {
item.CHECK_RESULTName = item.CHECK_RESULT !== undefined ? this.enumsData['SKCheckResultEnum'].find(item1 => item1.code === item.CHECK_RESULT).name : '';
item.HIDDEN_LEVELName = item.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.HIDDEN_LEVEL).name : '';
+ if (item.Nav_CheckRecordDetailBasics && item.Nav_CheckRecordDetailBasics.length > 0) {
+ let areaShow = ''
+ item.Nav_CheckRecordDetailBasics.map(o => {
+ if (o.Nav_Law && o.Nav_Law.NAME) {
+ areaShow += o.Nav_Law.NAME + ' 、'
+ }
+
+ })
+ item.Nav_CheckRecordDetailBasicsName = areaShow
+ }
+ let ReasonsNAME = ''
+ if (item.Nav_CheckRecordDetailReasons && item.Nav_CheckRecordDetailReasons.length > 0) {
+ for (let i = 0; i < item.Nav_CheckRecordDetailReasons.length; i++) {
+ ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+ .Nav_CheckRecordDetailReasons[i].Nav_Reason.NAME;
+ }
+ }
+ item.ReasonsNAME = ReasonsNAME
// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name||'';
})
}
diff --git a/pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue b/pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue
index 44e9172..1509eca 100644
--- a/pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue
+++ b/pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue
@@ -9,28 +9,28 @@
基本信息填写
-
-
+
+
-
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
+
+
-
+
+
@@ -95,6 +95,13 @@
+
+
+
+
+
+
+
@@ -117,6 +124,11 @@
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
@@ -187,14 +201,16 @@
MineTypeName
} from '../../../../utils/enums.js'
import {
- GetCheckContentsInfo,
+ GetNewCheckContentsInfo,
GetRecordSummary,
SummaryFullUpdate,
GetRiskAreaInfo,
GetCheckInspection,
GetHiddenScripList,
GetNewRiskAreaInfo,
- CheckTypeNewOrderPaged
+ CheckTypeNewOrderPaged,
+ CheckSKTypeNewOrderPaged,
+ SKHiddenReason
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getRequest,
@@ -372,6 +388,24 @@
item.HIDDEN_LEVELName = ''
item.HIDDEN_LEVEL = null
}
+ if (item.Nav_CheckRecordDetailBasics && item.Nav_CheckRecordDetailBasics.length > 0) {
+ let areaShow = ''
+ item.Nav_CheckRecordDetailBasics.map(o => {
+ if (o.Nav_Law && o.Nav_Law.NAME) {
+ areaShow += o.Nav_Law.NAME + ' 、'
+ }
+
+ })
+ item.Nav_CheckRecordDetailBasicsName = areaShow
+ }
+ let ReasonsNAME = ''
+ if (item.Nav_CheckRecordDetailReasons && item.Nav_CheckRecordDetailReasons.length > 0) {
+ for (let i = 0; i < item.Nav_CheckRecordDetailReasons.length; i++) {
+ ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+ .Nav_CheckRecordDetailReasons[i].Nav_Reason.NAME;
+ }
+ }
+ item.ReasonsNAME = ReasonsNAME
// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name;
})
@@ -448,46 +482,53 @@
}
},
handleChange(name, item) {
- if (name == 'SKCheckResultEnum') {
+ 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['SKCheckResultEnum']],
+ columns: [this.enumsData[name]],
+ name: name,
dataItem: item,
- name: name
- }
- } else if (name == 'SKHiddenLevel') {
- this.comPickerInfo = {
- showSheet: true,
- columns: [this.enumsText['SKHiddenLevel']],
- dataItem: item,
- name: name
}
}
},
onConfirmPicker(e) {
- if (this.comPickerInfo.name == 'SKCheckResultEnum') {
- this.comPickerInfo = {
- showSheet: false,
- dataItem: this.comPickerInfo.dataItem,
- columns: [],
- title: '',
- formIndex: undefined
- }
- this.comPickerInfo.dataItem.CHECK_RESULTName = e.value[0]
- this.comPickerInfo.dataItem.CHECK_RESULT = this.enumsData['SKCheckResultEnum'][e.indexs[0]].code
+ 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 = {
- showSheet: false,
- dataItem: this.comPickerInfo.dataItem,
- columns: [],
- title: '',
- name: '',
- formIndex: undefined
- }
- this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0]
- this.comPickerInfo.dataItem.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
+
+ this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0].NAME
+ this.comPickerInfo.dataItem.HIDDEN_LEVEL = e.value[0].ID
+ } else if (this.comPickerInfo.name == 'SKCheckResultEnum') {
+ this.comPickerInfo.dataItem.CHECK_RESULTName = e.value[0].NAME
+ this.comPickerInfo.dataItem.CHECK_RESULT = e.value[0].ID
+
+ }
+
+ this.comPickerInfo = {
+ showSheet: false,
+ columns: [],
+ title: '',
+ formIndex: undefined,
+ dataItem: this.comPickerInfo.dataItem,
}
@@ -531,7 +572,7 @@
extendRule(json, 'CHECKCONTENT', 9, p.val);
}
json.Sort = 'CHECKCONTENT'
- dataSelect = await GetCheckContentsInfo(json).then(res => {
+ dataSelect = await GetNewCheckContentsInfo(json).then(res => {
this.selectorInfo.totalCount = res.TotalCount
if (res != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
@@ -540,7 +581,24 @@
}
return res.Data
})
- } else if (p.name == 'Nav_Question') {
+ }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);
}
@@ -558,6 +616,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_CheckRecordDetailReasons.length > 0 && p.itemData.Nav_CheckRecordDetailReasons[0]
+ .Nav_Reason != null) {
+ // this.selectorInfo.defaultChecked = []
+ p.itemData.Nav_CheckRecordDetailReasons.forEach(e => {
+ defaultChecked.push(e.Nav_Reason)
+ })
+ } else {
+ defaultChecked = null
+ }
}
if (defaultChecked == null)
@@ -599,11 +688,50 @@
} else if (this.selectorInfo.name == 'Nav_Contents') {
this.selectorInfo.itemData.Nav_Contents = e;
this.selectorInfo.itemData.CHECK_CONTENTS_ID = e.ID;
+ this.selectorInfo.itemData.CHECKSTANDARD = e.CHECK_STANDARD
+ if (e.Nav_ContentsBasics && e.Nav_ContentsBasics.length > 0) {
+ let areaShow = ''
+ e.Nav_ContentsBasics.map(o => {
+ if (o.Nav_Law && o.Nav_Law.NAME) {
+ areaShow += o.Nav_Law.NAME + ' 、'
+ }
+ })
+ this.selectorInfo.itemData.Nav_CheckRecordDetailBasicsName = areaShow
+ this.selectorInfo.itemData.Nav_CheckRecordDetailBasics = e.Nav_ContentsBasics
+ }else{
+ this.selectorInfo.itemData.Nav_CheckRecordDetailBasicsName = ''
+ this.selectorInfo.itemData.Nav_CheckRecordDetailBasics = []
+ }
} else if (this.selectorInfo.name == 'Nav_Question') {
this.selectorInfo.itemData.Nav_Question = e;
this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID;
this.selectorInfo.itemData.HIDDEN_LEVEL = e.QUESTION_LEVEL
this.selectorInfo.itemData.HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item1 => item1.code === e.QUESTION_LEVEL).name;
+ } 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_CheckRecordDetailReasons = listProject
+ this.selectorInfo.itemData.ReasonsNAME = projectShow
}
@@ -625,6 +753,8 @@
Nav_Question: {
DESCREPTION: ''
},
+ Nav_CheckRecordDetailReasons: [],
+ ReasonsNAME:'',
HIDDEN_LEVEL: null,
HIDDEN_LEVELName: '',
HIDDEN_PLACE: '',
diff --git a/pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue b/pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue
index 457a8f4..e4b820b 100644
--- a/pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue
+++ b/pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue
@@ -80,6 +80,13 @@
+
+
+
+
+
+
+
@@ -88,9 +95,13 @@
-
+
+
+
+
+
@@ -103,13 +114,15 @@
-->
+
+
+
+
+
-
-
-
-
+
@@ -266,6 +279,24 @@
item.CHECK_RESULTName = item.CHECK_RESULT !== undefined ? this.enumsData['SKCheckResultEnum'].find(item1 => item1.code === item.CHECK_RESULT).name : '';
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||'';
+ if (item.Nav_CheckRecordDetailBasics && item.Nav_CheckRecordDetailBasics.length > 0) {
+ let areaShow = ''
+ item.Nav_CheckRecordDetailBasics.map(o => {
+ if (o.Nav_Law && o.Nav_Law.NAME) {
+ areaShow += o.Nav_Law.NAME + ' 、'
+ }
+
+ })
+ item.Nav_CheckRecordDetailBasicsName = areaShow
+ }
+ let ReasonsNAME = ''
+ if (item.Nav_CheckRecordDetailReasons && item.Nav_CheckRecordDetailReasons.length > 0) {
+ for (let i = 0; i < item.Nav_CheckRecordDetailReasons.length; i++) {
+ ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+ .Nav_CheckRecordDetailReasons[i].Nav_Reason.NAME;
+ }
+ }
+ item.ReasonsNAME = ReasonsNAME
})
}
diff --git a/services/apply/subPages/SK/SKServices.js b/services/apply/subPages/SK/SKServices.js
index 11ee8ef..078be24 100644
--- a/services/apply/subPages/SK/SKServices.js
+++ b/services/apply/subPages/SK/SKServices.js
@@ -496,6 +496,17 @@ export function CheckTypeNewOrderPaged(params) {
reject(error)
})
})
+}
+export function CheckSKTypeNewOrderPaged(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/SK/SKCheckType/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error) => {
+ reject(error)
+ })
+ })
}
export function RecordFullUpdate(params) {
return new Promise((resolve, reject) => {