chamomind/jws-frontend
chamomind/jws-frontend
7
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix: edit error after merge

Browse source
This commit is contained in:
Net 2024-09-12 09:58:04 +07:00
parent 0895714887
commit 219e08b716
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pages/01_branch-management/MainPage.vue
View file

@ -162,7 +162,6 @@ const isQrCodeEdit = ref(false);
const profileFile = ref<File | null>(null); const profileFile = ref<File | null>(null);
const qrCodeFile = ref<File | undefined>(undefined); const qrCodeFile = ref<File | undefined>(undefined);
const imageUrl = ref<string>(''); const imageUrl = ref<string>('');
const prevImageUrl = ref<string>('');
const currentNode = ref<BranchWithChildren>(); const currentNode = ref<BranchWithChildren>();
const imageDialog = ref(false); const imageDialog = ref(false);
const refreshImageState = ref(false); const refreshImageState = ref(false);
@ -389,9 +388,10 @@ async function selectedSubBranche(id: string) {
async function fetchBranchById(id: string) { async function fetchBranchById(id: string) {
const res = await branchStore.fetchById(id, { includeContact: true }); const res = await branchStore.fetchById(id, { includeContact: true });
if (res) { if (res) {
qrCodeimageUrl.value = `${baseUrl}/branch/${res.id}/image?ts=${Date.now()}`; console.log(res);
qrCodeimageUrl.value = `${baseUrl}/branch/${res.id}/line-image?ts=${Date.now()}`;
imageUrl.value = `${baseUrl}/branch/${res.id}/image/${res.selectedImage}`; imageUrl.value = `${baseUrl}/branch/${res.id}/image/${res.selectedImage}`;
prevImageUrl.value = res.imageUrl;
formBankBook.value = res.bank; formBankBook.value = res.bank;
formBankBook.value = formBankBook.value.map((v) => { formBankBook.value = formBankBook.value.map((v) => {
@ -612,6 +612,7 @@ function triggerEditQrCodeLine(opts?: { save?: boolean }) {
deletsStatusQrCodeImag.value = false; deletsStatusQrCodeImag.value = false;
statusQrCodeUrl.value = qrCodeimageUrl.value; statusQrCodeUrl.value = qrCodeimageUrl.value;
} else { } else {
console.log('save', qrCodeFile.value);
qrCodeimageUrl.value = statusQrCodeUrl.value; qrCodeimageUrl.value = statusQrCodeUrl.value;
qrCodeFile.value = statusQrCodeFile.value; qrCodeFile.value = statusQrCodeFile.value;
deletsStatusQrCodeImag.value = statusDeletsQrCode.value; deletsStatusQrCodeImag.value = statusDeletsQrCode.value;
@ -695,7 +696,6 @@ async function onSubmit(submitSelectedItem?: boolean) {
status: undefined, status: undefined,
}, },
qrCodeFile.value, qrCodeFile.value,
profileFile.value,
formBankBook.value, formBankBook.value,
{ {
deleteQrCodeImage: deletsStatusQrCodeImag.value, deleteQrCodeImage: deletsStatusQrCodeImag.value,
@ -703,6 +703,8 @@ async function onSubmit(submitSelectedItem?: boolean) {
}, },
); );
if (!res) return;
formData.value.codeHeadOffice = formData.value.code = res.code; formData.value.codeHeadOffice = formData.value.code = res.code;
imageUrl.value = `${baseUrl}/branch/${res.id}/image/${res.selectedImage}`; imageUrl.value = `${baseUrl}/branch/${res.id}/image/${res.selectedImage}`;
@ -718,7 +720,6 @@ async function onSubmit(submitSelectedItem?: boolean) {
{ {
...formData.value, ...formData.value,
qrCodeImage: qrCodeFile.value, qrCodeImage: qrCodeFile.value,
imageUrl: profileFile.value,
}, },
formBankBook.value, formBankBook.value,
onCreateImageList.value, onCreateImageList.value,
@ -2251,7 +2252,7 @@ watch(currentHq, () => {
async (v) => { async (v) => {
if (!v) return; if (!v) return;
if (!currentId) return; if (!currentId) return;
await branchStore.addImageList(v, currentId, Date.now()); await branchStore.addImageList(v, currentId, Date.now().toString());
await fetchImageList(currentId, formData.selectedImage || ''); await fetchImageList(currentId, formData.selectedImage || '');
} }
" "