Explorar el Código

feat(组件): 修改部分bug

tangning hace 2 años
padre
commit
de2a80b6f1

+ 10 - 41
src/utils/http/axios/Axios.ts

@@ -146,47 +146,16 @@ export class VAxios {
         formData.append(key, params.data![key]);
       });
     }
-
-    return new Promise((resolve, reject) => {
-      const transform = this.getTransform();
-  
-      const { requestOptions } = this.options;
-  
-      const opt: RequestOptions = Object.assign({}, requestOptions,);
-  
-      const { requestCatchHook, transformRequestHook } = transform || {};
-      this.axiosInstance.request<any, AxiosResponse<Result>>({
-        ...config,
-        method: 'POST',
-        data: formData,
-        headers: {
-          'Content-type': ContentTypeEnum.FORM_DATA,
-          // @ts-ignore
-          ignoreCancelToken: true,
-        },
-      }).then((res: AxiosResponse<Result>) => {
-          if (transformRequestHook && isFunction(transformRequestHook)) {
-            try {
-              const ret = transformRequestHook(res, opt);
-              resolve(ret);
-            } catch (err) {
-              reject(err || new Error('request error!'));
-            }
-            return;
-          }
-          resolve(res as unknown as Promise<T>);
-        })
-        .catch((e: Error | AxiosError) => {
-          if (requestCatchHook && isFunction(requestCatchHook)) {
-            reject(requestCatchHook(e, opt));
-            return;
-          }
-          if (axios.isAxiosError(e)) {
-            // rewrite error message from axios in here
-          }
-          reject(e);
-        });
-    });
+    return this.axiosInstance.request<T>({
+      ...config,
+      method: 'POST',
+      data: formData,
+      headers: {
+        'Content-type': ContentTypeEnum.FORM_DATA,
+        // @ts-ignore
+        ignoreCancelToken: true,
+      },
+    })
   }
 
   

+ 2 - 1
src/views/anchor/index.vue

