Merge branch 'develop' into devTee
This commit is contained in:
commit
98e5eaad27
13 changed files with 234 additions and 61 deletions
|
|
@ -56,7 +56,13 @@ async function fetchOrganizationActive() {
|
|||
const data = await res.data.result;
|
||||
if (data) {
|
||||
await store.fetchDataActive(data);
|
||||
await fetchCheckIslock(data.draftId);
|
||||
// ต้องมี id ของแบบร่างถึงจะเช็ค isLock
|
||||
if (data.draftId) {
|
||||
await fetchCheckIslock(data.draftId);
|
||||
} else {
|
||||
store.isLosck = false;
|
||||
}
|
||||
|
||||
if (data.activeName === null && data.draftName === null) {
|
||||
isStatusData.value = false;
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue