通知-汇总

pages/apply/subPages/SK/safeCheckEditNew.vue

@@ -160,7 +160,7 @@
 		FullUpdate,
 		GetNewRiskAreaInfo,
 		GetIdentityUserEditNew,
-		CheckTypeNewOrderPaged
+		CheckSKTypeNewOrderPaged
 	} from '../../../../services/apply/subPages/SK/SKServices.js'
 	import {
 		getEnum,
@@ -560,7 +560,7 @@
 						extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
 					}
 
-					dataSelect = await CheckTypeNewOrderPaged(json).then(res => {
+					dataSelect = await CheckSKTypeNewOrderPaged(json).then(res => {
 						this.selectorInfo.totalCount = res.TotalCount
 						if (res != undefined && res.Data.length > 0) {
 							for (let i = 0; i < res.Data.length; i++) {

pages/apply/subPages/SK/safeCheckRecordEditNew.vue

@@ -9,16 +9,15 @@
 					</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 required 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--input 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>
@@ -93,6 +92,13 @@
 										</u-icon>
 									</u-form-item>
 									<u-textarea v-model="(item.Nav_Contents||{}).CHECKCONTENT" disabled placeholder="请选择检查内容"></u-textarea>
+									<u-form-item borderBottom label="检查依据" prop="HIDDEN_PLACE" border-bottom>
+									</u-form-item>
+									<u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea>
+									<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 									<u-form-item required label="检查情况" prop="Product_Unit" @click="handleChange('SKCheckResultEnum',item)" borderBottom>
 										<u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" placeholder="请选择检查情况" border="none" inputAlign="right" fontSize="14px">
 										</u--input>
@@ -115,6 +121,11 @@
 										<u-icon style="margin-left: 10px;" name="trash" color="#ff4d4f" size="20" @click="handleDelQuestion(item)">
 										</u-icon>
 									</view>
+									<u-form-item label="隐患具体描述：" prop="CHECK_TIME">
+
+									</u-form-item>
+									<u-textarea v-model="item.HIDDEN_DESCRIPTION" placeholder="请填写隐患具体描述">
+									</u-textarea>
 									<u-form-item 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">
@@ -124,6 +135,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="Nav_Reasons" @click="handleShowSheet({title: '隐患原因', name: 'Nav_Reasons',itemData:item})">
+										<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="item.ReasonsNAME" placeholder="隐患原因" border="none"></u--textarea>
+
+
 									<!-- <u-form-item label="是否新增" borderBottom>
 										<u--input v-model="item.MARKName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 										</u--input>
@@ -131,10 +148,6 @@
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_CheckRecordDetailFiles" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
-									</u-form-item>
-									<u-textarea v-model="item.REMARK" placeholder="请填写备注">
-									</u-textarea>
 								</view>
 
 
@@ -190,11 +203,13 @@
 		MineTypeName
 	} from '../../../../utils/enums.js'
 	import {
-		GetCheckContentsInfo,
+		GetNewCheckContentsInfo,
 		GetNewRiskAreaInfo,
 		GetSafeInfo,
 		RecordFullUpdate,
-		GetHiddenScripList
+		GetHiddenScripList,
+		CheckSKTypeNewOrderPaged,
+		SKHiddenReason
 	} from '../../../../services/apply/subPages/SK/SKServices.js'
 	import {
 		getRequest,
@@ -375,6 +390,24 @@
 							item.HIDDEN_LEVELName = ''
 							item.HIDDEN_LEVEL = null
 						}
+						if (item.Nav_CheckRecordDetailBasics && item.Nav_CheckRecordDetailBasics.length > 0) {
+							let areaShow = ''
+							item.Nav_CheckRecordDetailBasics.map(o => {
+								if (o.Nav_Law && o.Nav_Law.NAME) {
+									areaShow += o.Nav_Law.NAME + ' 、'
+								}
+
+							})
+							item.Nav_CheckRecordDetailBasicsName = areaShow
+						}
+						let ReasonsNAME = ''
+						if (item.Nav_CheckRecordDetailReasons && item.Nav_CheckRecordDetailReasons.length > 0) {
+							for (let i = 0; i < item.Nav_CheckRecordDetailReasons.length; i++) {
+								ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+									.Nav_CheckRecordDetailReasons[i].Nav_Reason.NAME;
+							}
+						}
+						item.ReasonsNAME = ReasonsNAME
 
 						// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name;
 					}))
@@ -382,6 +415,13 @@
 				})
 			},
 			stepAdd() {
+				if (!this.model.PRODUCTION_UNIT_ID) {
+					uni.showToast({
+						title: '请选择生产单元',
+						icon: 'none'
+					})
+					return
+				}
 				if (!this.model.CHECK_TIME) {
 					uni.showToast({
 						title: '请选择检查时间',
@@ -497,6 +537,11 @@
 					Nav_Question: {
 						DESCREPTION: ''
 					},
+					HIDDEN_DESCRIPTION: '',
+					Nav_CheckRecordDetailReasons: [],
+					ReasonsNAME:'',
+					Nav_CheckRecordDetailBasics: [],
+					CHECKCONTENT: '',
 					HIDDEN_LEVEL: null,
 					HIDDEN_LEVELName: '',
 					HIDDEN_PLACE: '',
@@ -524,48 +569,49 @@
 				this.showDelModalIndex = undefined
 			},
 			handleChange(name, item) {
-				if (name == 'SKCheckResultEnum') {
+				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['SKCheckResultEnum']],
+						columns: [this.enumsData[name]],
+						name: name,
 						dataItem: item,
-						name: name
+
-					}
-				} else if (name == 'SKHiddenLevel') {
-					this.comPickerInfo = {
-						showSheet: true,
-						columns: [this.enumsText['SKHiddenLevel']],
-						dataItem: item,
-						name: name
 					}
 				}
 
+
 			},
 			onConfirmPicker(e) {
-				if (this.comPickerInfo.name == 'SKCheckResultEnum') {
+				if (this.comPickerInfo.name == 'SKProductionUnit') {
-					this.comPickerInfo = {
+					this.model.Nav_ProductionUnit = e.value[0]
-						showSheet: false,
+					this.model.PRODUCTION_UNIT_ID = e.value[0].ID
-						dataItem: this.comPickerInfo.dataItem,
+				} else if (this.comPickerInfo.name == 'SKCheckResultEnum') {
-						columns: [],
+					this.comPickerInfo.dataItem.CHECK_RESULTName = e.value[0].NAME
-						title: '',
+					this.comPickerInfo.dataItem.CHECK_RESULT = e.value[0].ID
-						formIndex: undefined
-					}
-					this.comPickerInfo.dataItem.CHECK_RESULTName = e.value[0]
-					this.comPickerInfo.dataItem.CHECK_RESULT = this.enumsData['SKCheckResultEnum'][e.indexs[0]].code
 
 				} else if (this.comPickerInfo.name == 'SKHiddenLevel') {
-					this.comPickerInfo = {
+					this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0].NAME
-						showSheet: false,
+					this.comPickerInfo.dataItem.HIDDEN_LEVEL = e.value[0].ID
-						dataItem: this.comPickerInfo.dataItem,
+				}
-						columns: [],
+				this.comPickerInfo = {
-						title: '',
+					showSheet: false,
-						name: '',
+					dataItem: this.comPickerInfo.dataItem,
-						formIndex: undefined
+					columns: [],
-					}
+					title: '',
-					this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0]
+					name: '',
-					this.comPickerInfo.dataItem.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
+					formIndex: undefined
 				}
-
 
 			},
 			async handleShowSheet(p) {
@@ -602,13 +648,30 @@
 						}
 						return res.Data
 					})
+				} else if (p.name == 'Nav_CheckType') {
+					if (p.val) {
+						extendRule(json, 'NAME', 9, p.val);
+					}
+					if (this.model.PRODUCTION_UNIT_ID) {
+						extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
+					}
+
+					dataSelect = await CheckSKTypeNewOrderPaged(json).then(res => {
+						this.selectorInfo.totalCount = res.TotalCount
+						if (res != undefined && res.Data.length > 0) {
+							for (let i = 0; i < res.Data.length; i++) {
+								res.Data[i].name = res.Data[i].NAME
+							}
+						}
+						return res.Data
+					})
 				} else if (p.name == 'Nav_Contents') {
 					if (p.val) {
 						extendRule(json, 'CHECKCONTENT', 9, p.val);
 					}
 
 					json.Sort = 'CHECKCONTENT'
-					dataSelect = await GetCheckContentsInfo(json).then(res => {
+					dataSelect = await GetNewCheckContentsInfo(json).then(res => {
 						this.selectorInfo.totalCount = res.TotalCount
 						if (res != undefined && res.Data.length > 0) {
 							for (let i = 0; i < res.Data.length; i++) {
@@ -634,6 +697,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_CheckRecordDetailReasons.length > 0 && p.itemData.Nav_CheckRecordDetailReasons[0]
+						.Nav_Reason != null) {
+						// this.selectorInfo.defaultChecked = []
+						p.itemData.Nav_CheckRecordDetailReasons.forEach(e => {
+							defaultChecked.push(e.Nav_Reason)
+						})
+					} else {
+						defaultChecked = null
+					}
 				}
 
 				if (defaultChecked == null)
@@ -675,11 +769,50 @@
 				} else if (this.selectorInfo.name == 'Nav_Contents') {
 					this.selectorInfo.itemData.Nav_Contents = e;
 					this.selectorInfo.itemData.CHECK_CONTENTS_ID = e.ID;
+					this.selectorInfo.itemData.CHECKSTANDARD = e.CHECK_STANDARD
+					if (e.Nav_ContentsBasics && e.Nav_ContentsBasics.length > 0) {
+						let areaShow = ''
+						e.Nav_ContentsBasics.map(o => {
+							if (o.Nav_Law && o.Nav_Law.NAME) {
+								areaShow += o.Nav_Law.NAME + ' 、'
+							}
+						})
+						this.selectorInfo.itemData.Nav_CheckRecordDetailBasicsName = areaShow
+						this.selectorInfo.itemData.Nav_CheckRecordDetailBasics = e.Nav_ContentsBasics
+					}else{
+						this.selectorInfo.itemData.Nav_CheckRecordDetailBasicsName = ''
+						this.selectorInfo.itemData.Nav_CheckRecordDetailBasics = []
+					}
 				} else if (this.selectorInfo.name == 'Nav_Question') {
 					this.selectorInfo.itemData.Nav_Question = e;
 					this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID;
 					this.selectorInfo.itemData.HIDDEN_LEVEL = e.QUESTION_LEVEL
 					this.selectorInfo.itemData.HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item1 => item1.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_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(),
+									SECURITY_INSPECTION_RECORD_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_CheckRecordDetailReasons = listProject
+					this.selectorInfo.itemData.ReasonsNAME = projectShow
 				}
 
 

pages/apply/subPages/SK/safeCheckRecordShow.vue

@@ -79,6 +79,13 @@
 
 									</u-form-item>
 									<u-textarea v-model="(item.Nav_Contents||{}).CHECKCONTENT" disabled></u-textarea>
+									<u-form-item borderBottom label="检查依据" prop="HIDDEN_PLACE" border-bottom>
+									</u-form-item>
+									<u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea>
+									<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 									<u-form-item label="检查情况" prop="Product_Unit" borderBottom>
 										<u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 										</u--input>
@@ -87,9 +94,13 @@
 									<u-form-item label="隐患描述：" prop="CHECK_TIME">
 
 									</u-form-item>
-									<u-textarea v-if="item.Nav_Question" v-model="item.Nav_Question.DESCREPTION" disabled>
+									<u-textarea v-model="(item.Nav_Question||{}).DESCREPTION" disabled autoHeight  border="none">
 									</u-textarea>
+									<u-form-item label="隐患具体描述：" prop="CHECK_TIME" border="none">
 
+									</u-form-item>
+									<u-textarea v-model="item.HIDDEN_DESCRIPTION" disabled autoHeight  border="none">
+									</u-textarea>
 									<u-form-item label="隐患等级" prop="HIDDEN_LEVEL" border-bottom>
 										<u--input v-model="item.HIDDEN_LEVELName" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 										</u--input>
@@ -102,13 +113,15 @@
 										<u--input v-model="item.MARKName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 										</u--input>
 									</u-form-item> -->
+									<u-form-item label="隐患原因" prop="Nav_Reasons">
+										
+									</u-form-item>
+									<u--textarea disabled autoHeight disabledColor="#fff" v-model="item.ReasonsNAME" border="none"></u--textarea>
+
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_CheckRecordDetailFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+
-									</u-form-item>
-									<u-textarea v-model="item.REMARK" disabled placeholder="请填写备注">
-									</u-textarea>
 								</view>
 							</uni-collapse-item>
 						</view>
@@ -263,6 +276,24 @@
 						this.model.Nav_CheckRecordDetails.map(item => {
 							item.CHECK_RESULTName = item.CHECK_RESULT !== undefined ? this.enumsData['SKCheckResultEnum'].find(item1 => item1.code === item.CHECK_RESULT).name : '';
 							item.HIDDEN_LEVELName = item.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.HIDDEN_LEVEL).name : '';
+							if (item.Nav_CheckRecordDetailBasics && item.Nav_CheckRecordDetailBasics.length > 0) {
+								let areaShow = ''
+								item.Nav_CheckRecordDetailBasics.map(o => {
+									if (o.Nav_Law && o.Nav_Law.NAME) {
+										areaShow += o.Nav_Law.NAME + ' 、'
+									}
+							
+								})
+								item.Nav_CheckRecordDetailBasicsName = areaShow
+							}
+							let ReasonsNAME = ''
+							if (item.Nav_CheckRecordDetailReasons && item.Nav_CheckRecordDetailReasons.length > 0) {
+								for (let i = 0; i < item.Nav_CheckRecordDetailReasons.length; i++) {
+									ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+										.Nav_CheckRecordDetailReasons[i].Nav_Reason.NAME;
+								}
+							}
+							item.ReasonsNAME = ReasonsNAME
 							// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name||'';
 						})
 					}

pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue

@@ -9,28 +9,28 @@
 					</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 v-model="(model.Nav_ProductionUnit||{}).NAME" placeholder="请选择生产单元" 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" @click="handleShowSheet({title: '检查类型', name: 'Nav_CheckType'})">
-						<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--input placeholder="请选择检查类型" 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 style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
-						</u-icon> -->
+						</u-icon>
 					</u-form-item>
-					<u-form-item label="检查周期：" prop="PLANCHECKFREQUENCYName">
+					<u-form-item label="检查周期：" prop="PLANCHECKFREQUENCYName" @click="handleChange('SKPLANCHECKFREQUENCYEnum')">
-						<u--input v-model="model.PLANCHECKFREQUENCYName" disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"></u--input>
+						<u--input v-model="model.PLANCHECKFREQUENCYName" disabled placeholder="请选择检查周期" 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="DEPARTMENT_TYPEName">
+					<u-form-item label="检查层级：" prop="DEPARTMENT_TYPEName" @click="handleChange('SKDepartmentTypeEnum')">
-						<u--input v-model="model.DEPARTMENT_TYPEName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+						<u--input v-model="model.DEPARTMENT_TYPEName" disabled placeholder="请选择检查层级" 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_TIME" @click="handleChangeDate()">
 						<u--input v-model="model.CHECK_TIME" disabled disabledColor="#ffffff" placeholder="请选择检查时间" border="none" inputAlign="right" fontSize="14px">
@@ -95,6 +95,13 @@
 										</u-icon>
 									</u-form-item>
 									<u-textarea v-model="(item.Nav_Contents||{}).CHECKCONTENT" disabled placeholder="请选择检查内容"></u-textarea>
+									<u-form-item borderBottom label="检查依据" prop="HIDDEN_PLACE" border-bottom>
+									</u-form-item>
+									<u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea>
+									<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 									<u-form-item required label="检查情况" prop="Product_Unit" @click="handleChange('SKCheckResultEnum',item)" borderBottom>
 										<u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" placeholder="请选择检查情况" border="none" inputAlign="right" fontSize="14px">
 										</u--input>
@@ -117,6 +124,11 @@
 										<u-icon style="margin-left: 10px;" name="trash" color="#ff4d4f" size="20" @click="handleDelQuestion(item)">
 										</u-icon>
 									</view>
+									<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 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"
@@ -127,13 +139,15 @@
 										<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="Nav_Reasons" @click="handleShowSheet({title: '隐患原因', name: 'Nav_Reasons',itemData:item})">
+										<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="item.ReasonsNAME" placeholder="隐患原因" border="none"></u--textarea>
+
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_CheckRecordDetailFiles" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+
-									</u-form-item>
-									<u-textarea v-model="item.REMARK" placeholder="请填写备注">
-									</u-textarea>
 								</view>
 
 
@@ -187,14 +201,16 @@
 		MineTypeName
 	} from '../../../../utils/enums.js'
 	import {
-		GetCheckContentsInfo,
+		GetNewCheckContentsInfo,
 		GetRecordSummary,
 		SummaryFullUpdate,
 		GetRiskAreaInfo,
 		GetCheckInspection,
 		GetHiddenScripList,
 		GetNewRiskAreaInfo,
-		CheckTypeNewOrderPaged
+		CheckTypeNewOrderPaged,
+		CheckSKTypeNewOrderPaged,
+		SKHiddenReason
 	} from '../../../../services/apply/subPages/SK/SKServices.js'
 	import {
 		getRequest,
@@ -372,6 +388,24 @@
 								item.HIDDEN_LEVELName = ''
 								item.HIDDEN_LEVEL = null
 							}
+							if (item.Nav_CheckRecordDetailBasics && item.Nav_CheckRecordDetailBasics.length > 0) {
+								let areaShow = ''
+								item.Nav_CheckRecordDetailBasics.map(o => {
+									if (o.Nav_Law && o.Nav_Law.NAME) {
+										areaShow += o.Nav_Law.NAME + ' 、'
+									}
+
+								})
+								item.Nav_CheckRecordDetailBasicsName = areaShow
+							}
+							let ReasonsNAME = ''
+							if (item.Nav_CheckRecordDetailReasons && item.Nav_CheckRecordDetailReasons.length > 0) {
+								for (let i = 0; i < item.Nav_CheckRecordDetailReasons.length; i++) {
+									ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+										.Nav_CheckRecordDetailReasons[i].Nav_Reason.NAME;
+								}
+							}
+							item.ReasonsNAME = ReasonsNAME
 
 							// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name;
 						})
