|
@@ -40,7 +40,7 @@
|
|
|
<div><van-checkbox class="sub-task-checkbox" v-model="isCheckAll" :indeterminate="isIndeterminate" @change="checkAllChange">全选</van-checkbox></div>
|
|
<div><van-checkbox class="sub-task-checkbox" v-model="isCheckAll" :indeterminate="isIndeterminate" @change="checkAllChange">全选</van-checkbox></div>
|
|
|
</div>
|
|
</div>
|
|
|
<van-checkbox-group v-model="checkedResult" @change="checkedChange">
|
|
<van-checkbox-group v-model="checkedResult" @change="checkedChange">
|
|
|
- <van-checkbox class="sub-task-checkbox" v-for="(item,index) in typeTaskList" :key="index" :name="item" :disabled="(item.allowPick===false && taskType==='AISLE_PICK') || item.status!==40" >
|
|
|
|
|
|
|
+ <van-checkbox class="sub-task-checkbox" v-for="(item,index) in typeTaskList" :key="index" :name="item" :disabled="(item.allowPick===false && taskType==='AISLE_PICK') || (item.status!==40 && item.status!==20)" >
|
|
|
<div class="sub-task-item" v-if="taskType==='LOCATION_PICK'">
|
|
<div class="sub-task-item" v-if="taskType==='LOCATION_PICK'">
|
|
|
<div style="font-size: 13px;font-weight: bold" >{{item.location}}</div>
|
|
<div style="font-size: 13px;font-weight: bold" >{{item.location}}</div>
|
|
|
<div class="sub-task-item-content" >
|
|
<div class="sub-task-item-content" >
|
|
@@ -110,7 +110,7 @@ const onTypeOrder=(row,type)=>{
|
|
|
orderNo:row.orderNo,
|
|
orderNo:row.orderNo,
|
|
|
type,
|
|
type,
|
|
|
owner:row.owner,
|
|
owner:row.owner,
|
|
|
- status:40,
|
|
|
|
|
|
|
+ orderStatusList:[40,20],
|
|
|
page:1,
|
|
page:1,
|
|
|
size:2000,
|
|
size:2000,
|
|
|
}
|
|
}
|
|
@@ -142,7 +142,7 @@ const checkAllChange = (val) => {
|
|
|
if(taskType.value==='AISLE_PICK'){
|
|
if(taskType.value==='AISLE_PICK'){
|
|
|
filteredList = typeTaskList.value.filter(item => item.allowPick !== false )
|
|
filteredList = typeTaskList.value.filter(item => item.allowPick !== false )
|
|
|
}else{
|
|
}else{
|
|
|
- typeTaskList.value.filter(item => item.status!==40 )
|
|
|
|
|
|
|
+ typeTaskList.value.filter(item => item.status!==40 && item.status!==20 )
|
|
|
}
|
|
}
|
|
|
checkedResult.value = val ? filteredList : []
|
|
checkedResult.value = val ? filteredList : []
|
|
|
isIndeterminate.value = false
|
|
isIndeterminate.value = false
|