Merge branch 'develop' into dev

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-05-01 15:31:43 +07:00
commit 49e29633f3
2 changed files with 1 additions and 2 deletions

View file

@ -191,7 +191,6 @@ async function uploadFileDoc(
* @param group ประเภพไฟล "คำสั่ง","แนบท้าย" * @param group ประเภพไฟล "คำสั่ง","แนบท้าย"
*/ */
async function fetchDoc(group: string) { async function fetchDoc(group: string) {
showLoader();
let type = group === "order" ? "คำสั่ง" : "แนบท้าย"; let type = group === "order" ? "คำสั่ง" : "แนบท้าย";
if (group === "order") { if (group === "order") {
await fetchDocOrder(type); await fetchDocOrder(type);

View file

@ -109,8 +109,8 @@ async function fetchCheckIdofficer() {
* กำหนดค `store.readonly` เม route.name เป "commandViewDetailPage" จะอานขอมลไดอยางเดยว * กำหนดค `store.readonly` เม route.name เป "commandViewDetailPage" จะอานขอมลไดอยางเดยว
*/ */
onMounted(async () => { onMounted(async () => {
await fetchDataCommandList();
await fetchCheckIdofficer(); await fetchCheckIdofficer();
await fetchDataCommandList();
store.readonly = store.readonly =
route.name === "commandViewDetailPage" || route.name === "commandViewDetailPage" ||
formCommandList.status === "REPORTED" || formCommandList.status === "REPORTED" ||