Merge branch 'master' of http://47.122.43.22:3000/ykx/lm-safe-app

问题等级 枚举修改
指定落实人 页面调整（指定时页面操作item看不到）

pages/apply/subPages/BS/riskSumbitNoticeToActual.vue

@@ -23,14 +23,16 @@
 		<u-sticky offset-top="20">
 			<view class="sub-form">
 				<view class="sub-form-wrap">
-					<view class="sub-form-btns">
+					<!-- <view class="sub-form-btns">
-					</view>
+					</view> -->
 					<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom"
 						ref="sForm">
-						<uni-collapse :border="false" accordion value="1">
+						<!-- <uni-collapse :border="false" accordion value="1"> -->
+						<u-collapse :border="false" accordion value="1">
 							<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false"
 								v-for="(item, index) in model.Nav_ListRiskSubmitContent">
-								<uni-collapse-item :title="index + 1 + '. ' + item.CHECKCONTENT" name="1">
+								<!-- <uni-collapse-item :title="index + 1 + '. ' + item.CHECKCONTENT" name="1"> -->
+								<u-collapse-item :title="index + 1 + '. ' + item.CHECKCONTENT" name="1">
 									<view class="label-title">检查问题</view>
 									<u-form-item prop="DESCREPTION" borderBottom>
 										<u--textarea disabled autoHeight v-model="item.DESCREPTION" placeholder="检查问题"
@@ -68,7 +70,7 @@
 											border="none" inputAlign="right"></u--input>
 									</u-form-item>
 
-									<u-form-item required label="整改落实人" required style="margin-left: 8px;"
+									<u-form-item required label="整改落实人" required style="margin-left: 8px;margin-bottom: 70px;"
 										prop="Nav_UserActualDeal.NAME" borderBottom
 										@click="handleShowSheet({title: '整改落实人', name: 'actualDeal', dataIndex: index})">
 										<u--input disabled disabledColor="#fff" v-model="item.Nav_UserActualDeal.NAME"
@@ -76,9 +78,11 @@
 										<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
 									</u-form-item>
 
-								</uni-collapse-item>
+									<!-- </uni-collapse-item> -->
+								</u-collapse-item>
 							</uni-card>
-						</uni-collapse>
+							<!-- </uni-collapse> -->
+						</u-collapse>
 					</u--form>
 				</view>
 
@@ -266,6 +270,7 @@
 
 					this.model = res
 					this.isLoadOK = true
+					// this.$forceUpdate()
 				})
 			},
 

pages/apply/subPages/BS/riskSumbitUserDepNew.vue

@@ -12,8 +12,6 @@
 							inputAlign="right"></u--input>
 						<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
 					</u-form-item> -->
-
-
 					<u-form-item label="检查类型" required prop="Nav_Submit.Nav_CheckType.NAME"
 						@click="handleChange('checkType')" borderBottom>
 						<u--input disabled disabledColor="#ffffff" v-model="model.Nav_Submit.Nav_CheckType.NAME"
@@ -49,12 +47,12 @@
 							inputAlign="right"></u--input>
 						<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
 					</u-form-item>
-					<u-form-item label="检查项目分类" required style="margin-left: 8px;" prop="Nav_CheckProjectCategory.NAME"
+					<!-- <u-form-item label="检查项目分类" required style="margin-left: 8px;" prop="Nav_CheckProjectCategory.NAME"
 						borderBottom @click="handleChange('projectCate')">
 						<u--input disabledColor="#fff" v-model="model.Nav_CheckProjectCategory.NAME" border="none"
 							inputAlign="right"></u--input>
 						<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
-					</u-form-item>
+					</u-form-item> -->
 					<u-form-item label="检查区域" prop="Nav_RiskArea.NAME" borderBottom>
 						<u--input disabled disabledColor="#ffffff" v-model="model.Nav_RiskArea.NAME" border="none"
 							inputAlign="right"></u--input>
@@ -226,9 +224,9 @@
 					Nav_CheckProject: {
 						NAME: ''
 					},
-					Nav_CheckProjectCategory: {
+					// Nav_CheckProjectCategory: {
-						NAME: ''
+					// 	NAME: ''
-					},
+					// },
 
 					Nav_Department: {
 						NAME: ''
@@ -298,11 +296,11 @@
 						required: true,
 						trigger: ['blur', 'change']
 					},
-					'Nav_CheckProjectCategory.NAME': {
+					// 'Nav_CheckProjectCategory.NAME': {
-						type: 'string',
+					// 	type: 'string',
-						required: true,
+					// 	required: true,
-						trigger: ['blur', 'change']
+					// 	trigger: ['blur', 'change']
-					},
+					// },
 					'CHECKCONTENT': {
 						type: 'string',
 						required: true,
@@ -427,7 +425,7 @@
 				extendInclude(json, "Nav_Submit")
 				extendInclude(json, "Nav_Files.Nav_ImgFile.Nav_File")
 				extendInclude(json, "Nav_CheckProject")
-				extendInclude(json, "Nav_CheckProjectCategory")
+				// extendInclude(json, "Nav_CheckProjectCategory")
 				extendInclude(json, "Nav_RiskArea")
 				extendInclude(json, "Nav_ListRiskQuestionReason.Nav_RiskReason")
 				extendInclude(json, "Nav_ListRiskQuestionReason")

utils/enums.js

@@ -9,7 +9,8 @@ let listTimeType = ['全部', '当天', '最近三天', '最近一周', '最近
 let listPFStandardStatus = ['全部', '草稿', '确认中', '审核中', '已归档', '已驳回']
 let listPFStandardStatusVal = [-1, 0, 10, 20, 30, 40]
 
-let listBSQuestionLevelEnum=['重大','A','B','C','D']
+// let listBSQuestionLevelEnum=['重大','A','B','C','D']
+let listBSQuestionLevelEnum=['重大','一般']
 let listBSQuestionLevelEnumVal=[10,20,30,40,50]