Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-heli into dev

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)
+}
+

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 + ','
     }

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,17 +552,12 @@ const open = async (id: number) => {
     } else {
       formData.value.deliverOrderSubs = subArr
     }
-  } finally {
-    formLoading.value = false
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
 
-const logoDataUrl = ref('') // 存储Logo的Base64编码数据URL
-onMounted(() => {
+    //图片
     // 在组件挂载后，将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
@@ -569,9 +566,15 @@ onMounted(() => {
       context.drawImage(logoImage, 0, 0)
       const base64String = canvas.toDataURL('image/png')
       logoDataUrl.value = base64String
+      console.log(logoDataUrl.value)
     }
-  logoImage.src = '/src/assets/imgs/exlogo.png' // 替换为Logo图片路径
-})
+  } finally {
+    formLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+onMounted(() => {})
 </script>
 
 <style scoped lang="scss">