diff --git a/src/components/PackagePhotoField.vue b/src/components/PackagePhotoField.vue deleted file mode 100644 index d0b37f5..0000000 --- a/src/components/PackagePhotoField.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - - diff --git a/src/components/PhotoScroller.vue b/src/components/PhotoScroller.vue index b453ecc..0737c8f 100644 --- a/src/components/PhotoScroller.vue +++ b/src/components/PhotoScroller.vue @@ -44,8 +44,8 @@ theme="primary" variant="dashed" class="add" - :loading="loading" - :disabled="loading" + :loading="isBusy" + :disabled="isBusy" @click="handleAddAction(addActionList[0])" > @@ -60,8 +60,8 @@ class="add" theme="primary" variant="dashed" - :loading="loading" - :disabled="loading" + :loading="isBusy" + :disabled="isBusy" > @@ -73,7 +73,7 @@ variant="text" :theme="action.theme" class="add-action" - :disabled="loading" + :disabled="isBusy" @click="handleAddAction(action)" > @@ -62,7 +69,7 @@ import { BottomPopup } from "timi-tdesign-mobile"; import { Time } from "timi-web"; import { useUserStore } from "timi-web-api"; import FulfillmentAPI from "@/api/FulfillmentAPI"; -import PackagePhotoField from "@/components/PackagePhotoField.vue"; +import PhotoScroller from "@/components/PhotoScroller.vue"; import { useNavBarStore } from "@/store/navBarStore"; import type { OrderFulfillment } from "@/types/Fulfillment"; import type { PhotoItem } from "@/types/Photo"; @@ -72,6 +79,7 @@ import { getErrorMessage } from "@/utils/error"; import { getFulfillmentStatusText, getFulfillmentTypeText, getStatusTheme } from "@/utils/salesOrder"; import { Message } from "@/utils/message"; import { permissionCodes } from "@/utils/permission"; +import { uploadPhotoList } from "@/utils/photo"; type ReasonAction = "reject" | "cancel"; defineOptions({ name: "OrderFulfillmentDetail" }); @@ -90,6 +98,7 @@ const revokeReason = ref(""); const returnedToStore = ref(true); const revokeRequestNo = ref(""); const photoItems = ref([]); +const photoUrlList = computed(() => photoItems.value.map(item => item.url)); const isWaitingStock = computed(() => fulfillment.value?.status === "WAITING_STOCK"); const isPending = computed(() => fulfillment.value?.status === "PENDING"); const isVerified = computed(() => fulfillment.value?.status === "VERIFIED"); diff --git a/src/pages/package/FundRecordRevoke.vue b/src/pages/package/FundRecordRevoke.vue index 58410cb..8b7c586 100644 --- a/src/pages/package/FundRecordRevoke.vue +++ b/src/pages/package/FundRecordRevoke.vue @@ -11,7 +11,16 @@ - + @@ -22,7 +31,7 @@ diff --git a/src/pages/salesOrder/SalesOrderRefund.vue b/src/pages/salesOrder/SalesOrderRefund.vue index 4fd1fac..6e9317a 100644 --- a/src/pages/salesOrder/SalesOrderRefund.vue +++ b/src/pages/salesOrder/SalesOrderRefund.vue @@ -10,7 +10,16 @@ - + @@ -20,7 +29,7 @@