|
@@ -114,16 +114,25 @@ const setBarcode=(code)=>{
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 进入任务
|
|
// 进入任务
|
|
|
-const linkTask=(code,name)=>{
|
|
|
|
|
|
|
+const linkTask = (code, name) => {
|
|
|
if (code !== 0) {
|
|
if (code !== 0) {
|
|
|
localStorage.setItem('MOVETASKCODE', code);
|
|
localStorage.setItem('MOVETASKCODE', code);
|
|
|
}
|
|
}
|
|
|
- let taskCode= localStorage.getItem('MOVETASKCODE') || code;
|
|
|
|
|
|
|
+ let taskCode = localStorage.getItem('MOVETASKCODE') || code;
|
|
|
const listMap = toMap(taskList.value, 'code');
|
|
const listMap = toMap(taskList.value, 'code');
|
|
|
- taskCode = listMap[taskCode] ? taskCode : taskList.value[0].code;
|
|
|
|
|
|
|
+ if (taskCode == 0) {
|
|
|
|
|
+ taskCode = taskList.value.length > 0
|
|
|
|
|
+ ? taskList.value[0].code
|
|
|
|
|
+ : listMap[taskCode]?.code || code
|
|
|
|
|
+ } else {
|
|
|
|
|
+ taskCode = listMap[taskCode]?.code || taskCode;
|
|
|
|
|
+ }
|
|
|
router.push({ name, query: { code: taskCode } });
|
|
router.push({ name, query: { code: taskCode } });
|
|
|
- localStorage.setItem('MOVETASKCODE', taskCode);
|
|
|
|
|
-}
|
|
|
|
|
|
|
+ if (taskCode !== 0) {
|
|
|
|
|
+ localStorage.setItem('MOVETASKCODE', taskCode);
|
|
|
|
|
+ }
|
|
|
|
|
+};
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 下拉刷新
|
|
* 下拉刷新
|
|
|
*/
|
|
*/
|