|
@@ -2975,7 +2975,7 @@ const getWork = async (isUpdate = false) => {
|
|
|
// 同时满足 atool === toolType 或 toolType 为空
|
|
// 同时满足 atool === toolType 或 toolType 为空
|
|
|
// return (work.ttype == '1' || (work.ttype == '2' && work.classid.includes(props.cid))) && (work.atool == toolType.value || !toolType.value)
|
|
// return (work.ttype == '1' || (work.ttype == '2' && work.classid.includes(props.cid))) && (work.atool == toolType.value || !toolType.value)
|
|
|
// work.ttype == '1'
|
|
// work.ttype == '1'
|
|
|
- const ttypeMatch = (work.ttype == '2' && work.classid && work.classid.includes(props.cid))
|
|
|
|
|
|
|
+ const ttypeMatch = work.ttype == '1' || (work.ttype == '2' && work.classid && work.classid.includes(props.cid))
|
|
|
const toolMatch = toolType ? work.atool == toolType : true
|
|
const toolMatch = toolType ? work.atool == toolType : true
|
|
|
return ttypeMatch && toolMatch
|
|
return ttypeMatch && toolMatch
|
|
|
}).map((work: any) => {
|
|
}).map((work: any) => {
|