隐患整改记录

pages/apply/subPages/SK/riskRectifyRecordEditNew.vue

@@ -32,28 +32,43 @@
 						<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" @click="handleShowSheet({title: '隐患描述', name: 'Nav_Question'})">
 						<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 						</u-icon>
 					</u-form-item>
 					<u-textarea v-model="(model.Nav_Question||{}).DESCREPTION" disabled placeholder="请选择隐患描述"></u-textarea>
+					<u-form-item label="隐患具体描述：" prop="CHECK_TIME">
+					
+					</u-form-item>
+					<u-textarea v-model="model.HIDDEN_DESCRIPTION"  placeholder="请填写隐患具体描述">
+					</u-textarea>
 					<u-form-item required label="隐患等级" prop="HIDDEN_LEVEL" @click="handleChange('SKHiddenLevel')">
 						<u--input v-model="model.HIDDEN_LEVELNAME" disabled placeholder="请选择隐患等级" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px"
 							border="none">
 						</u--input>
 					</u-form-item>
-					<u-form-item label="整改措施:">
+					<u-form-item label="整改措施" prop="HIDDEN_PLACE">
-						<u--input v-model="model.RECTIFICATION_MEASURES" placeholder="请填写整改措施" disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+					
-						</u--input>
 					</u-form-item>
+					<u--textarea disabled autoHeight disabledColor="#fff" v-model="(model.Nav_Question||{}).DEMAND" border="none"></u--textarea>
+					<u-form-item label="整改措施具体描述" prop="HIDDEN_PLACE">
+					</u-form-item>
+					<u-textarea v-model="model.REMARK" placeholder="请填写整改措施具体描述">
+					</u-textarea>
 					<u-form-item label="整改期限" prop="HIDDEN_PLACE" @click="showCheckDate(1)">
 						<u--input v-model="model.RECITIFY_TIME" disabled placeholder="请选择整改期限" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
 						<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 						</u-icon>
 					</u-form-item>
-					<u-form-item label="整改责任人:">
+					<u-form-item required label="整改责任人:" @click="handleShowSheet({title: '整改责任人', name: 'Nav_RecitifyUser'})">
-						<u--input v-model="(model.Nav_RecitifyUser||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+						<u--input v-model="(model.Nav_RecitifyUser||{}).NAME" disabled disabledColor="#ffffff" border="none" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" inputAlign="right" fontSize="14px">
 						</u--input>
 					</u-form-item>
 					<u-form-item required label="验收人" prop="HIDDEN_PLACE" @click="handleShowSheet({title: '验收人', name: 'Nav_AcceptUser'})">
@@ -69,11 +84,10 @@
 						<u--input v-model="model.RECTIFICATION_MONEY" placeholder="请填写整改资金" disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 						</u--input>
 					</u-form-item>
-					<u-form-item label="整改完成时间" prop="HIDDEN_PLACE" @click="showCheckDate(2)">
+					<u-form-item label="整改完成时间" prop="HIDDEN_PLACE" >
-						<u--input v-model="model.COMPLETE_DATE" disabled placeholder="请选择整改完成时间" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+						<u--input v-model="model.COMPLETE_DATE" disabled  disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
-						<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
+						
-						</u-icon>
 					</u-form-item>
 					<view class="upload-title">整改前照片：</view>
 					<full-upload v-model="model.Nav_RectifyPhotoas" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload' v-if="model.Nav_RectifyPhotoas"></full-upload>
@@ -82,7 +96,7 @@
 					<view class="upload-title">预案或方案：</view>
 					<full-upload v-model="model.Nav_RectifyFiles" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload' v-if="model.Nav_RectifyFiles"></full-upload>
 					<view v-if="model.STATUS !== 0&&model.STATUS!==40">
-						<u-form-item label="验收时间" prop="HIDDEN_PLACE" @click="showCheckDate(3)">
+						<u-form-item label="验收时间" prop="HIDDEN_PLACE" @click="showCheckDate(3)" v-if="model.STATUS !== 10">
 							<u--input v-model="model.ACCEPT_DATE" disabled placeholder="请选择验收时间" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 							</u--input>
 							<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
