batch order

src/api/model/batchOrder.ts

@@ -63,10 +63,26 @@ export interface BatchOrderParams extends BasePageParams {
    * 收货地址
    */
   address?: string;
+  /**
+   * 工单状态
+   */
+  status?: String;
+  /**
+   * 工单状态 IN值List
+   */
+  statusList?: Array<string>;
   /**
    * 备注
    */
   remark?: string;
+  /**
+   * 是否是主订单
+   */
+  type?: String;
+  /**
+   * 是否是主订单 IN值List
+   */
+  typeList?: Array<string>;
   /**
    * 是否删除
    */
@@ -170,10 +186,18 @@ export interface BatchOrder {
    * 收货地址
    */
   address?: string;
+  /**
+   * 工单状态
+   */
+  status?: String;
   /**
    * 备注
    */
   remark?: string;
+  /**
+   * 是否是主订单
+   */
+  type?: String;
   /**
    * 是否删除
    */

src/api/order/batchOrderApi.ts

@@ -5,81 +5,66 @@
  */
 
 import { defHttp } from '/@/utils/http/axios';
-import { ApiResponse } from '../model/baseModel';
 import {
   BatchOrder,
   BatchOrderParams,
   BatchOrderPageResult,
-  BatchOrderPageResponse,
-  BatchOrderResponse,
 } from '../model/batchOrder';
-
 const baseApi = '/v1/order/batch-order';
 
 /**
  * 新增
  */
-export const add = (entity: BatchOrder) =>
-  defHttp.post<BatchOrder>({ url: `${baseApi}/`, data: entity });
+export const add = (entity: BatchOrder) => defHttp.post<BatchOrder>({ url: `${baseApi}/`, data: entity });
 
 /**
  * 更新
  */
-export const update = (entity: BatchOrder) =>
-  defHttp.put<BatchOrder>({ url: `${baseApi}/`, data: entity });
+export const update = (entity: BatchOrder) => defHttp.put<BatchOrder>({ url: `${baseApi}/`, data: entity });
 
 /**
  * 删除
  */
-export const remove = (id: any) =>
-  defHttp.delete<Number>({ url: `${baseApi}/${id}` });
+export const remove = (id: any) => defHttp.delete<Number>({ url: `${baseApi}/${id}` });
 
 /**
  * 分页查询
  */
-export const search = (params?: BatchOrderParams) =>
-  defHttp.get<BatchOrderPageResult>({ url: `${baseApi}/search`, params });
+export const search = (params?: BatchOrderParams) => defHttp.get<BatchOrderPageResult>({ url: `${baseApi}/search`, params });
 
 /**
  * 列表查询
  */
-export const all = (params?: BatchOrderParams) =>
-  defHttp.get<BatchOrderPageResult>({ url: `${baseApi}/all`, params });
+export const all = (params?: BatchOrderParams) => defHttp.get<BatchOrderPageResult>({ url: `${baseApi}/all`, params });
 
 /**
  * 通过主键查询
  */
-export const getById = (id: any) =>
-  defHttp.get<BatchOrder>({ url: `${baseApi}/${id}` });
+export const getById = (id: any) => defHttp.get<BatchOrder>({ url: `${baseApi}/${id}` });
 
 /**
  * 单个查询
  */
-export const getOne = (params?: BatchOrderParams) =>
-  defHttp.get<BatchOrder>({ url: `${baseApi}/one`, params });
+export const getOne = (params?: BatchOrderParams) => defHttp.get<BatchOrder>({ url: `${baseApi}/one`, params });
 
 /**
  * 批量删除
  */
-export const batchRemove = (idList: Array<any>) =>
-  defHttp.post<boolean>({ url: `${baseApi}/batch-delete`, data: idList });
+export const batchRemove = (idList: Array<any>) => defHttp.post<boolean>({ url: `${baseApi}/batch-delete`, data: idList });
 
 /**
  * 批量新增
  */
-export const batchAdd = (entityList: Array<BatchOrder>) =>
-  defHttp.post<boolean>({ url: `${baseApi}/batch-save`, data: entityList });
+export const batchAdd = (entityList: Array<BatchOrder>) => defHttp.post<boolean>({ url: `${baseApi}/batch-save`, data: entityList });
 
 /**
  * 批量更新
  */
-export const batchUpdate = (entityList: Array<BatchOrder>) =>
-  defHttp.post<boolean>({ url: `${baseApi}/batch-update`, data: entityList });
+export const batchUpdate = (entityList: Array<BatchOrder>) => defHttp.post<boolean>({ url: `${baseApi}/batch-update`, data: entityList });
 
 /**
  * 查询数量
  */
-export const count = (params?: BatchOrderParams) =>
-  defHttp.get<Number>({ url: `${baseApi}/count`, params });
+export const count = (params?: BatchOrderParams) => defHttp.get<Number>({ url: `${baseApi}/count`, params });
 
 

src/views/order/batch-order/detail.vue

 <template>
-  <Card :bordered="false">
+  <Card :bordered="false" :loading="isLoading">
     <Descriptions bordered :column="3">
       <Descriptions.Item
         v-for="p in displayProps"
@@ -8,7 +8,7 @@
         :span="['avatar'].includes(p.name) ? 3 : 1"
       >
         <span v-if="p.key === 'avatar'">
-          <img :src="p.value" style="width: 120px; height: 120px" />
+          <ImagePreview :imageList="[p.value]" style="width: 120px" />
         </span>
         <template v-else>
           {{ p.value }}
@@ -18,39 +18,45 @@
   </Card>
 </template>
 <script lang="ts" setup name="DeviceDetail">
-  import { onMounted, computed, ref, reactive } from 'vue';
+  import { onMounted, computed, ref } from 'vue';
   import { useRoute } from 'vue-router';
+  import { useAsyncState } from '@vueuse/core';
+  import { ImagePreview } from '/@/components/Preview/index';
   import { ComputedRef } from '@vue/reactivity';
   import { Descriptions, Card } from 'ant-design-vue';
   import { descriptionColumns } from './schema';
   import * as BatchOrderApi from '/@/api/order/batchOrderApi';
-  import { Device } from '/@/api/model/device';
+  import { BatchOrder } from '/@/api/model/batchOrder';
 
   const route = useRoute();
   const id = ref(route.params?.id);
-  let data = reactive({
-    detail: {},
-    isOver: false,
-  });
-  const getDetail = () => {
-    BatchOrderApi.getById(id.value).then((res: Device) => {
-      data.isOver = true;
-      data.detail = res;
-    });
-  };
+
+  // id 查询
+  const {
+    state: detail,
+    isReady: isDetailReady,
+    isLoading,
+    execute,
+  } = useAsyncState(
+          () => {
+            return BatchOrderApi.getById(id.value).then((res: BatchOrder) => res);
+          },
+          null,
+          {
+            immediate: false,
+          },
+  );
 
   onMounted(() => {
-    getDetail();
+    execute();
   });
 
   const displayProps: ComputedRef<Array<any>> = computed(() => {
-    if (!data.isOver) return {};
+    if (!isDetailReady.value) return {};
     const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
       key: dataIndex,
       title,
-      value: customRender
-        ? customRender({ text: data.detail[dataIndex], record: data.detail })
-        : data.detail[dataIndex],
+      value: customRender ? customRender({ text: detail.value[dataIndex], record: detail.value }) : detail.value[dataIndex],
     }));
     return display;
   });

