feat(组件): 修改bug

src/api/customer/index.ts

@@ -83,7 +83,7 @@ export function companyUploadExcel(
     return defHttp.uploadFile<Result>(
       {
         url: Api.companyUploadExcel,
-        // onUploadProgress,
+        onUploadProgress,
       },
       params,
     );

src/api/order/index.ts

@@ -161,7 +161,7 @@ export function InvoiceRegister(
   return defHttp.uploadFile<Result>(
     {
       url: Api.invoiceRegister,
-      // onUploadProgress,
+      onUploadProgress,
     },
     params,
   );

src/api/product/index.ts

@@ -45,7 +45,7 @@ export const AddAndUpload = (params: PageParams) =>{
   return defHttp.uploadFile<Result>(
     {
       url: Api.addAndUpload,
-      // onUploadProgress,
+      onUploadProgress,
     },
     params
   );
@@ -183,7 +183,7 @@ export function SpaceSdkUpload(
   return defHttp.uploadFile<Result>(
     {
       url: Api.spaceSdkUpload,
-      // onUploadProgress,
+      onUploadProgress,
     },
     params,
   );

src/utils/http/axios/Axios.ts

@@ -127,16 +127,17 @@ export class VAxios {
     let conf: CreateAxiosOptions = cloneDeep(config);
     const formData = new window.FormData();
     const customFilename = params.name || 'file';
-
     if (params.filename) {
       formData.append(customFilename, params.file, params.filename);
-    } else {
+    }else {
       formData.append(customFilename, params.file);
     }
-    
     if (params.data) {
       Object.keys(params.data).forEach((key) => {
         const value = params.data![key];
+        if(key == 'file' && !params.filename){
+          return
+        }
         if (Array.isArray(value)) {
           value.forEach((item) => {
             formData.append(`${key}[]`, item);
@@ -147,6 +148,7 @@ export class VAxios {
         formData.append(key, params.data![key]);
       });
     }
+    console.log('uploadFile',params,formData)
     const transform = this.getTransform();
     const { requestOptions } = this.options;
     const opt: RequestOptions = Object.assign({}, requestOptions);

src/views/order/equityList.vue

@@ -209,7 +209,7 @@
           title: () => h('span', '温馨提示'),
           content: () => h('span', isSearch.value?'确认导出搜索结果？':'确认导出全部?'),
           onOk: async () => {
-            // IncrementExport()
+            IncrementExport()
           },
         });
       }

src/views/product/app/AddModal.vue

@@ -55,7 +55,7 @@
             ],
           },
         },{
-          field: 'imprintCh',
+          field: 'agent',
           component: 'ApiSelect',
           required: true,
           label: '代理商标识',
@@ -110,6 +110,9 @@
               const {fileName,md5} = data
               uploadData.md5 = md5
               uploadData.name = fileName
+              setFieldsValue({
+                md5:md5
+              })
               return fileName;
             },
           },
@@ -123,6 +126,9 @@
           colProps: {
             span: 22,
           },
+          componentProps: {
+            disabled:true,
+          },
           rules: [
             {
             required: true,
@@ -144,7 +150,7 @@
           required: true,
         },
         {
-          field: 'version0000',
+          field: 'version',
           component: 'Upload',
           label: '版本信息',
           required: true,
@@ -249,6 +255,7 @@
           const apiData = {
             ...params as any,
             md5:uploadData.md5,
+            version:params.version[0],
             name:uploadData.name,
           }
           console.log('res', apiData);

src/views/product/firmware/AddModal.vue

@@ -99,7 +99,8 @@
               validator: async (rule, value) => {
                 const regPos = /.*[\u4e00-\u9fa5]+.*$/; // 非中文
                 if (!value) {
-                  return Promise.reject(t('common.inputText')+t('routes.product.minVersion'));
+                  return Promise.resolve();
+                  // return Promise.reject(t('common.inputText')+t('routes.product.minVersion'));
                 }
                 if (regPos.test(value)) {
                   /* eslint-disable-next-line */

src/views/product/firmware/EditModal.vue

@@ -112,7 +112,8 @@
               validator: async (rule, value) => {
                 const regPos = /.*[\u4e00-\u9fa5]+.*$/; // 非中文
                 if (!value) {
-                  return Promise.reject(t('common.inputText')+t('routes.product.minVersion'));
+                  return Promise.resolve();
+                  // return Promise.reject(t('common.inputText')+t('routes.product.minVersion'));
                 }
                 if (regPos.test(value)) {
                   /* eslint-disable-next-line */