@@ -98,10 +112,7 @@
 							</u--input>
 						</u-form-item>
 					</view>
-					<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+					
-					</u-form-item>
-					<u-textarea v-model="item.REMARK"  placeholder="请填写备注">
-					</u-textarea>
 
 				</u--form>
 
@@ -145,7 +156,8 @@
 		RectifyFullUpdateEdit,
 		GetCheckContentsInfo,
 		GetHiddenScripList,
-		getUserLists
+		getUserLists,
+		SKHiddenReason
 	} from '../../../../services/apply/subPages/SK/SKServices.js'
 	import {
 		getRequest,
@@ -278,10 +290,18 @@
 					this.model = res;
 					this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME,
 						'yyyy-mm-dd')
-					this.model.COMPLETE_DATE = uni.$u.timeFormat(res.COMPLETE_DATE,
+					this.model.COMPLETE_DATE =res.COMPLETE_DATE? uni.$u.timeFormat(res.COMPLETE_DATE,
-						'yyyy-mm-dd')
+						'yyyy-mm-dd'):''
 					this.model.ACCEPT_DATE = uni.$u.timeFormat(res.ACCEPT_DATE,
 						'yyyy-mm-dd')
+						let ReasonsNAME = ''
+						if (this.model.Nav_RectifyReasons && this.model.Nav_RectifyReasons.length > 0) {
+							for (let i = 0; i < this.model.Nav_RectifyReasons.length; i++) {
+								ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + this.model
+									.Nav_RectifyReasons[i].Nav_Reason.NAME;
+							}
+						}
+						this.model.ReasonsNAME = ReasonsNAME
 					this.model.HIDDEN_LEVELNAME = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : '';
 					this.model.ACCEPT_RESULTENAME = res.ACCEPT_RESULTE !== undefined ? this.enumsData['SKAcceptResultEnum'].find(item => item.code === res.ACCEPT_RESULTE).name : '';
 					this.stepsPage = res.STATUS == 0 || res.STATUS == 40 ? 0 : res.STATUS == 10 ? 1 : res.STATUS == 20 ? 2 : 3
@@ -393,6 +413,7 @@
 					if (p.val) {
 						extendRule(json, 'CHECKCONTENT', 9, p.val);
 					}
+					json.Sort = 'CHECKCONTENT'
 					// extendRule(json, 'DEVICE_STATUS', 1, '1');
 					dataSelect = await GetCheckContentsInfo(json).then(res => {
 						this.selectorInfo.totalCount = res.TotalCount
@@ -421,7 +442,7 @@
 						}
 						return res.Data
 					})
-				} else if (p.name == 'Nav_AcceptUser') {
+				} else if (p.name == 'Nav_AcceptUser'||p.name == 'Nav_RecitifyUser') {
 					if (p.val) {
 						extendRule(json, 'NAME', 9, p.val);
 					}
@@ -436,6 +457,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 (this.model.Nav_RectifyReasons.length > 0 && this.model.Nav_RectifyReasons[0]
+						.Nav_Reason != null) {
+						// this.selectorInfo.defaultChecked = []
+						this.model.Nav_RectifyReasons.forEach(e => {
+							defaultChecked.push(e.Nav_Reason)
+						})
+					} else {
+						defaultChecked = null
+					}
 				}
 
 				if (defaultChecked == null)
@@ -482,6 +534,31 @@
 				} else if (this.selectorInfo.name == 'Nav_AcceptUser') {
 					this.model.Nav_AcceptUser = e;
 					this.model.ACCEPT_USER_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_RECTIFY_NOTICE_DETAIL_ID: this.ID,
+									REASON_ID: item.ID,
+									ORG_ID: item.ORG_ID,
+									Nav_Reason: item
+								})
+								projectShow += item.NAME
+							}
+						})
+					}
+					this.model.Nav_RectifyReasons = listProject
+					this.model.ReasonsNAME = projectShow
 				}
 				this.selectorInfo.showPopup = false
 