src/views/order/batch-order/drawer.vue

 <template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :title="getTitle" width="600px" @ok="handleSubmit">
+  <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :confirmDisabled="getConfirmDisabled" :title="getTitle" width="600px" @ok="handleSubmit">
+    <a-spin :spinning="isLoading">
       <BasicForm @register="registerForm" />
+    </a-spin>
   </BasicDrawer>
 </template>
 <script lang="ts" setup name="BatchOrderDrawer">
@@ -8,7 +10,9 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './schema';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { useAsyncState } from '@vueuse/core';
   import * as BatchOrderApi from '/@/api/order/batchOrderApi';
+  import { BatchOrder } from '/@/api/model/batchOrder';
 
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
@@ -20,6 +24,22 @@
     showActionButtonGroup: false,
   });
 
+  // id 查询
+  const {
+    state: detail,
+    isReady: isDetailReady,
+    isLoading,
+    execute,
+  } = useAsyncState(
+          () => {
+            return BatchOrderApi.getById(entityId.value).then((res: BatchOrder) => res);
+          },
+          null,
+          {
+            immediate: false,
+          },
+  );
+
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     await resetFields();
     setDrawerProps({ confirmLoading: false });
@@ -27,9 +47,21 @@
     entityId.value = data?.record?.id;
 
     if (unref(isUpdate)) {
-      await setFieldsValue({
-        ...data.record,
+      await execute();
+      if (detail.value) {
+        const formData: any = {
+          ...detail.value,
+                };
+        await setFieldsValue(formData);
+      }
+    }
   });
