89问题点隐患确认单处理
This commit is contained in:
parent
453e1f13b7
commit
ead3a2d4c8
@ -12,7 +12,7 @@
|
||||
<u-form-item label="审核意见：" prop="CONTEXT" borderBottom v-if="model.STATUS==40">
|
||||
</u-form-item>
|
||||
<u--textarea v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea>
|
||||
<u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')">
|
||||
<u-form-item label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')">
|
||||
<u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" placeholder="请选择生产单元" border="none" inputAlign="right" fontSize="14px">
|
||||
</u--input>
|
||||
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
|
||||
@ -27,6 +27,14 @@
|
||||
<u--input v-model="model.HIDDEN_PLACE" placeholder="请填写隐患地点" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
|
||||
</u--input>
|
||||
</u-form-item>
|
||||
<u-form-item label="隐患原因" prop="Nav_Reasons"
|
||||
@click="handleShowSheet({title: '隐患原因', name: 'Nav_Reasons'})">
|
||||
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
|
||||
</u-form-item>
|
||||
<u--textarea disabled autoHeight disabledColor="#fff" v-model="model.ReasonsNAME"
|
||||
placeholder="隐患原因" border="none"></u--textarea>
|
||||
|
||||
|
||||
<u-form-item label="隐患描述:" prop="HIDDEN_DESCRIPTION">
|
||||
<u--input v-model="model.HIDDEN_DESCRIPTION" placeholder="请填写隐患描述" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
|
||||
</u--input>
|
||||
@ -65,10 +73,10 @@
|
||||
<u--input v-model="model.HIDDEN_LEVELName" placeholder="请选择隐患等级" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
|
||||
</u--input>
|
||||
</u-form-item>
|
||||
<u-form-item required label="整改措施:">
|
||||
<u-form-item label="整改措施:">
|
||||
</u-form-item>
|
||||
<u--textarea v-model="model.RECTIFICATION_MEASURES" placeholder="请填写整改措施" maxlength="-1"></u--textarea>
|
||||
<u-form-item label="检查层级：" prop="Check_Level" @click="handleChange('SKDepartmentTypeEnum')">
|
||||
<u--textarea v-model="model.RECTIFICATION_MEASURES" placeholder="整改措施" maxlength="-1" disabled></u--textarea>
|
||||
<!-- <u-form-item label="检查层级：" prop="Check_Level" @click="handleChange('SKDepartmentTypeEnum')">
|
||||
<u--input v-model="model.DEPARTMENT_TYPEName" disabled disabledColor="#ffffff" placeholder="请选择检查层级" border="none" inputAlign="right" fontSize="14px">
|
||||
|
||||
</u--input>
|
||||
@ -84,7 +92,7 @@
|
||||
<u--input v-model="model.PLANCHECKFREQUENCYName" disabled disabledColor="#ffffff" placeholder="请选择检查周期" border="none" inputAlign="right" fontSize="14px"></u--input>
|
||||
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
|
||||
</u-icon>
|
||||
</u-form-item>
|
||||
</u-form-item> -->
|
||||
<u-form-item required label="整改责任人" prop="HIDDEN_PLACE" @click="handleShowSheet({title: '整改责任人', name: 'Nav_RecitifyUser'})">
|
||||
<u--input v-model="(model.Nav_RecitifyUser||{}).NAME" placeholder="请选择整改责任人" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabled disabledColor="#ffffff" inputAlign="right"
|
||||
fontSize="14px" border="none">
|
||||
@ -145,7 +153,8 @@
|
||||
getUserLists,
|
||||
CheckTypeNewOrderPaged,
|
||||
GetCheckInspection,
|
||||
GetHiddenScripList
|
||||
GetHiddenScripList,
|
||||
SKHiddenReason
|
||||
} from '../../../../services/apply/subPages/SK/SKServices.js'
|
||||
import {
|
||||
getRequest,
|
||||
@ -183,6 +192,7 @@
|
||||
Nav_Contents: {
|
||||
CHECKCONTENT: ''
|
||||
},
|
||||
Nav_Reasons:[],
|
||||
CHECKPROOF: '',
|
||||
CHECKSTANDARD: '',
|
||||
HIDDEN_DESCRIPTION_DETAIL: '',
|
||||
@ -292,6 +302,8 @@
|
||||
extendInclude(json, 'Nav_ApplyUser');
|
||||
extendInclude(json, 'Nav_Basics.Nav_Law');
|
||||
extendInclude(json, 'Nav_RiskArea');
|
||||
extendInclude(json, 'Nav_Reasons');
|
||||
extendInclude(json, 'Nav_Reasons.Nav_Reason');
|
||||
extendInclude(json, 'Nav_Contents');
|
||||
extendInclude(json, 'Nav_CheckType');
|
||||
extendInclude(json, 'Nav_RecitifyUser');
|
||||
@ -309,9 +321,17 @@
|
||||
this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME,
|
||||
'yyyy-mm-dd')
|
||||
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3
|
||||
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
|
||||
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
|
||||
// this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
|
||||
// this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
|
||||
this.model.HIDDEN_LEVELName = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : '';
|
||||
let ReasonsNAME = ''
|
||||
if (res.Nav_Reasons && res.Nav_Reasons.length > 0) {
|
||||
for (let i = 0; i < res.Nav_Reasons.length; i++) {
|
||||
ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + res
|
||||
.Nav_Reasons[i].Nav_Reason.NAME;
|
||||
}
|
||||
}
|
||||
this.model.ReasonsNAME =ReasonsNAME
|
||||
|
||||
})
|
||||
},
|
||||
@ -411,8 +431,8 @@
|
||||
return res.Data
|
||||
})
|
||||
} else if (p.name == 'Nav_Contents') {
|
||||
json.Sort = 'CREATE_TIME'
|
||||
json.Order = 1
|
||||
json.Sort = 'CHECKCONTENT'
|
||||
json.Order = 0
|
||||
dataSelect = await GetCheckContentsInfo(json).then(res => {
|
||||
this.selectorInfo.totalCount = res.TotalCount
|
||||
if (res != undefined && res.Data.length > 0) {
|
||||
@ -462,7 +482,38 @@
|
||||
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 (this.model.Nav_Reasons.length > 0 && this.model.Nav_Reasons[0]
|
||||
.Nav_Reason != null) {
|
||||
// this.selectorInfo.defaultChecked = []
|
||||
this.model.Nav_Reasons.forEach(e => {
|
||||
defaultChecked.push(e.Nav_Reason)
|
||||
})
|
||||
} else {
|
||||
defaultChecked = null
|
||||
}
|
||||
}
|
||||
|
||||
if (defaultChecked == null)
|
||||
defaultChecked = []
|
||||
@ -502,28 +553,45 @@
|
||||
this.model.Nav_Contents = e;
|
||||
this.model.CHECK_CONTENTS_ID = e.ID;
|
||||
} else if (this.selectorInfo.name == 'Nav_Question') {
|
||||
console.log(e,'111')
|
||||
this.model.Nav_Question = e;
|
||||
this.model.CHECK_QUESTION_ID = e.ID;
|
||||
this.model.RECTIFICATION_MEASURES = e.DEMAND
|
||||
this.model.HIDDEN_LEVELName = e.QUESTION_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.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_RecitifyUser') {
|
||||
this.model.Nav_RecitifyUser = e;
|
||||
this.model.RECITIFY_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_CONFIRM_ID: this.model.ID,
|
||||
REASON_ID: item.ID,
|
||||
ORG_ID: item.ORG_ID,
|
||||
Nav_Reason: item
|
||||
})
|
||||
projectShow += item.NAME
|
||||
}
|
||||
})
|
||||
}
|
||||
this.model.Nav_Reasons = listProject
|
||||
this.model.ReasonsNAME = projectShow
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
|
||||
submit() {
|
||||
if (!this.model.Nav_ProductionUnit||!this.model.Nav_ProductionUnit.NAME) {
|
||||
uni.showToast({
|
||||
title: '请选择生产单元',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
if (!this.model.Nav_RiskArea || !this.model.Nav_RiskArea.NAME) {
|
||||
uni.showToast({
|
||||
title: '请选择检查区域',
|
||||
@ -553,13 +621,6 @@
|
||||
})
|
||||
return
|
||||
}
|
||||
if (!this.model.RECTIFICATION_MEASURES) {
|
||||
uni.showToast({
|
||||
title: '请填写整改措施',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
if (!this.model.HIDDEN_LEVELName) {
|
||||
uni.showToast({
|
||||
title: '请选择隐患等级',
|
||||
|
||||
@ -786,7 +786,7 @@ export function GetSafeCheckRecordSummaryListInfo(params) {
|
||||
}
|
||||
export function GetCheckContentsInfo(params) {
|
||||
return new Promise((resolve, reject) => {
|
||||
request.post("/SK/SKCheckContents/SKOrderPaged", params).then((result) => {
|
||||
request.post("/SK/CheckContents/OrderPaged", params).then((result) => {
|
||||
if (result.IsSuccessful) {
|
||||
resolve(result);
|
||||
}
|
||||
@ -982,6 +982,17 @@ export function SKOrderEntities(params) {
|
||||
reject(error)
|
||||
})
|
||||
})
|
||||
}
|
||||
export function SKHiddenReason(params) {
|
||||
return new Promise((resolve, reject) => {
|
||||
request.post("/SK/HiddenReason/OrderPaged", params).then((result) => {
|
||||
if (result.IsSuccessful) {
|
||||
resolve(result);
|
||||
}
|
||||
}).catch((error) => {
|
||||
reject(error)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user