|
@@ -36,7 +36,8 @@ const initSearchList = {
|
|
|
shType:5,
|
|
|
labelListBig:[],//大项
|
|
|
labelListSmall:[],//小项
|
|
|
- totalOrder:[],//开单项
|
|
|
+ drugOrder:[],//开单项
|
|
|
+ operationOrder:[],//开单项
|
|
|
}
|
|
|
|
|
|
export default (state = initSearchList, action) => {
|
|
@@ -64,8 +65,8 @@ export default (state = initSearchList, action) => {
|
|
|
}
|
|
|
tempBigOrder = tempArr.filter((item)=>item.check)
|
|
|
tempSmallOrder = tempArrs.filter((item)=>item.check)
|
|
|
- tempTotalOrder=tempBigOrder.concat(tempSmallOrder)
|
|
|
- newState.totalOrder=[...tempTotalOrder]
|
|
|
+ newState.drugOrder=[...tempBigOrder]
|
|
|
+ newState.operationOrder=[...tempSmallOrder]
|
|
|
return newState;
|
|
|
}
|
|
|
if (action.type == DEL_ONE_PIC) {
|
|
@@ -111,6 +112,7 @@ export default (state = initSearchList, action) => {
|
|
|
const tempArrs = newState.labelListSmall;
|
|
|
let tmpLis = action.list
|
|
|
tmpLis['time'] = getCurrentDate(1)
|
|
|
+ tmpLis['dateValue'] = getCurrentDate(1)
|
|
|
if(tmpLis.flg == 5){//大项
|
|
|
tempArr.push(tmpLis)
|
|
|
newState.labelListBig = [...tempArr]
|