+
+  const getConfirmDisabled = computed(() => {
+    if (unref(isUpdate)) {
+      return !unref(isDetailReady);
+    } else {
+      return false;
     }
   });
 

src/views/order/batch-order/index.vue

@@ -8,6 +8,7 @@
               <span>已选中{{ checkedKeys.length }}条记录</span>
               <a-button type="link" @click="checkedKeys = []" size="small">清空</a-button>
               <a-popconfirm
+                v-auth="'AUTH_ORDER_BATCH_ORDER'"
                 class="ml-4"
                 title="确定要全部删除吗？"
                 ok-text="是"
@@ -27,9 +28,6 @@
         <a-button v-auth="'AUTH_ORDER_BATCH_ORDER:ADD'" type="primary" @click="handleCreate"> 新增</a-button>
       </template>
       <template #bodyCell="{ column, record, text }">
-        <template v-if="column.dataIndex === 'id'">
-          <a @click="handleView(record)"> {{ record.id }} </a>
-        </template>
         <template v-if="[].includes(column.dataIndex)">
           <img :src="text" class="photo" alt="图片" v-if="!!text" />
         </template>
@@ -42,6 +40,12 @@
                 onClick: handleEdit.bind(null, record),
                 ifShow: hasPermission('AUTH_ORDER_BATCH_ORDER:EDIT'),
               },
+             {
+                tooltip: '详情',
+                icon: 'ant-design:eye-outlined',
+                onClick: handleView.bind(null, record),
+                ifShow: hasPermission('AUTH_ORDER_BATCH_ORDER:QUERY'),
+              },
               {
                 tooltip: '删除',
                 icon: 'ant-design:delete-outlined',
@@ -60,7 +64,7 @@
     <BatchOrderDrawer @register="registerDrawer" @success="handleSuccess" />
   </div>
 </template>
-<script lang="ts" setup name="DeviceIndex">
+<script lang="ts" setup name="AUTH_ORDER_BATCH_ORDER">
   import { ref } from 'vue';
   import { useGo } from '/@/hooks/web/usePage';
   import { usePermission } from '/@/hooks/web/usePermission';
@@ -75,15 +79,20 @@
 
   const { hasPermission } = usePermission();
   const go = useGo();
-  const { formConfig, showTableSetting, bordered, showIndexColumn } = componentSetting.table;
+  const {
+    formConfig,
+    showTableSetting,
+    bordered,
+    showIndexColumn,
+  } = componentSetting.table;
 
   const checkedKeys = ref<Array<string | number>>([]);
   const onSelectChange = (selectedRowKeys: (string | number)[]) => {
     checkedKeys.value = selectedRowKeys;
-  };
+  }
 
   const [registerDrawer, { openDrawer }] = useDrawer();
-  const [registerTable, { reload }] = useTable({
+  const [registerTable, { reload ,setLoading}] = useTable({
     title: '批量订单管理',
     api: (params) => BatchOrderApi.search(handleParams(params)),
     columns,
@@ -94,6 +103,7 @@
     },
     rowSelection: {
       type: 'checkbox',
+      // @ts-ignore
       selectedRowKeys: checkedKeys,
       onChange: onSelectChange,
     },
@@ -104,10 +114,9 @@
     canResize: false,
     rowKey: (record: any) => record.id,
     actionColumn: {
-      width: 80,
+      width: 120,
       title: '操作',
       dataIndex: 'action',
-
       fixed: 'right',
     },
   });
@@ -150,14 +159,20 @@
   };
 
   const handleDelete = (record: Recordable) => {
+    setLoading(true);
     BatchOrderApi.remove(record.id).then((_) => {
       reload();
+    }).catch(() => {
+      setLoading(false);
     });
   };
 
   const handleBatchDelete = () => {
+    setLoading(true);
     BatchOrderApi.batchRemove(checkedKeys.value).then((_) => {
       reload();
+    }).catch(() => {
+      setLoading(false);
     });
   };
 
