调整

pages/apply/subPages/SK/SK003Show.vue

@@ -53,10 +53,10 @@
 
 					</u-form-item>
 					<u--textarea v-model="model.EMERGENCY" disabled autoHeight maxlength="-1"></u--textarea>
-					<u-form-item label="是否有效" prop="HIDDEN_PLACE" border-bottom>
+				<!-- 	<u-form-item label="是否有效" prop="HIDDEN_PLACE" border-bottom>
 						<u--input v-model="model.ENABLE_STATUSName" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 						</u--input>
-					</u-form-item>
+					</u-form-item> -->
 					<uni-collapse class="collapse" ref="collapse">
 
 						<uni-collapse-item title="管控层级" name="Variety components">
@@ -266,7 +266,7 @@
 						this.model = res;
 						this.model.ID = this.ID
 						this.model.EVALUATE_LEVELName = res.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name : '';
-						this.model.ENABLE_STATUSName = res.ENABLE_STATUS !== undefined ? this.enumsData['FMEnableStatusEnum'].find(item => item.code === res.ENABLE_STATUS).name : '';
+						// this.model.ENABLE_STATUSName = res.ENABLE_STATUS !== undefined ? this.enumsData['FMEnableStatusEnum'].find(item => item.code === res.ENABLE_STATUS).name : '';
 						if (this.model.Nav_Departs && this.model.Nav_Departs.length > 0) {
 							this.model.Nav_Departs.map(item => {
 								item.DEPARTMENT_TYPEName = item.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item1 => item1.code === item.DEPARTMENT_TYPE).name : '';

pages/apply/subPages/SK/riskSafeIdenEdit.vue

@@ -122,16 +122,11 @@
 								<u--input v-model="item.MARK_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 								</u--input>
 							</u-form-item>
-							<u-form-item label="是否有效" prop="HIDDEN_PLACE" @click="handleChangeUnit(item,'SKEnableStatusEnum')">
+							
-								<u--input v-model="item.ENABLE_STATUS_NAME" 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>
 						</view>
 					</view>
 					<view style="padding: 10px 16px;display: flex;flex-direction: row;">
-						<u-button type="primary" @click="handleNewCheckContent" color="#3d4b70">新增检查区域</u-button>
+						<u-button type="primary" @click="handleNewCheckContent" color="#3d4b70">新增辨识区域</u-button>
 						<u-button type="primary" @click="handleNewCheckList" color="#3d4b70" style="margin-left: 5px;">导入企业库内容</u-button>
 					</view>
 				</u--form>
@@ -339,7 +334,7 @@
 					this.dataModel.Nav_Details.map(item => {
 						item['showPack'] = false
 						item['arrow'] = false
-						item.ENABLE_STATUS_NAME = item.ENABLE_STATUS !== undefined ? this.enumsData['SKEnableStatusEnum'].find(item1 => item1.code === item.ENABLE_STATUS).name : '';
+						// item.ENABLE_STATUS_NAME = item.ENABLE_STATUS !== undefined ? this.enumsData['SKEnableStatusEnum'].find(item1 => item1.code === item.ENABLE_STATUS).name : '';
 						item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
 					})
 					this.stepLoad = false
@@ -396,7 +391,6 @@
 			changeArrow(item) {
 				item.arrow = !item.arrow
 				this.$forceUpdate()
-				console.log(this.dataModel.Nav_Details)
 			},
 			handleNewCheckContent() {
 				this.dataModel.Nav_Details.push({
@@ -418,16 +412,16 @@
 					Nav_Type: {
 						NAME: ''
 					},
+					Nav_DetailMeasures:[],
 					MEASURE: '',
 					EMERGENCY: '',
-					ENABLE_STATUS: this.enumsData['SKEnableStatusEnum'][0].code,
-					ENABLE_STATUS_NAME: this.enumsData['SKEnableStatusEnum'][0].name,
 					MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code,
 					MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name,
 
 				})
+				console.log(this.dataModel.Nav_Details)
 
-				this.dataModel.Nav_Details = [...this.dataModel.Nav_Details]
+				this.$forceUpdate()
 			},
 			handleNewCheckList() {
 				// 将现有数据传递给选择页面用于去重判断
@@ -502,8 +496,6 @@
 						MEASURE: enterpriseItem.MEASURE || '',
 
 						EMERGENCY: enterpriseItem.EMERGENCY || '',
-						ENABLE_STATUS: this.enumsData['SKEnableStatusEnum'][0].code,
-						ENABLE_STATUS_NAME: this.enumsData['SKEnableStatusEnum'][0].name,
 						MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code,
 						MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name,
 						ORG_ID: this.ORG_ID

pages/apply/subPages/SK/riskSafeIdenShow.vue

@@ -93,10 +93,6 @@
 									<u--input v-model="item.MARK_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
 									</u--input>
 								</u-form-item>
-								<u-form-item label="是否有效" prop="HIDDEN_PLACE">
-									<u--input v-model="item.ENABLE_STATUS_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
-									</u--input>
-								</u-form-item>
 							</view>
 						</view>
 					</view>
@@ -303,7 +299,7 @@
 					this.dataModel.Nav_RequiresName = Nav_RequiresName
 					this.dataModel.Nav_Details.map(item => {
 						item['showPack'] = false
-						item.ENABLE_STATUS_NAME = item.ENABLE_STATUS !== undefined ? this.enumsData['SKEnableStatusEnum'].find(item1 => item1.code === item.ENABLE_STATUS).name : '';
+						// item.ENABLE_STATUS_NAME = item.ENABLE_STATUS !== undefined ? this.enumsData['SKEnableStatusEnum'].find(item1 => item1.code === item.ENABLE_STATUS).name : '';
 						item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
 					})
 					this.stepLoad = false

uni_modules/uview-ui/components/u-button/props.js

@@ -124,7 +124,7 @@ export default {
 		// 节流，一定时间内只能触发一次
 		throttleTime: {
 			type: [String, Number],
-			default: 2000
+			default: 1000
 		},
 		// 按住后多久出现点击态，单位毫秒
 		hoverStartTime: {