Compare commits

..

No commits in common. "11a58637e787b8d979e115fb3a2bcad00e9d5e14" and "1840b3469d36917981b484b3856355b53112eeb0" have entirely different histories.

View File

@ -308,7 +308,6 @@
// Nav_ListSafeCheckDetailShow // Nav_ListSafeCheckDetailShow
Nav_ListSafeCheckDetail: [{ Nav_ListSafeCheckDetail: [{
SAFE_CHECK_ID: '', SAFE_CHECK_ID: '',
CHECK_CONTENTS_ID: '',
ROW_NO: '', ROW_NO: '',
CHECKRESULT: 0, CHECKRESULT: 0,
Nav_CheckArea: { Nav_CheckArea: {
@ -372,7 +371,6 @@
// //
Nav_ListSafeCheckDetailShow: [{ Nav_ListSafeCheckDetailShow: [{
SAFE_CHECK_ID: '', SAFE_CHECK_ID: '',
CHECK_CONTENTS_ID: '',
ROW_NO: '', ROW_NO: '',
CHECKRESULT: 0, CHECKRESULT: 0,
Nav_CheckArea: { Nav_CheckArea: {
@ -430,7 +428,6 @@
ROW_NO: ROW_NO, ROW_NO: ROW_NO,
CHECKRESULT: 0, CHECKRESULT: 0,
SAFE_CHECK_ID: this.model.ID, SAFE_CHECK_ID: this.model.ID,
CHECK_CONTENTS_ID: '',
Nav_CheckArea: { Nav_CheckArea: {
NAME: '' NAME: ''
}, },
@ -445,9 +442,8 @@
Nav_ListCheckDetailUser: [] Nav_ListCheckDetailUser: []
} }
this.model.Nav_ListSafeCheckDetail.unshift(modelAdd) this.model.Nav_ListSafeCheckDetail.unshift(modelAdd)
// this.Nav_ListSafeCheckDetailShow.unshift(modelAdd) this.Nav_ListSafeCheckDetailShow.unshift(modelAdd)
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail // this.$forceUpdate()
this.indexShow = ROW_NO
}, },
// //
@ -1025,7 +1021,7 @@
defaultChecked = [] defaultChecked = []
if (dataSelect.length) { if (dataSelect.length) {
this.selectorInfo = { this.selectorInfo = {
itemData:p.itemData!=undefined ?p.itemData: this.selectorInfo.itemData,//itemData: p.itemData, p.itemData this.selectorInfo.itemData itemData: p.itemData,
isMultiple: this.selectorInfo.isMultiple, isMultiple: this.selectorInfo.isMultiple,
showPopup: true, showPopup: true,
title: p.title, title: p.title,
@ -1243,7 +1239,8 @@
if (this.total > 10) { if (this.total > 10) {
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10) this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
} else { } else {
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this.total) this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this
.total)
} }
}) })
} }