@@ -93,9 +93,10 @@
 
       const searchForm: Partial<FormProps> = {
         labelWidth: 100,
+        autoSubmitOnEnter:true,
         schemas: [
           {
-            field: 'staffName',
+            field: 'applicationName',
             label: '应用名称',
             component: 'Input',
             componentProps: {

+ 1 - 0
src/views/operate/agent.vue

@@ -66,6 +66,7 @@
       const state = ref<number>(0); //未处理,0已处理(默认1)
       const searchForm: Partial<FormProps> = {
         labelWidth: 100,
+        autoSubmitOnEnter:true,
         schemas: [
           {
             field: 'payTime',

+ 1 - 0
src/views/operate/messageList.vue

@@ -63,6 +63,7 @@
       const { getCheckPerm } = permissionStore;
       const searchForm: Partial<FormProps> = {
         labelWidth: 100,
+        autoSubmitOnEnter:true,
         schemas: [
           {
             field: 'sceneName',

+ 13 - 5
src/views/operate/newsList.vue

@@ -112,13 +112,13 @@
         },
         {
           title: '发布时间',
-          dataIndex: 'createTime',
+          dataIndex: 'publicTime',
           width: 150,
           customRender: ({ record }) => {
             return (
-              record.createTime &&
+              record.publicTime &&
               h(Time, {
-                value: record.createTime,
+                value: record.publicTime,
                 mode: 'datetime',
               })
             );
@@ -177,9 +177,10 @@
       ];
       const searchForm: Partial<FormProps> = {
         labelWidth: 100,
+        autoSubmitOnEnter:true,
         schemas: [
           {
-            field: 'sceneName',
+            field: 'ctivated',
             label: t('routes.operate.releaseTime'),
             component: 'RangePicker',
             componentProps: {
@@ -194,7 +195,7 @@
             },
           },
           {
-            field: 'type',
+            field: 'title',
             label: t('routes.operate.newsTitle'),
             component: 'Input',
             colProps: {
@@ -219,6 +220,13 @@
           listField: 'list',
           totalField: 'total',
         },
+        beforeFetch:(T)=>{
+          if(T.ctivated){
+            T.publicTimeStart = T.ctivated[0]
+            T.publicTimeEnd = T.ctivated[1]
+          }
+          return T
+        },
         actionColumn: {
           width: 220,
           title: '操作',

+ 3 - 2
src/views/operate/recruitList.vue

@@ -33,7 +33,7 @@
   import { BasicTable, useTable, TableAction, BasicColumn, TableImg, FormProps } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { Time } from '/@/components/Time';
-  import { employNoteList, addOrUpdate, employNoteIsTop, NewPublicNews, employNoteIsPush } from '/@/api/operate'
+  import { employNoteList, addOrUpdate, employNoteIsTop, NewPublicNews, employNoteIsPush, employNoteDelete } from '/@/api/operate'
   import { useModal } from '/@/components/Modal';
   import { Descriptions } from 'ant-design-vue';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -154,6 +154,7 @@
       ];
       const searchForm: Partial<FormProps> = {
         labelWidth: 100,
+        autoSubmitOnEnter:true,
         schemas: [
           // {
           //   field: 'sceneName',
@@ -205,7 +206,7 @@
         canResize: false,
       });
       async function handleDelete(record: Recordable) {
-        await newDelete({id:record.id})
+        await employNoteDelete({id:record.id})
         createMessage.success(t('common.optSuccess'));
         reload();
       }

+ 1 - 0
src/views/operate/sceneList.vue

@@ -65,6 +65,7 @@
       const state = ref<number>(0); //未处理,0已处理(默认1)
       const searchForm: Partial<FormProps> = {
         labelWidth: 100,
+        autoSubmitOnEnter:true,
         schemas: [
           {
             field: 'payTime',

+ 12 - 23
src/views/order/cameraList.vue

@@ -83,7 +83,7 @@
         {
           title: '下单时间',
           dataIndex: 'orderTime',
-          width: 120,
+          width: 150,
           customRender: ({ record }) => {
             return (
               record.orderTime &&
@@ -131,9 +131,10 @@
       ];
       const searchForm: Partial<FormProps> = {
         labelWidth: 80,
+        autoSubmitOnEnter:true,
         schemas: [
           {
-            field: 'sceneName',
+            field: 'ctivated',
             label: '下单时间',
             component: 'RangePicker',
             colProps: {
@@ -146,7 +147,7 @@
             }
           },
           {
-            field: 'type',
+            field: 'orderSn',
             label: '订单号',
             component: 'Input',
             colProps: {
@@ -165,32 +166,13 @@
             },
           },
           {
-            field: 'livestreamStatus',
+            field: 'userName',
             component: 'Input',
             label: '用户账号',
             colProps: {
               xl: 6,
               xxl: 6,
             },
-            componentProps: {
-              options: [
-                {
-                  label: t('common.all'),
-                  value: '',
-                  key: '0',
-                },
-                {
-                  label: t('common.yes'),
-                  value: 1,
-                  key: '1',
-                },
-                {
-                  label: t('common.no'),
-                  value: 0,
-                  key: '2',
-                },
-              ],
-            },
           },
         ],
       };
@@ -206,6 +188,13 @@
         canResize: false,
         expandRowByClick: true,
         rowKey: 'id',
+        beforeFetch:(T)=>{
+          if(T.ctivated){
+            T.startTime = T.ctivated[0]
+            T.endTime = T.ctivated[1]
+          }
+          return T
+        },
         fetchSetting: {
           pageField: 'pageNum',
           sizeField: 'pageSize',

+ 1 - 0
src/views/order/downloadList.vue

@@ -114,6 +114,7 @@
       const searchForm: Partial<FormProps> = {
         labelWidth: 100,
         autoAdvancedLine:1,
+        autoSubmitOnEnter:true,
         actionColOptions: {
           span: 24,
         },

+ 1 - 0
src/views/order/equityList.vue

@@ -110,6 +110,7 @@
       ];
       const searchForm: Partial<FormProps> = {
         labelWidth: 100,
+        autoSubmitOnEnter:true,
         autoAdvancedLine:1,
         actionColOptions: {
           span: 24,