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

pages/apply/subPages/BS/plan.vue

@@ -308,6 +308,7 @@
 					//操作需要同时操作 Nav_ListSafeCheckDetailShow
 					Nav_ListSafeCheckDetail: [{
 						SAFE_CHECK_ID: '',
+						CHECK_CONTENTS_ID: '',
 						ROW_NO: '',
 						CHECKRESULT: 0,
 						Nav_CheckArea: {
@@ -371,6 +372,7 @@
 				//供显示 类似 懒加载
 				Nav_ListSafeCheckDetailShow: [{
 					SAFE_CHECK_ID: '',
+					CHECK_CONTENTS_ID: '',
 					ROW_NO: '',
 					CHECKRESULT: 0,
 					Nav_CheckArea: {
@@ -428,6 +430,7 @@
 					ROW_NO: ROW_NO,
 					CHECKRESULT: 0,
 					SAFE_CHECK_ID: this.model.ID,
+					CHECK_CONTENTS_ID: '',
 					Nav_CheckArea: {
 						NAME: ''
 					},
@@ -442,8 +445,9 @@
 					Nav_ListCheckDetailUser: []
 				}
 				this.model.Nav_ListSafeCheckDetail.unshift(modelAdd)
-				this.Nav_ListSafeCheckDetailShow.unshift(modelAdd)
+				// this.Nav_ListSafeCheckDetailShow.unshift(modelAdd)
-				// this.$forceUpdate()
+				this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail
+				this.indexShow = ROW_NO
 			},
 
 			//手动删除信息 编号修改
@@ -1021,7 +1025,7 @@
 					defaultChecked = []
 				if (dataSelect.length) {
 					this.selectorInfo = {
-						itemData: p.itemData,
+						itemData:p.itemData!=undefined ?p.itemData: this.selectorInfo.itemData,//itemData: p.itemData,  搜索的时候  p.itemData为空  赋值修改 为 她自己本身 this.selectorInfo.itemData
 						isMultiple: this.selectorInfo.isMultiple,
 						showPopup: true,
 						title: p.title,
@@ -1239,8 +1243,7 @@
 						if (this.total > 10) {
 							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
 						} else {
-							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this
+							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this.total)
-								.total)
 						}
 					})
 				}