Merge branch 'main_multiple' into main

packages/app/src/core/libs/models.ts

@@ -29,8 +29,8 @@ export interface MaterialDealer {
   materialsName: string
   materialsType: number
   brandLevel: number
-  manageType: number
-  manageBrand: number
+  manageType: []
+  manageBrand: []
   brandType: number
   storeAddress: string
   storeName: string

packages/app/src/pages/material/detail/index.vue

@@ -161,8 +161,7 @@ onShareTimeline(() => ({
                 }}
                 |
                 {{
-                  materialOperationTypes.find(({ value }) => value === String(data?.manageType))
-                    ?.label
+                  materialOperationTypes.filter(({ value }) => data.manageType.includes(Number.parseInt(value))).map(i => i.label).join(' / ')
                 }}
               </div>
               <div>
@@ -173,9 +172,8 @@ onShareTimeline(() => ({
                   class="text-black/40 text-xs font-normal font-['PingFang_SC'] uppercase leading-[10px]"
                 >
                   <!-- imola / chedit -->
-                  {{
-                    materialsManageBrands.find(({ value }) => value === String(data?.manageBrand))
-                      ?.label
+                   {{
+                    materialsManageBrands.filter(({ value }) => data.manageBrand.includes(Number.parseInt(value))).map(i => i.label).join(' / ')
                   }}
                 </span>
               </div>

packages/app/src/pages/material/index.vue

@@ -189,8 +189,7 @@ onMounted(async () => {
                       }}
                       |
                       {{
-                        materialOperationTypes.find(({ value }) => value === String(it.manageType))
-                          ?.label
+                        materialOperationTypes.filter(({ value }) => it.manageType.includes(Number.parseInt(value))).map(i => i.label)?.[0]
                       }}
                     </div>
                     <div @click.stop>