@@ -448,46 +482,53 @@
 				}
 			},
 			handleChange(name, item) {
-				if (name == 'SKCheckResultEnum') {
+				if (name == 'SKProductionUnit') {
+					const json = initFilter(this.ORG_ID)
+					getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
+						this.comPickerInfo = {
+							showSheet: true,
+							columns: [res],
+							name: name,
+							dataItem: item,
+						}
+					})
+				} else {
 					this.comPickerInfo = {
 						showSheet: true,
-						columns: [this.enumsText['SKCheckResultEnum']],
+						columns: [this.enumsData[name]],
+						name: name,
 						dataItem: item,
-						name: name
-					}
-				} else if (name == 'SKHiddenLevel') {
-					this.comPickerInfo = {
-						showSheet: true,
-						columns: [this.enumsText['SKHiddenLevel']],
-						dataItem: item,
-						name: name
 					}
 				}
 
 			},
 			onConfirmPicker(e) {
-				if (this.comPickerInfo.name == 'SKCheckResultEnum') {
-					this.comPickerInfo = {
-						showSheet: false,
-						dataItem: this.comPickerInfo.dataItem,
-						columns: [],
-						title: '',
-						formIndex: undefined
-					}
-					this.comPickerInfo.dataItem.CHECK_RESULTName = e.value[0]
-					this.comPickerInfo.dataItem.CHECK_RESULT = this.enumsData['SKCheckResultEnum'][e.indexs[0]].code
 
+				if (this.comPickerInfo.name == 'SKProductionUnit') {
+					this.model.Nav_ProductionUnit = e.value[0]
+					this.model.PRODUCTION_UNIT_ID = e.value[0].ID
+				} else if (this.comPickerInfo.name == 'SKPLANCHECKFREQUENCYEnum') {
+					this.model.PLANCHECKFREQUENCYName = e.value[0].name
+					this.model.PLANCHECKFREQUENCY = this.enumsData['SKPLANCHECKFREQUENCYEnum'][e.indexs[0]].code
+				} else if (this.comPickerInfo.name == 'SKDepartmentTypeEnum') {
+					this.model.DEPARTMENT_TYPEName = e.value[0].name
+					this.model.DEPARTMENT_TYPE = this.enumsData['SKDepartmentTypeEnum'][e.indexs[0]].code
 				} else if (this.comPickerInfo.name == 'SKHiddenLevel') {
-					this.comPickerInfo = {
+
-						showSheet: false,
+					this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0].NAME
-						dataItem: this.comPickerInfo.dataItem,
+					this.comPickerInfo.dataItem.HIDDEN_LEVEL = e.value[0].ID
-						columns: [],
+				} else if (this.comPickerInfo.name == 'SKCheckResultEnum') {
-						title: '',
+					this.comPickerInfo.dataItem.CHECK_RESULTName = e.value[0].NAME
-						name: '',
+					this.comPickerInfo.dataItem.CHECK_RESULT = e.value[0].ID
-						formIndex: undefined
+
-					}
+				}
-					this.comPickerInfo.dataItem.HIDDEN_LEVELName = e.value[0]
+
-					this.comPickerInfo.dataItem.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
+				this.comPickerInfo = {
+					showSheet: false,
+					columns: [],
+					title: '',
+					formIndex: undefined,
+					dataItem: this.comPickerInfo.dataItem,
 				}
 
 
@@ -531,7 +572,7 @@
 						extendRule(json, 'CHECKCONTENT', 9, p.val);
 					}
 					json.Sort = 'CHECKCONTENT'
