整改责任落实

pages/apply/subPages/SK/riskRectifyEditNew.vue

@@ -9,29 +9,26 @@
 					</view>
 
 					<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
-					<u-form-item label="生产单元：" prop="Product_Unit">
+					<u-form-item label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')">
 						<u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 						</u--input>
-						<!-- 	<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
+						<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
-						</u-icon> -->
+						</u-icon>
 					</u-form-item>
-					<u-form-item label="检查类型：" prop="Check_Type">
+					<!-- 	<u-form-item label="检查类型：" prop="Check_Type">
 						<u--input v-if="model.Nav_CheckType" v-model="model.Nav_CheckType.NAME" disabled disabledColor="#ffffff" 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 label="检查周期：" prop="PLANCHECKFREQUENCYName">
 						<u--input v-model="model.PLANCHECKFREQUENCYName" disabledColor="#ffffff" 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 label="检查层级：" prop="DEPARTMENT_TYPEName">
 						<u--input v-model="model.DEPARTMENT_TYPEName" disabled disabledColor="#ffffff" 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="CHECK_TIME" @click="showCheckDate(1)">
 						<u--input v-model="model.CHECK_TIME" disabled disabledColor="#ffffff" placeholder="请选择检查时间" border="none" inputAlign="right" fontSize="14px">
 
@@ -58,7 +55,7 @@
 
 					<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;margin-top: 20px;">检查内容</view>
 					<uni-collapse :border="false" accordion>
-						<view v-for="(item, index) in model.Nav_RectifyDetails" :key="index">
+						<view v-for="(item, index) in model.Nav_RectifyDetails.filter(i => !i.IS_DELETED)" :key="index">
 							<uni-collapse-item title-border="none" :border="false">
 								<template v-slot:title>
 									<view class="uni-collapse-item__title-box">
@@ -69,26 +66,31 @@
 											</span> -->
 										</view>
 										<view @click.stop>
-											<u-icon @click="handleDelRowBefore(index)" name="trash" color="#ff4d4f" size="21" style="margin-right: 10px;"></u-icon>
+											<u-icon @click="handleDelRowBefore(item)" name="trash" color="#ff4d4f" size="21" style="margin-right: 10px;"></u-icon>
 										</view>
 									</view>
 								</template>
 								<view class="content" style="padding-left:10px;">
-									<u-form-item required label="检查区域：" prop="CHECK_TIME" @click="handleShowSheetForArea(item,{title: '检查区域', name: 'Nav_RiskArea'})">
+									<u-form-item required label="检查区域：" prop="CHECK_TIME" @click="handleShowSheet({title: '检查区域', name: 'Nav_RiskArea',itemData:item})">
 										<u--input disabled v-model="(item.Nav_RiskArea||{}).NAME" 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 label="隐患描述：" prop="CHECK_TIME" @click="handleShowSheetForArea(item,{title: '隐患描述', name: 'Nav_Question'})">
+									<u-form-item label="隐患描述：" prop="CHECK_TIME" @click="handleShowSheet({title: '隐患描述', name: 'Nav_Question',itemData:item})">
 										<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 										</u-icon>
 									</u-form-item>
 									<u-textarea v-model="(item.Nav_Question||{}).DESCREPTION" disabled placeholder="请选择隐患描述">
 									</u-textarea>
+									<u-form-item label="隐患具体描述：" prop="CHECK_TIME">
+
+									</u-form-item>
+									<u-textarea v-model="item.HIDDEN_DESCRIPTION"  placeholder="请填写隐患具体描述">
+									</u-textarea>
 									<!-- <u--textarea v-model="item.Nav_Question.DESCREPTION" disabled placeholder="请选择隐患描述" maxlength="-1"></u--textarea> -->
-									<u-form-item required label="隐患等级" prop="HIDDEN_LEVEL" @click="handleChange(item)" border-bottom>
+									<u-form-item required label="隐患等级" prop="HIDDEN_LEVEL" @click="handleChange('SKHiddenLevel',item)" border-bottom>
 										<u--input v-model="item.HIDDEN_LEVELName" disabled placeholder="请选择隐患等级" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right"
 											fontSize="14px" border="none">
 										</u--input>
@@ -97,10 +99,12 @@
 										<u--input v-model="item.HIDDEN_PLACE" placeholder="请填写隐患地点" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 										</u--input>
 									</u-form-item>
-									<u-form-item label="整改措施" prop="HIDDEN_PLACE" border-bottom>
+									<u-form-item label="隐患原因" prop="Nav_Reasons" @click="handleShowSheet({title: '隐患原因', name: 'Nav_Reasons',itemData:item})">
-										<u--input v-model="item.RECTIFICATION_MEASURES" placeholder="请填写整改措施" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
-										</u--input>
 									</u-form-item>
