From 083c56a22e84928477b2a05d4916805a0984b174 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Sun, 4 Feb 2024 15:49:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue index 68df993b..0b57c4a2 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue @@ -764,7 +764,7 @@ const handleSelectedProjectOrder = (arr: ProjectOrderVO[]) => { let order = arr[i] saleOrderIds += order.id + ',' saleOrderCode += order.code + ',' - contractNo += order.contractNo + ',' + contractNo += (!order.contractNo ? '' : order.contractNo) + ',' property += getDictLabel(DICT_TYPE.HELI_PROJECT_PROPERTY, order.property) + ',' projectName += order.projectName + ',' } From f11c70bcc7cffb3d85dd8728992599bc27fe1fc2 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Sun, 4 Feb 2024 16:13:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E6=A1=86=E6=9E=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=A2=9E=E5=8A=A0=E9=80=9A=E7=94=A8=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=BC=93=E5=AD=98=E5=B7=A5=E5=85=B7=EF=BC=8C=E4=BE=BF?= =?UTF-8?q?=E4=BA=8E=E8=B7=A8=E9=A1=B5=E9=9D=A2=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/store/modules/common.ts | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 mes-ui/mes-ui-admin-vue3/src/store/modules/common.ts diff --git a/mes-ui/mes-ui-admin-vue3/src/store/modules/common.ts b/mes-ui/mes-ui-admin-vue3/src/store/modules/common.ts new file mode 100644 index 00000000..db9b9658 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/store/modules/common.ts @@ -0,0 +1,23 @@ +import { defineStore } from 'pinia' +import { store } from '../index' + +export interface CommonStoreState { + storeMap: object +} + +export const useCommonStore = defineStore('commonStore', () => { + const storeMap = ref({}) + const getStore = (key) => { + return storeMap.value[key] + } + const setStore = (key, value) => { + return storeMap.value[key] = value + } + + return {getStore, setStore} +}) + +export const useCommonStateWithOut = () => { + return useCommonStore(store) +} + From 9046d103f4dbeb0d3dbd6bd456801f28ff90e401 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Sun, 4 Feb 2024 16:13:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=89=93=E5=8D=B0logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/deliverorder/shipmentsPrint.vue | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue index 63b5e76f..cb0aa4d2 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue @@ -477,7 +477,7 @@ const queryParams: any = ref({ const formLoading = ref(false) -const formData = ref({ +const formData: any = ref({ id: undefined, code: undefined, saleOrderIds: undefined, @@ -515,6 +515,8 @@ const formData = ref({ const subTotalAmount = ref(0) const splitThreshold = 5 +const logoDataUrl = ref('') // 存储Logo的Base64编码数据URL + /** 打开弹窗 */ const open = async (id: number) => { @@ -550,28 +552,29 @@ const open = async (id: number) => { } else { formData.value.deliverOrderSubs = subArr } + + //图片 + // 在组件挂载后，将Logo图片转换为Base64编码数据URL + const logoImage = new Image() + logoImage.src = '/src/assets/imgs/exlogo.png' // 替换为Logo图片路径 + + logoImage.onload = () => { + const canvas = document.createElement('canvas') + canvas.width = logoImage.width + canvas.height = logoImage.height + const context = canvas.getContext('2d') + context.drawImage(logoImage, 0, 0) + const base64String = canvas.toDataURL('image/png') + logoDataUrl.value = base64String + console.log(logoDataUrl.value) + } } finally { formLoading.value = false } } defineExpose({ open }) // 提供 open 方法，用于打开弹窗 - -const logoDataUrl = ref('') // 存储Logo的Base64编码数据URL -onMounted(() => { - // 在组件挂载后，将Logo图片转换为Base64编码数据URL - const logoImage = new Image() - logoImage.onload = () => { - const canvas = document.createElement('canvas') - canvas.width = logoImage.width - canvas.height = logoImage.height - const context = canvas.getContext('2d') - context.drawImage(logoImage, 0, 0) - const base64String = canvas.toDataURL('image/png') - logoDataUrl.value = base64String - } - logoImage.src = '/src/assets/imgs/exlogo.png' // 替换为Logo图片路径 -}) +onMounted(() => {})