隐患确认单

pages/apply/subPages/SK/riskReportEditNew.vue

@@ -651,7 +651,7 @@
 				})
 			},
 			submit() {
-				for (let item of this.model.Nav_ReportDetails) {
+				for (let item of this.model.Nav_ReportDetails.filter(i => !i.IS_DELETED)) {
 					if (!item.Nav_RiskArea || !item.Nav_RiskArea.NAME) {
 						uni.showToast({
 							title: '请选择检查区域',

pages/apply/subPages/SK/riskVerifyEditNew.vue

@@ -18,13 +18,13 @@
 						<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
 						</u-icon>
 					</u-form-item>
-					<u-form-item required label="检查区域:" @click="handleShowSheet({title: '检查区域', name: 'Nav_RiskArea'})">
+					<u-form-item required label="检查区域:" >
-						<u--input v-model="(model.Nav_RiskArea||{}).NAME" placeholder="请选择检查区域" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabled disabledColor="#ffffff" border="none" inputAlign="right"
+						<u--input v-model="(model.Nav_RiskArea||{}).NAME"  disabled disabledColor="#ffffff" border="none" inputAlign="right"
 							fontSize="14px">
 						</u--input>
 					</u-form-item>
 					<u-form-item label="隐患地点:" prop="HIDDEN_PLACE">
-						<u--input v-model="model.HIDDEN_PLACE" placeholder="请填写隐患地点" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+						<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" @click="handleShowSheet({title: '隐患原因', name: 'Nav_Reasons'})">
@@ -34,7 +34,7 @@
 
 
 					<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 v-model="model.HIDDEN_DESCRIPTION" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
 					</u-form-item>
 					<u-form-item required label="隐患照片:"></u-form-item>
@@ -104,10 +104,10 @@
 					</u-form-item>
 					<view class="upload-title">附件：</view>
 					<full-upload v-model="model.Nav_Files" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-					<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+				<!-- 	<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
 					</u-form-item>
 					<u-textarea v-model="item.REMARK"  placeholder="请填写备注">
-					</u-textarea>
+					</u-textarea> -->
 				</u--form>
 			</view>
 			<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button">

pages/apply/subPages/SK/riskVerifyShow.vue

@@ -62,7 +62,7 @@
 						</u-form-item> -->
 						<u-form-item label="隐患描述:" prop="HIDDEN_DESCRIPTION">
 						</u-form-item>
-						<u--textarea v-model="(model.Nav_Question||{}).DESCREPTION" disabled maxlength="-1"></u--textarea>
+						<u--textarea v-model="(model.Nav_Question||{}).DESCREPTION" disabled maxlength="-1" border="none"></u--textarea>
 						<u-form-item label="隐患等级" prop="HIDDEN_LEVEL">
 							<u--input v-model="model.HIDDEN_LEVELName" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 							</u--input>
@@ -71,7 +71,7 @@
 							<u--input v-model="model.RECTIFICATION_MEASURES" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 							</u--input>
 						</u-form-item>
-						<u-form-item label="检查层级：" prop="Check_Level">
+						<!-- <u-form-item label="检查层级：" prop="Check_Level">
 							<u--input v-model="model.DEPARTMENT_TYPEName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 
 							</u--input>
@@ -83,7 +83,12 @@
 						<u-form-item label="检查周期：" prop="Check_Period">
 							<u--input v-model="model.PLANCHECKFREQUENCYName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"></u--input>
 
+						</u-form-item> -->
+						<u-form-item label="隐患原因" prop="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" border="none"></u--textarea>
+
 						<u-form-item label="整改责任人" prop="HIDDEN_PLACE">
 							<u--input v-model="(model.Nav_RecitifyUser||{}).NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 							</u--input>
@@ -96,10 +101,10 @@
 
 						<view class="upload-title">附件：</view>
 						<full-upload v-model="model.Nav_Files" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-						<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+						<!-- <u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
 						</u-form-item>
 						<u-textarea v-model="item.REMARK" disabled placeholder="请填写备注">
-						</u-textarea>
+						</u-textarea> -->
 					</u--form>
 				</u--form>
 			</view>
@@ -256,6 +261,14 @@
 					this.model.CONTEXT = res.CONTEXT ? res.CONTEXT : ''
 					this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME,
 						'yyyy-mm-dd')
+					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
 					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 : '';