+									<u--textarea disabled autoHeight disabledColor="#fff" v-model="item.ReasonsNAME" placeholder="隐患原因" border="none"></u--textarea>
+
+
 
 									<u-form-item label="整改期限" prop="HIDDEN_PLACE" @click="showCheckDate(2,item)">
 										<u--input v-model="item.RECITIFY_TIME" placeholder="请选择整改期限" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
@@ -108,12 +112,12 @@
 										<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 										</u-icon>
 									</u-form-item>
-									<u-form-item required label="整改落实人" prop="HIDDEN_PLACE" @click="handleShowSheetForArea(item,{title: '整改落实人', name: 'Nav_ImplementUser'})" border-bottom>
+									<u-form-item required label="整改落实人" prop="HIDDEN_PLACE" @click="handleShowSheet({title: '整改落实人', name: 'Nav_ImplementUser',itemData:item})" border-bottom>
 										<u--input v-model="(item.Nav_ImplementUser||{}).NAME" placeholder="请选择整改落实人" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabled disabledColor="#ffffff"
 											inputAlign="right" fontSize="14px" border="none">
 										</u--input>
 									</u-form-item>
-									<u-form-item required label="验收人" prop="HIDDEN_PLACE" @click="handleShowSheetForArea(item,{title: '验收人', name: 'Nav_AcceptUser'})" border-bottom>
+									<u-form-item required label="验收人" prop="HIDDEN_PLACE" @click="handleShowSheet({title: '验收人', name: 'Nav_AcceptUser',itemData:item})" border-bottom>
 										<u--input v-model="(item.Nav_AcceptUser||{}).NAME" placeholder="请选择验收人" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabled disabledColor="#ffffff"
 											inputAlign="right" fontSize="14px" border="none">
 										</u--input>
@@ -121,9 +125,13 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_RectifyDetailFiles" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+									<u-form-item label="整改措施" prop="HIDDEN_PLACE">
+
 									</u-form-item>
-									<u-textarea v-model="item.REMARK"  placeholder="请填写备注">
+									<u--textarea disabled autoHeight disabledColor="#fff" v-model="(item.Nav_Question||{}).DEMAND" border="none"></u--textarea>
+									<u-form-item label="整改措施具体描述" prop="HIDDEN_PLACE">
+									</u-form-item>
+									<u-textarea v-model="item.REMARK" placeholder="请填写整改措施具体描述">
 									</u-textarea>
 								</view>
 
@@ -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.dateTimePickerInfo.item.RECITIFY_TIME = uni.$u.timeFormat(e.value,
-					this.model.Nav_RectifyDetails[realIndex].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);
 					}
-
+					if (p.itemData.CHECK_CONTENTS_ID && p.itemData.CHECK_CONTENTS_ID !== '') {
-					let data = this.model.Nav_RectifyDetails[p.index]
+						extendRule(json, 'CHECK_CONTENTS_ID', 1, p.itemData.CHECK_CONTENTS_ID);
-					if (data.CHECK_CONTENTS_ID && data.CHECK_CONTENTS_ID !== '') {
-						extendRule(json, 'CHECK_CONTENTS_ID', 1, data.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.selectorInfo.itemData.Nav_RiskArea = e;
-					this.model.Nav_RectifyDetails[realIndex].RISK_AREA_ID = e.ID;
+					this.selectorInfo.itemData.RISK_AREA_ID = e.ID;
 				} else if (this.selectorInfo.name == 'Nav_ImplementUser') {
-					this.model.Nav_RectifyDetails[realIndex].Nav_ImplementUser = e;
+					this.selectorInfo.itemData.Nav_ImplementUser = e;
-					this.model.Nav_RectifyDetails[realIndex].IMPLEMENT_USER_ID = e.ID;
+					this.selectorInfo.itemData.IMPLEMENT_USER_ID = e.ID;
 				} else if (this.selectorInfo.name == 'Nav_Question') {
-					this.model.Nav_RectifyDetails[realIndex].Nav_Question = e;
+					this.selectorInfo.itemData.Nav_Question = e;
-					this.model.Nav_RectifyDetails[realIndex].CHECK_QUESTION_ID = e.ID;
+					this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID;
 				} else if (this.selectorInfo.name == 'Nav_AcceptUser') {
-					this.model.Nav_RectifyDetails[realIndex].Nav_AcceptUser = e;
+					this.selectorInfo.itemData.Nav_AcceptUser = e;
-					this.model.Nav_RectifyDetails[realIndex].ACCEPT_USER_ID = e.ID;
+					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) {
+			handleChange(name, item) {
-				this.comPickerInfo = {
+				if (name == 'SKProductionUnit') {
-					showSheet: true,
+					const json = initFilter(this.ORG_ID)
-					columns: [this.enumsText['SKHiddenLevel']],
+					getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
-					dataItem: item,
+						this.comPickerInfo = {
-					name: name
+							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) {
+			handleDelRowBefore(item) {
-				this.nowIndex = index
+				item.IS_DELETED = true
-				this.showDelModalIndex = index
+				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: '请选择检查区域',