-					dataSelect = await GetCheckContentsInfo(json).then(res => {
+					dataSelect = await GetNewCheckContentsInfo(json).then(res => {
 						this.selectorInfo.totalCount = res.TotalCount
 						if (res != undefined && res.Data.length > 0) {
 							for (let i = 0; i < res.Data.length; i++) {
@@ -540,7 +581,24 @@
 						}
 						return res.Data
 					})
-				} else if (p.name == 'Nav_Question') {
+				}else if (p.name == 'Nav_CheckType') {
+					if (p.val) {
+						extendRule(json, 'NAME', 9, p.val);
+					}
+					if (this.model.PRODUCTION_UNIT_ID) {
+						extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
+					}
+
+					dataSelect = await CheckSKTypeNewOrderPaged(json).then(res => {
+						this.selectorInfo.totalCount = res.TotalCount
+						if (res != undefined && res.Data.length > 0) {
+							for (let i = 0; i < res.Data.length; i++) {
+								res.Data[i].name = res.Data[i].NAME
+							}
+						}
+						return res.Data
+					})
+				}  else if (p.name == 'Nav_Question') {
 					if (p.val) {
 						extendRule(json, 'DESCREPTION', 9, p.val);
 					}
@@ -558,6 +616,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_CheckRecordDetailReasons.length > 0 && p.itemData.Nav_CheckRecordDetailReasons[0]
+						.Nav_Reason != null) {
+						// this.selectorInfo.defaultChecked = []
+						p.itemData.Nav_CheckRecordDetailReasons.forEach(e => {
+							defaultChecked.push(e.Nav_Reason)
+						})
+					} else {
+						defaultChecked = null
+					}
 				}
 
 				if (defaultChecked == null)
@@ -599,11 +688,50 @@
 				} else if (this.selectorInfo.name == 'Nav_Contents') {
 					this.selectorInfo.itemData.Nav_Contents = e;
 					this.selectorInfo.itemData.CHECK_CONTENTS_ID = e.ID;
+					this.selectorInfo.itemData.CHECKSTANDARD = e.CHECK_STANDARD
+					if (e.Nav_ContentsBasics && e.Nav_ContentsBasics.length > 0) {
+						let areaShow = ''
+						e.Nav_ContentsBasics.map(o => {
+							if (o.Nav_Law && o.Nav_Law.NAME) {
+								areaShow += o.Nav_Law.NAME + ' 、'
+							}
+						})
+						this.selectorInfo.itemData.Nav_CheckRecordDetailBasicsName = areaShow
+						this.selectorInfo.itemData.Nav_CheckRecordDetailBasics = e.Nav_ContentsBasics
+					}else{
+						this.selectorInfo.itemData.Nav_CheckRecordDetailBasicsName = ''
+						this.selectorInfo.itemData.Nav_CheckRecordDetailBasics = []
+					}
 				} else if (this.selectorInfo.name == 'Nav_Question') {
 					this.selectorInfo.itemData.Nav_Question = e;
 					this.selectorInfo.itemData.CHECK_QUESTION_ID = e.ID;
 					this.selectorInfo.itemData.HIDDEN_LEVEL = e.QUESTION_LEVEL
 					this.selectorInfo.itemData.HIDDEN_LEVELName = this.enumsData['SKHiddenLevel'].find(item1 => item1.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_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(),
+									SECURITY_INSPECTION_RECORD_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_CheckRecordDetailReasons = listProject
+					this.selectorInfo.itemData.ReasonsNAME = projectShow
 				}
 
 
@@ -625,6 +753,8 @@
 					Nav_Question: {
 						DESCREPTION: ''
 					},
+					Nav_CheckRecordDetailReasons: [],
+					ReasonsNAME:'',
 					HIDDEN_LEVEL: null,
 					HIDDEN_LEVELName: '',
 					HIDDEN_PLACE: '',

pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue

@@ -80,6 +80,13 @@
 
 									</u-form-item>
 									<u-textarea v-model="(item.Nav_Contents||{}).CHECKCONTENT" disabled></u-textarea>
+									<u-form-item borderBottom label="检查依据" prop="HIDDEN_PLACE" border-bottom>
+									</u-form-item>
+									<u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea>
+									<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
 									<u-form-item label="检查情况" prop="Product_Unit" borderBottom>
 										<u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 										</u--input>
@@ -88,9 +95,13 @@
 									<u-form-item label="隐患描述：" prop="CHECK_TIME">
 
 									</u-form-item>
-									<u-textarea v-if="item.Nav_Question" v-model="item.Nav_Question.DESCREPTION" disabled>
+									<u-textarea v-model="(item.Nav_Question||{}).DESCREPTION" disabled autoHeight border="none">
 									</u-textarea>
+									<u-form-item label="隐患具体描述：" prop="CHECK_TIME" border="none">
 
+									</u-form-item>
+									<u-textarea v-model="item.HIDDEN_DESCRIPTION" disabled autoHeight border="none">
+									</u-textarea>
 									<u-form-item label="隐患等级" prop="HIDDEN_LEVEL" border-bottom>
 										<u--input v-model="item.HIDDEN_LEVELName" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 										</u--input>
@@ -103,13 +114,15 @@
 								<u--input v-model="item.MARKName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
 								</u--input>
 							</u-form-item> -->
+									<u-form-item label="隐患原因" prop="Nav_Reasons">
+
+									</u-form-item>
+									<u--textarea disabled autoHeight disabledColor="#fff" v-model="item.ReasonsNAME" border="none"></u--textarea>
+
 									<u-form-item label="隐患照片" prop="CHECKSTANDARD">
 									</u-form-item>
 									<full-upload v-model="item.Nav_CheckRecordDetailFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-									<u-form-item label="备注" prop="HIDDEN_PLACE" border-bottom>
+
-									</u-form-item>
-									<u-textarea v-model="item.REMARK" disabled placeholder="请填写备注">
-									</u-textarea>
 								</view>
 							</uni-collapse-item>
 						</view>
@@ -266,6 +279,24 @@
 							item.CHECK_RESULTName = item.CHECK_RESULT !== undefined ? this.enumsData['SKCheckResultEnum'].find(item1 => item1.code === item.CHECK_RESULT).name : '';
 							item.HIDDEN_LEVELName = item.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.HIDDEN_LEVEL).name : '';
 							// item.MARKName = this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name||'';