@@ -517,6 +594,13 @@
 					})
 					return
 				}
+				if (!this.model.Nav_RecitifyUser || !this.model.Nav_RecitifyUser.NAME) {
+					uni.showToast({
+						title: '请选择整改责任人',
+						icon: 'none'
+					})
+					return
+				}
 				if (!this.model.Nav_AcceptUser || !this.model.Nav_AcceptUser.NAME) {
 					uni.showToast({
 						title: '请选择验收人',

pages/apply/subPages/SK/riskRectifyRecordShow.vue

@@ -29,7 +29,7 @@
 						</u--input>
 
 					</u-form-item>
-					<u-form-item label="发现区域:">
+					<u-form-item label="检查区域:">
 						<u--input v-model="(model.Nav_RiskArea||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 						</u--input>
 					</u-form-item>
@@ -37,6 +37,11 @@
 						<u--input v-model="model.HIDDEN_PLACE" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
 					</u-form-item>
+					<u-form-item label="隐患原因" prop="Nav_Reasons">
+
+					</u-form-item>
+					<u--textarea disabled autoHeight disabledColor="#fff" v-model="model.ReasonsNAME" border="none"></u--textarea>
+
 					<u-form-item label="隐患描述:" prop="HIDDEN_DESCRIPTION">
 						<u--input v-model="(model.Nav_Question||{}).DESCREPTION" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
@@ -46,9 +51,13 @@
 						</u--input>
 					</u-form-item>
 					<u-form-item label="整改措施:">
-						<u--input v-model="model.RECTIFICATION_MEASURES" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+						<u--input v-model="(model.Nav_Question||{}).DEMAND" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 						</u--input>
 					</u-form-item>
+					<u-form-item label="整改措施具体描述" prop="HIDDEN_PLACE">
+					</u-form-item>
+					<u-textarea v-model="model.REMARK" disabled>
+					</u-textarea>
 					<u-form-item label="整改期限:" prop="HIDDEN_PLACE">
 						<u--input v-model="model.RECITIFY_TIME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
@@ -87,6 +96,7 @@
 					<full-upload v-model="model.Nav_RectifyPhotobs" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload' v-if="model.Nav_RectifyPhotobs"></full-upload>
 					<view class="upload-title">预案或方案：</view>
 					<full-upload v-model="model.Nav_RectifyFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload' v-if="model.Nav_RectifyFiles"></full-upload>
+						<view v-if="model.STATUS == 20||model.STATUS==30">
 					<u-form-item label="验收时间:" prop="HIDDEN_PLACE">
 						<u--input v-model="model.ACCEPT_DATE" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
@@ -99,10 +109,8 @@
 						<u--input v-model="model.ACCEPT_OPINION" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 						</u--input>
 					</u-form-item>
-					<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+					</view>
-					</u-form-item>
+
-					<u-textarea v-model="item.REMARK" disabled placeholder="请填写备注">
-					</u-textarea>
 				</u--form>
 			</view>
 			<check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi" :dataSource="$store.state.auditModel"></check-action>
@@ -247,6 +255,14 @@
 						'yyyy-mm-dd')
 					this.model.ACCEPT_DATE = uni.$u.timeFormat(res.ACCEPT_DATE,
 						'yyyy-mm-dd')
+					let ReasonsNAME = ''
+					if (this.model.Nav_RectifyReasons && this.model.Nav_RectifyReasons.length > 0) {
+						for (let i = 0; i < this.model.Nav_RectifyReasons.length; i++) {
+							ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + this.model
+								.Nav_RectifyReasons[i].Nav_Reason.NAME;
+						}
+					}
+					this.model.ReasonsNAME = ReasonsNAME
 					this.model.HIDDEN_LEVELNAME = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : '';
 					this.model.ACCEPT_RESULTENAME = res.ACCEPT_RESULTE !== undefined ? this.enumsData['SKAcceptResultEnum'].find(item => item.code === res.ACCEPT_RESULTE).name : '';
 					this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 10 ? 1 : res.STATUS == 20 ? 2 : 3