|
@@ -425,6 +425,23 @@ const currentConfirmOrdersClick = async () => {
|
|
|
).then(res=>{
|
|
|
if(res && res.list && res.list.length>0){
|
|
|
let resultList = res.list
|
|
|
+ let currentGroupNo = 0
|
|
|
+ resultList.forEach(item=>{
|
|
|
+ if(item.parentNo) {
|
|
|
+ let groupParent = resultList.find(citem => citem.actOrderNo === item.parentNo)
|
|
|
+ if(groupParent.group) {
|
|
|
+ item.group = groupParent.group
|
|
|
+ } else {
|
|
|
+ item.group = currentGroupNo
|
|
|
+ groupParent.group = currentGroupNo
|
|
|
+ }
|
|
|
+ currentGroupNo++ ;
|
|
|
+ } else if(!item.group) {
|
|
|
+ item.group = currentGroupNo
|
|
|
+ currentGroupNo++ ;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ console.log("resultList",resultList);
|
|
|
yzList.value = resultList.map(item=> (
|
|
|
{
|
|
|
id : item.id ,
|
|
@@ -436,7 +453,7 @@ const currentConfirmOrdersClick = async () => {
|
|
|
unit : item.miniUnitName ,
|
|
|
repeat : item.frequCode ? item.frequCode == "ONCE" ? "0" : "1" : "",
|
|
|
startDateTime : item.startTime,
|
|
|
- group : ""
|
|
|
+ group : item.group + ""
|
|
|
}
|
|
|
)
|
|
|
);
|
|
@@ -503,11 +520,8 @@ const currentConfirmOrdersClick = async () => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- await MLRKON_CLIENT.doCall("srv_screen", params, { "api": false, "timeout": 10000}, getResult)
|
|
|
-
|
|
|
+ await MLRKON_CLIENT.doCall("srv_screen", JSON.stringify(params), { "api": false, "timeout": 10000}, getResult)
|
|
|
// return
|
|
|
-
|
|
|
-
|
|
|
};
|
|
|
|
|
|
const mlrkonCallBack = (data) => {
|