+							if (item.Nav_CheckRecordDetailBasics && item.Nav_CheckRecordDetailBasics.length > 0) {
+								let areaShow = ''
+								item.Nav_CheckRecordDetailBasics.map(o => {
+									if (o.Nav_Law && o.Nav_Law.NAME) {
+										areaShow += o.Nav_Law.NAME + ' 、'
+									}
+
+								})
+								item.Nav_CheckRecordDetailBasicsName = areaShow
+							}
+							let ReasonsNAME = ''
+							if (item.Nav_CheckRecordDetailReasons && item.Nav_CheckRecordDetailReasons.length > 0) {
+								for (let i = 0; i < item.Nav_CheckRecordDetailReasons.length; i++) {
+									ReasonsNAME += (ReasonsNAME.length > 0 ? "," : "") + item
+										.Nav_CheckRecordDetailReasons[i].Nav_Reason.NAME;
+								}
+							}
+							item.ReasonsNAME = ReasonsNAME
 						})
 					}
 

services/apply/subPages/SK/SKServices.js

@@ -497,6 +497,17 @@ export function CheckTypeNewOrderPaged(params) {
 		})
 	})
 }
+export function CheckSKTypeNewOrderPaged(params) {
+	return new Promise((resolve, reject) => {
+		request.post("/SK/SKCheckType/OrderPaged", params).then((result) => {
+			if (result.IsSuccessful) {
+				resolve(result);
+			}
+		}).catch((error) => {
+			reject(error)
+		})
+	})
+}
 export function RecordFullUpdate(params) {
 	return new Promise((resolve, reject) => {
 		request.post("/SK/SKSecurityInspectionRecord/FullUpdate", params).then((result) => {