导入下载错误数据修改

src/api/wms/package/index.ts

@@ -77,8 +77,13 @@ export const deletePackage = async (id: number) => {
 
 // 导出包装 Excel
 export const exportPackage = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.download({ url: `/wms/package/export-excel-senior`, data })
+  } else {
       return await request.download({ url: `/wms/package/export-excel`, params })
-}
+    }
+  }
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/components/ImportForm/src/ImportForm.vue

@@ -223,7 +223,7 @@ const submitFormSuccess = (response: any) => {
           // console.log(172, import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/' + response.data.errorFile)
           // console.log(172, import.meta.env.VITE_BASE_URL + '/admin-api/opt/profile/' + response.data.errorFile)
           window.open(
-            import.meta.env.VITE_BASE_URL + '/admin-api/profile/' + response.data.errorFile,
+            import.meta.env.VITE_BASE_URL + '/admin-api' + response.data.errorFile,
             '222'
           )
           // downloadElement.setAttribute('href', import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + response.data.errorFile )

src/views/system/tenant/TenantForm.vue

@@ -26,8 +26,8 @@
       <el-form-item label="联系手机" prop="contactMobile">
         <el-input v-model="formData.contactMobile" placeholder="请输入联系手机" />
       </el-form-item>
-      <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
-        <el-input v-model="formData.username" placeholder="请输入用户名称" />
+      <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
+        <el-input v-model="formData.username" placeholder="请输入用户账号" />
       </el-form-item>
       <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
         <el-input
@@ -50,6 +50,7 @@
           v-model="formData.expireTime"
           clearable
           placeholder="请选择过期时间"
+          :disabled-date="disabledDate"
           type="date"
           value-format="x"
         />
@@ -175,4 +176,13 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
+/**只能选取当前日期以后的日期 */
+const disabledDate =(time)  => {
+  if (time.getTime() < Date.now()) {
+    return true;
+  } else {
+    return false;
+  }
+}
 </script>

src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

@@ -218,7 +218,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PackageApi.exportPackage(setSearchParams)
+    const data = await PackageApi.exportPackage(tableObject.params)
     download.excel(data, '包装.xlsx')
   } catch {
   } finally {