提交api

src/api/dealer/index.ts

@@ -11,14 +11,17 @@ import {
   addCameraParams,
   updateParams,
 } from './model';
-import { Result } from '/#/axios';
+import { Result, FileStream } from '/#/axios';
 
 enum Api {
   agentNewList = '/service/manage/agentNew/list',
   agentNewAdd = '/service/manage/agentNew/add',
   agentNewUpdate = '/service/manage/agentNew/update',
   agentNewDel = '/service/manage/agentNew/delete',
-  checkUserName = '/service/manage/agentNew/checkUserName'
+  checkUserName = '/service/manage/agentNew/checkUserName',
+  logList = '/service/manage/agentNew/logList',
+  export = '/service/manage/agentNew/export',
+  addIncrementNum = '/service/manage/agentNew/addIncrementNum'
 }
 
 /**
@@ -61,6 +64,15 @@ enum Api {
      ignoreCancelToken: true,
    },
  });
+ export const addIncrementNum = (params: PageParams) =>
+ defHttp.post<Result>({
+   url: Api.addIncrementNum,
+   params: params,
+   headers: {
+     // @ts-ignore
+     ignoreCancelToken: true,
+   },
+ });
  export const checkUser = (params: PageParams) =>
  defHttp.get<Result>({
    url: Api.checkUserName,
@@ -69,4 +81,26 @@ enum Api {
      // @ts-ignore
      ignoreCancelToken: true,
    },
- });
+ });
+ 
+export const logListApi = (params: PageParams) =>
+ defHttp.post<Result>({
+   url: Api.logList,
+   params: params,
+   headers: {
+     // @ts-ignore
+     ignoreCancelToken: true,
+   },
+ });
+export const DownExport = (params: PageParams) =>
+defHttp.downloadFile<FileStream>({
+  url: Api.export,
+  params: params,
+  fileName:'经销商销售统计.xlsx',
+  // data: params,
+  headers: {
+    // @ts-ignore
+    ignoreCancelToken: true,
+  },
+  responseType: 'blob'
+});

src/views/dealer/components/addModal.vue

@@ -83,12 +83,14 @@
                   if (!value) {
                     return Promise.reject('请输入四维看看账号');
                   }
-                  let res = await checkUser({userName:value})
-                  console.log('res',res)
                   if (!regPos.test(value)) {
                     /* eslint-disable-next-line */
                     return Promise.reject('请输入正确的手机号');
                   }
+                  let res = await checkUser({userName:value})
+                  if(!res){
+                    return Promise.reject('用户不存在');
+                  }
                   return Promise.resolve();
                 },
                 trigger: 'change',

src/views/dealer/components/financeModal.vue

@@ -22,7 +22,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { agentNewUpdate } from '/@/api/dealer'
+  import { addIncrementNum } from '/@/api/dealer'
   import { useI18n } from '/@/hooks/web/useI18n';
 
   const { t } = useI18n();
@@ -40,7 +40,6 @@
         coverImageUrl:''
       })
       const { createMessage } = useMessage();
