|
@@ -106,7 +106,7 @@ export default (state = initSearchList, action) => {
|
|
tempArr = tempArr.filter((item, idx) => {
|
|
tempArr = tempArr.filter((item, idx) => {
|
|
if (action.sign == idx) {
|
|
if (action.sign == idx) {
|
|
if (action.tip == 1) {
|
|
if (action.tip == 1) {
|
|
- if (compareDate(action.value) > compareDate(item.referenceValue)) {
|
|
|
|
|
|
+ if (compareDate(action.value) > compareDate(item.finishDateValue)) {
|
|
Notify.error("报告时间不能早于开单时间");
|
|
Notify.error("报告时间不能早于开单时间");
|
|
return item
|
|
return item
|
|
}
|
|
}
|
|
@@ -121,7 +121,7 @@ export default (state = initSearchList, action) => {
|
|
Notify.error("报告时间不能早于开单时间");
|
|
Notify.error("报告时间不能早于开单时间");
|
|
return item
|
|
return item
|
|
}
|
|
}
|
|
- item.referenceValue = action.value
|
|
|
|
|
|
+ item.finishDateValue = action.value
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return item
|
|
return item
|
|
@@ -130,7 +130,7 @@ export default (state = initSearchList, action) => {
|
|
tempArrs = tempArrs.filter((item, idx) => {
|
|
tempArrs = tempArrs.filter((item, idx) => {
|
|
if (action.sign == idx) {
|
|
if (action.sign == idx) {
|
|
if (action.tip == 1) {//小项改时间
|
|
if (action.tip == 1) {//小项改时间
|
|
- if (compareDate(action.value) > compareDate(item.referenceValue)) {
|
|
|
|
|
|
+ if (compareDate(action.value) > compareDate(item.finishDateValue)) {
|
|
Notify.error("报告时间不能早于开单时间");
|
|
Notify.error("报告时间不能早于开单时间");
|
|
return item
|
|
return item
|
|
}
|
|
}
|
|
@@ -149,7 +149,7 @@ export default (state = initSearchList, action) => {
|
|
Notify.error("检验细项报告时间不能为空");
|
|
Notify.error("检验细项报告时间不能为空");
|
|
return item
|
|
return item
|
|
}
|
|
}
|
|
- item.referenceValue = action.value
|
|
|
|
|
|
+ item.finishDateValue = action.value
|
|
} else {//小项该数值
|
|
} else {//小项该数值
|
|
if (isNumber(action.value - 0)) {
|
|
if (isNumber(action.value - 0)) {
|
|
item.value = action.value
|
|
item.value = action.value
|
|
@@ -179,7 +179,7 @@ export default (state = initSearchList, action) => {
|
|
let tmpLis = action.list
|
|
let tmpLis = action.list
|
|
tmpLis['dateValue'] = getCurrentDate(1)
|
|
tmpLis['dateValue'] = getCurrentDate(1)
|
|
tmpLis['time'] = getCurrentDate(1)
|
|
tmpLis['time'] = getCurrentDate(1)
|
|
- tmpLis['referenceValue'] = getCurrentDate(1)
|
|
|
|
|
|
+ tmpLis['finishDateValue'] = getCurrentDate(1)
|
|
if (tmpLis.flg == 1) {//大项
|
|
if (tmpLis.flg == 1) {//大项
|
|
tempArr.push(tmpLis)
|
|
tempArr.push(tmpLis)
|
|
newState.labelListBig = [...tempArr]
|
|
newState.labelListBig = [...tempArr]
|