2 Commity 6aec96dbdd ... dd1798ceff

Autor SHA1 Wiadomość Data
  wenjie dd1798ceff Merge branch 'wj' of http://git.zonelife.cn:3000/zhangtao/city-gather-admin into wj 1 tydzień temu
  wenjie 7fa75b0a28 ``` 1 tydzień temu

+ 6 - 0
src/views/order-manage/after-sales-order/index.vue

@@ -39,6 +39,12 @@ const columns: NaiveUI.TableColumn<Api.delivery.deliveryOrder>[] = [
       return <NTag>{businessType[row.businessType as keyof typeof businessType] || row.businessType}</NTag>;
     }
   },
+  {
+    key: 'accessName',
+    title: '渠道',
+    align: 'center',
+    width: 120
+  },
   {
     key: 'orderNumber',
     title: '原订单编号',

+ 6 - 0
src/views/order-manage/normal-order/index.vue

@@ -64,6 +64,12 @@ const columns: NaiveUI.TableColumn<Api.delivery.deliveryOrder>[] = [
     align: 'center',
     width: 120
   },
+  {
+    key: 'accessName',
+    title: '渠道',
+    align: 'center',
+    width: 120
+  },
   {
     key: 'info',
     title: '客户信息',

+ 13 - 0
src/views/order-manage/normal-order/normal-order.ts

@@ -2,6 +2,7 @@ import { h } from 'vue';
 import { NFlex, NImage, NTag } from 'naive-ui';
 // import { fetchGetAllStoreList } from '@/service/api/goods/desk-category';
 import { fetchBackendChannelSelect, fetchGetStoreList } from '@/service/api/xsb-manage/store-info';
+import { fetchChannelList } from '@/service/api/h5-manage/channel-manage';
 import { fetchGetDictDataList } from '@/service/api/system-manage';
 // import { useAuth } from '@/hooks/business/auth';
 import { useAuthStore } from '@/store/modules/auth';
@@ -111,6 +112,18 @@ export const SearchForm: FormSchema[] = [
       ]
     }
   },
+  {
+    field: 'accessIds',
+    label: '渠道',
+    component: 'ApiSelect',
+    componentProps: {
+      api: fetchChannelList,
+      multiple: true,
+      resultFeild: 'data.list',
+      labelFeild: 'accessName',
+      valueFeild: 'accessId'
+    }
+  },
   {
     label: '发货情况',
     component: 'NSelect',