-      const downTotalNum = ref(0)
       const schemas: FormSchema[] = [
         {
           field: 'id',
@@ -100,41 +99,24 @@
       const [register, { closeModal }] = useModalInner((data) => {
         data && onDataReceive(data);
       });
-      const formatrichtext = (richtext, len = 0) => {
-          let content = richtext.replace(/<.+?>/g, '');    
-          content = content.replace(/ /ig, ''); /* 去除  */    
-          content = content.replace(/\s/ig, ''); /* 去除空格 */
-          return content && content.length;
-      }
       async function onDataReceive(data) {
         modelRef.value = data
-        downTotalNum.value = data.downTotalNum
+        console.log('downSubNum',data)
+        resetFields()
         setFieldsValue({
           id:data.id,
-          majorAddNum:0,
-          highAddNum:0,
-          downAddNum:0,
         })
         setTimeout(()=>{
           updateSchema([{
             field: 'majorAddNum',
-            label: `专业会员(年)剩余可售 ${data.majorAddNum || 0} 个 新增`,
-            componentProps:{
-              max:data.majorAddNum || 0,
-            }
+            label: `专业会员(年)剩余可售 ${data.majorSubNum || 0} 个 新增`,
           },{
             field: 'highAddNum',
-            label: `高级会员(年)剩余可售 ${data.highAddNum || 0} 个 新增`,
-            ifShow: data.highAddNum>0,
-            componentProps:{
-              max:data.highAddNum || 0,
-            }
+            label: `高级会员(年)剩余可售 ${data.highSubNum || 0} 个 新增`,
+            ifShow: data.highSubNum>0,
           },{
             field: 'downAddNum',
-            label: `场景下载剩余可售 ${data.downAddNum || 0} 次 新增`,
-            componentProps:{
-              max:data.downAddNum || 0,
-            }
+            label: `场景下载剩余可售 ${data.downSubNum || 0} 次 新增`,
           }])
         },500)
       }
@@ -145,10 +127,10 @@
           id:params.id,
           majorAddNum:params.majorAddNum || 0,
           highAddNum:params.highAddNum || 0,
-          downAddNum:(params.downAddNum || 0) + downTotalNum.value,
+          downAddNum:params.downAddNum || 0,
         }
         try {
-          await agentNewUpdate(apiData);
+          await addIncrementNum(apiData);
           closeModal();
           resetFields();
           createMessage.success(t('common.optSuccess'));

src/views/dealer/finance.vue

@@ -10,7 +10,7 @@
     <div class="desc-wrap-BasicTable">
       <BasicTable @register="registerTable">
         <template #toolbar>
-          <a-button type="primary" @click="openModal(true, {language})" v-if="getCheckPerm('news-add')">
+          <a-button type="primary" @click="hendleAddNew" v-if="getCheckPerm('news-add')">
             导出excel</a-button
           >
         </template>
@@ -30,7 +30,7 @@ import {
 } from '/@/components/Table';
 import { PageWrapper } from '/@/components/Page';
 import { Time } from '/@/components/Time';
-import { caseListApi, } from '/@/api/operate';
+import { logListApi, DownExport } from '/@/api/dealer';
 import {  Descriptions, Tabs } from 'ant-design-vue';
 import { useModal } from '/@/components/Modal';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -57,26 +57,26 @@ export default defineComponent({
     const columns: BasicColumn[] = [
       {
         title: '经销商名称',
-        dataIndex: 'title',
+        dataIndex: 'agentName',
         ellipsis: true,
         width: 250,
       },
       {
         title: '专业会员(年)销售数量',
-        dataIndex: 'typeId',
+        dataIndex: 'majorNum',
         ellipsis: true,
         width: 80,
       },
       {
         title: '高级会员（月）销售数量',
         ellipsis: true,
-        dataIndex: 'sysUserName',
+        dataIndex: 'highNum',
         width: 120,
       },
       {
         title: '场景下载销售数量',
         ellipsis: true,
-        dataIndex: 'sort',
+        dataIndex: 'downNum',
         width: 120,
       },
     ];
@@ -85,7 +85,7 @@ export default defineComponent({
       autoSubmitOnEnter: true,
       schemas: [
         {
-          field: 'publicTime',
+          field: 'timeList',
           label: '时间段',
           component: 'RangePicker',
           componentProps: {
@@ -102,7 +102,7 @@ export default defineComponent({
       ],
     };
     const [registerTable, { reload }] = useTable({
-      api: caseListApi,
+      api: logListApi,
       title: '销售统计列表',
       columns: columns,
       useSearchForm: true,
@@ -126,7 +126,8 @@ export default defineComponent({
       },
       canResize: true,
     });
-    function hendleAddNew() {
+    async function hendleAddNew() {
+      await DownExport()
       console.log('新增新闻');
     }
     return {