@@ -166,6 +181,6 @@
   };
 
   const handleView = (record) => {
-    go('/order/batch-order/' + record.id);
+    go('/main/order/batch-order/' + record.id);
   };
 </script>

src/views/order/batch-order/schema.ts

@@ -10,6 +10,23 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import get from 'lodash.get';
 
+export enum StatusEnum {
+  TO_BE_USE = '待使用',
+  PENDING_REVIEW = '待审核',
+  PASSED = '已推送',
+  DELIVERED = '已发货',
+  BACK = '已回库',
+  CONFIRM = '已确认',
+  REJECT = '拒绝',
+  FORBIDDEN = '禁用',
+}
+export const StatusEnumOptions: any[] = [];
+for (const key in StatusEnum) {
+  StatusEnumOptions.push({
+    value: key,
+    label: StatusEnum[key],
+  });
+}
 export enum YesNoEnum {
   YES = '是',
   NO = '否',
@@ -42,7 +59,8 @@ export const schema = {
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入ID系统自动生成！' }],
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'distributorId',
@@ -57,7 +75,8 @@ export const schema = {
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入经销商id！' }],
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'orderSn',
@@ -72,7 +91,8 @@ export const schema = {
         component: 'Input',
         rules: [{ required: true, message: '请输入订单编号！' }],
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'exWarehouse',
@@ -86,7 +106,8 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'distributorName',
@@ -100,7 +121,8 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'ownOrderSn',
@@ -115,7 +137,8 @@ export const schema = {
         component: 'Input',
         rules: [{ required: true, message: '请输入自有订单编号！' }],
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'saleUserId',
@@ -129,7 +152,8 @@ export const schema = {
         colProps,
         component: 'InputNumber',
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'saleUserName',
@@ -143,7 +167,8 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'invoicingCompany',
@@ -157,7 +182,8 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'logisticsMode',
@@ -171,7 +197,8 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'receiveName',
@@ -185,7 +212,8 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'receivePhone',
@@ -199,7 +227,8 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'address',
@@ -213,7 +242,29 @@ export const schema = {
         component: 'InputTextArea',
         colProps: { span: 24 },
       },
-      table: {},
+      table: {
+      },
+    },
+    {
+      field: 'status',
+      label: '工单状态',
+      defaultValue: 'PENDING_REVIEW',
+      form: {
+        componentProps: {
+          allowClear: false,
+          placeholder: '工单状态',
+          options: StatusEnumOptions,
+        },
+        colProps,
+        component: 'Select',
+        rules: [{ required: true, message: '请输入工单状态！' }],
+      },
+      table: {
+        customRender: ({ text }) => {
+          const option = StatusEnumOptions.find((item) => item.value === text)
+          return option ? option.label : text;
+        },
+      },
     },
     {
       field: 'remark',
@@ -227,7 +278,29 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {},
+      table: {
+      },
+    },
+    {
+      field: 'type',
+      label: '是否是主订单',
+      defaultValue: 'YES',
+      form: {
+        componentProps: {
+          allowClear: false,
+          placeholder: '是否是主订单',
+          options: YesNoEnumOptions,
+        },
+        colProps,
+        component: 'Select',
+        rules: [{ required: true, message: '请输入是否是主订单！' }],
+      },
+      table: {
+        customRender: ({ text }) => {
+          const option = YesNoEnumOptions.find((item) => item.value === text)
+          return option ? option.label : text;
+        },
+      },
     },
     {
       field: 'deleteStatus',
@@ -244,7 +317,7 @@ export const schema = {
       },
       table: {
         customRender: ({ text }) => {
-          const option = YesNoEnumOptions.find((item) => item.value === text);
+          const option = YesNoEnumOptions.find((item) => item.value === text)
           return option ? option.label : text;
         },
       },
@@ -262,7 +335,8 @@ export const schema = {
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入操作人ID！' }],
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'editorName',
@@ -277,11 +351,12 @@ export const schema = {
         component: 'Input',
         rules: [{ required: true, message: '请输入操作人！' }],
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'createTime',
-      label: '创建时间',
+      label: 'CreateTime',
       defaultValue: undefined,
       form: {
         colProps,
@@ -294,11 +369,12 @@ export const schema = {
         component: 'RangePicker',
         rules: [{ required: true, message: '请输入CreateTime！' }],
       },
-      table: {},
+      table: {
+      },
     },
     {
       field: 'updateTime',
-      label: '更新时间',
+      label: 'UpdateTime',
       defaultValue: undefined,
       form: {
         colProps,
@@ -311,92 +387,18 @@ export const schema = {
         component: 'RangePicker',
         rules: [{ required: true, message: '请输入UpdateTime！' }],
       },
-      table: {},
+      table: {
+      },
     },
   ],
 };
 
-const queryFields = [
-  'id',
-  'distributorId',
-  'orderSn',
-  'exWarehouse',
-  'distributorName',
-  'ownOrderSn',
-  'saleUserId',
-  'saleUserName',
-  'invoicingCompany',
-  'logisticsMode',
-  'receiveName',
-  'receivePhone',
-  'remark',
-  'deleteStatus',
-  'editorId',
-  'editorName',
-  'createTime',
-  'updateTime',
-];
-const editFields = [
-  'distributorId',
-  'orderSn',
-  'exWarehouse',
-  'distributorName',
-  'ownOrderSn',
-  'saleUserId',
-  'saleUserName',
-  'invoicingCompany',
-  'logisticsMode',
-  'receiveName',
-  'receivePhone',
-  'address',
-  'remark',
-  'deleteStatus',
-];
-const tableFields = [
-  'id',
-  'distributorId',
-  'orderSn',
-  'exWarehouse',
-  'distributorName',
-  'ownOrderSn',
-  'saleUserId',
-  'saleUserName',
-  'invoicingCompany',
-  'logisticsMode',
-  'receiveName',
-  'receivePhone',
-  'address',
-  'remark',
-  'deleteStatus',
-  'editorId',
-  'editorName',
-  'createTime',
-  'updateTime',
-];
-const descriptionFields = [
-  'id',
-  'distributorId',
-  'orderSn',
-  'exWarehouse',
-  'distributorName',
-  'ownOrderSn',
-  'saleUserId',
-  'saleUserName',
-  'invoicingCompany',
-  'logisticsMode',
-  'receiveName',
-  'receivePhone',
-  'address',
-  'remark',
-  'deleteStatus',
-  'editorId',
-  'editorName',
-  'createTime',
-  'updateTime',
-];
+const queryFields = ['id','distributorId','orderSn','exWarehouse','distributorName','ownOrderSn','saleUserId','saleUserName','invoicingCompany','logisticsMode','receiveName','receivePhone','status','remark','type','deleteStatus','editorId','editorName','createTime','updateTime'];
+const editFields = ['distributorId','orderSn','exWarehouse','distributorName','ownOrderSn','saleUserId','saleUserName','invoicingCompany','logisticsMode','receiveName','receivePhone','address','status','remark','type','deleteStatus'];
+const tableFields = ['id','distributorId','orderSn','exWarehouse','distributorName','ownOrderSn','saleUserId','saleUserName','invoicingCompany','logisticsMode','receiveName','receivePhone','address','status','remark','type','deleteStatus','editorId','editorName','createTime','updateTime'];
+const descriptionFields = ['id','distributorId','orderSn','exWarehouse','distributorName','ownOrderSn','saleUserId','saleUserName','invoicingCompany','logisticsMode','receiveName','receivePhone','address','status','remark','type','deleteStatus','editorId','editorName','createTime','updateTime'];
 
-export const searchFormSchema: FormSchema[] = schema.properties
-  .filter((item) => queryFields.includes(item.field))
+export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
   .map(
     ({ field, label, form: { rules = [], ...formProps } }) =>
       ({
@@ -408,8 +410,7 @@ export const searchFormSchema: FormSchema[] = schema.properties
       } as FormSchema),
   );
 
-export const formSchema: FormSchema[] = schema.properties
-  .filter((item) => editFields.includes(item.field))
+export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
   .map(
     ({ field, label, defaultValue, form }) =>
       ({
@@ -421,19 +422,17 @@ export const formSchema: FormSchema[] = schema.properties
       } as FormSchema),
   );
 
-export const columns: BasicColumn[] = schema.properties
-  .filter((item) => tableFields.includes(item.field))
+export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
   .map(
     ({ field, label, table }) =>
       ({
         dataIndex: field,
         title: label,
         ...table,
-      } as BasicColumn),
+      } as BasicColumn)
   );
 
-export const descriptionColumns: BasicColumn[] = schema.properties
-  .filter((item) => descriptionFields.includes(item.field))
+export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
   .map(
     ({ field, label, table }) =>
       ({