diff --git a/pages/apply/subPages/SK/riskRectifyEditNew.vue b/pages/apply/subPages/SK/riskRectifyEditNew.vue
index 28e8ff5..0a1d26e 100644
--- a/pages/apply/subPages/SK/riskRectifyEditNew.vue
+++ b/pages/apply/subPages/SK/riskRectifyEditNew.vue
@@ -9,29 +9,26 @@
基本信息填写
-
+
-
+
+
-
+
+
-
+
-
-
+
+ -->
@@ -58,7 +55,7 @@
检查内容
-
+
@@ -69,26 +66,31 @@
-->
-
+
-
+
-
+
+
+
+
+
+
-
+
@@ -97,10 +99,12 @@
-
-
-
+
+
+
+
+
@@ -108,12 +112,12 @@
-
+
-
+
@@ -121,9 +125,13 @@
-
+
+
-
+
+
+
+
@@ -185,7 +193,8 @@
GetHiddenScripList,
GetNewRiskAreaInfo,
getUserLists,
- CheckTypeNewOrderPaged
+ CheckTypeNewOrderPaged,
+ SKHiddenReason
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getRequest,
@@ -396,6 +405,14 @@
item.HIDDEN_LEVELName = item.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.HIDDEN_LEVEL).name : ''
item.RECITIFY_TIME = item.RECITIFY_TIME ? uni.$u.timeFormat(item.RECITIFY_TIME,
'yyyy-mm-dd') : ''
+ let ReasonsNAME = ''
+ if (item.Nav_RectifyDetailReasons && item.Nav_RectifyDetailReasons.length > 0) {
+ for (let i = 0; i < item.Nav_RectifyDetailReasons.length; i++) {
+ ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+ .Nav_RectifyDetailReasons[i].Nav_Reason.NAME;
+ }
+ }
+ item.ReasonsNAME = ReasonsNAME
// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name;
})
}
@@ -435,22 +452,12 @@
this.model.CHECK_TIME = uni.$u.timeFormat(e.value,
'yyyy-mm-dd hh:MM:ss')
} else if (this.dateTimePickerInfo.dataIndex == 2) {
- const realIndex = getRealIndex(this.dateTimePickerInfo.item, this.model.Nav_RectifyDetails)
- this.model.Nav_RectifyDetails[realIndex].RECITIFY_TIME = uni.$u.timeFormat(e.value,
+ this.dateTimePickerInfo.item.RECITIFY_TIME = uni.$u.timeFormat(e.value,
'yyyy-mm-dd')
}
this.dateTimePickerInfo.showCheckDate = false
},
- handleShowSheetForArea(item, todo) {
- const validDetails = this.model.Nav_RectifyDetails.filter(i => !i.IS_DELETED);
- const index = validDetails.indexOf(item);
- this.handleShowSheet({
- title: todo.title,
- name: todo.name,
- index: index
- });
- },
async handleShowSheet(p) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
@@ -489,10 +496,8 @@
if (p.val) {
extendRule(json, 'DESCREPTION', 9, p.val);
}
-
- let data = this.model.Nav_RectifyDetails[p.index]
- if (data.CHECK_CONTENTS_ID && data.CHECK_CONTENTS_ID !== '') {
- extendRule(json, 'CHECK_CONTENTS_ID', 1, data.CHECK_CONTENTS_ID);
+ if (p.itemData.CHECK_CONTENTS_ID && p.itemData.CHECK_CONTENTS_ID !== '') {
+ extendRule(json, 'CHECK_CONTENTS_ID', 1, p.itemData.CHECK_CONTENTS_ID);
}
json.Sort = 'DESCREPTION'
dataSelect = await GetHiddenScripList(json).then(res => {
@@ -519,6 +524,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_RectifyDetailReasons.length > 0 && p.itemData.Nav_RectifyDetailReasons[0]
+ .Nav_Reason != null) {
+ // this.selectorInfo.defaultChecked = []
+ p.itemData.Nav_RectifyDetailReasons.forEach(e => {
+ defaultChecked.push(e.Nav_Reason)
+ })
+ } else {
+ defaultChecked = null
+ }
}
if (defaultChecked == null)
@@ -554,46 +590,80 @@
handleSelected(e) {
this.selectorInfo.showPopup = false
- const validDetails = this.model.Nav_RectifyDetails.filter(i => !i.IS_DELETED);
- const index = this.selectorInfo.index;
- const realIndex = this.model.Nav_RectifyDetails.findIndex(item => item === validDetails[index]);
if (this.selectorInfo.name == 'Nav_RiskArea') {
- this.model.Nav_RectifyDetails[realIndex].Nav_RiskArea = e;
- this.model.Nav_RectifyDetails[realIndex].RISK_AREA_ID = e.ID;
+ this.selectorInfo.itemData.Nav_RiskArea = e;
+ this.selectorInfo.itemData.RISK_AREA_ID = e.ID;
} else if (this.selectorInfo.name == 'Nav_ImplementUser') {
- this.model.Nav_RectifyDetails[realIndex].Nav_ImplementUser = e;
- this.model.Nav_RectifyDetails[realIndex].IMPLEMENT_USER_ID = e.ID;
+ this.selectorInfo.itemData.Nav_ImplementUser = e;
+ this.selectorInfo.itemData.IMPLEMENT_USER_ID = e.ID;
} else if (this.selectorInfo.name == 'Nav_Question') {
- this.model.Nav_RectifyDetails[realIndex].Nav_Question = e;
- this.model.Nav_RectifyDetails[realIndex].CHECK_QUESTION_ID = e.ID;
+ this.selectorInfo.itemData.Nav_Question = e;
+ this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID;
} else if (this.selectorInfo.name == 'Nav_AcceptUser') {
- this.model.Nav_RectifyDetails[realIndex].Nav_AcceptUser = e;
- this.model.Nav_RectifyDetails[realIndex].ACCEPT_USER_ID = e.ID;
+ this.selectorInfo.itemData.Nav_AcceptUser = e;
+ this.selectorInfo.itemData.ACCEPT_USER_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(),
+ HIDDEN_DANGER_RECTIFY_NOTICE_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_RectifyDetailReasons = listProject
+ this.selectorInfo.itemData.ReasonsNAME = projectShow
}
},
- handleChange(item) {
- this.comPickerInfo = {
- showSheet: true,
- columns: [this.enumsText['SKHiddenLevel']],
- dataItem: item,
- name: name
+ 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
+ }
+ })
+
+
+ } else {
+ this.comPickerInfo = {
+ showSheet: true,
+ columns: [this.enumsText[name]],
+ name: name,
+ dataItem: item,
+ }
}
},
onConfirmPicker(e) {
+ if (this.comPickerInfo.name == 'SKProductionUnit') {
+ this.model.Nav_ProductionUnit = e.value[0]
+ this.model.PRODUCTION_UNIT_ID = e.value[0].ID
+ } else {
+ this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0]
+ this.comPickerInfo.dataItem.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
+ }
this.comPickerInfo = {
showSheet: false,
- dataItem: this.comPickerInfo.dataItem,
columns: [],
title: '',
formIndex: undefined
}
- this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0]
- this.comPickerInfo.dataItem.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
-
-
},
handleNewCheckContent() {
this.model.Nav_RectifyDetails.unshift({
@@ -610,7 +680,8 @@
NAME: ''
},
Nav_Question: {
- DESCREPTION: ''
+ DESCREPTION: '',
+ DEMAND:''
},
Nav_ImplementUser: {
NAME: ''
@@ -622,12 +693,16 @@
CHECK_QUESTION_ID: '',
IMPLEMENT_USER_ID: '',
ACCEPT_USER_ID: '',
+ Nav_RectifyDetailReasons:[],
+ ReasonsNAME:'',
+
+
})
this.model.Nav_RectifyDetails = [...this.model.Nav_RectifyDetails]
},
- handleDelRowBefore(index) {
- this.nowIndex = index
- this.showDelModalIndex = index
+ handleDelRowBefore(item) {
+ item.IS_DELETED = true
+ this.$forceUpdate()
},
confirmDel() {
@@ -638,7 +713,7 @@
this.showDelModalIndex = undefined
},
submit() {
- for (let item of this.model.Nav_RectifyDetails) {
+ for (let item of this.model.Nav_RectifyDetails.filter(i => !i.IS_DELETED)) {
if (!item.Nav_RiskArea || !item.Nav_RiskArea.NAME) {
uni.showToast({
title: '请选择检查区域',