diff --git a/src/api/regionalSpotManage/index.ts b/src/api/regionalSpotManage/index.ts index b651efa43cfd0cddb9dd343c1fc7e0c2ca36eeaf..77def00b7188fa89c354978d66c4c2c2e0acc60f 100644 --- a/src/api/regionalSpotManage/index.ts +++ b/src/api/regionalSpotManage/index.ts @@ -12,9 +12,10 @@ enum Api { OpsDeleteProduct = '/system/opsProduct/opsDeleteProduct', OpsEditProduct = '/system/opsProduct/opsEditProduct', UploadOpsProduct = '/excel/excelNew/uploadOpsProduct', + QueryList = '/system/logProductManager/queryList', RevokeExcelUpload = '/system/logProductManager/revokeExcelUpload', PlatformProBatchList = '/system/logNegotiationProductOperate/getList', - PlatformProBatchGetDetail = '/system/logNegotiationProductOperate/getList', + PlatformProBatchGetDetail = '/system/logNegotiationProductOperate/getDetail', } /** @@ -92,8 +93,7 @@ export const regionalSpotManageUploadOpsProductApi = (data) => /** * @description: 任务中心获取列表 */ -export const taskCenterQueryListApi = (data) => - tmallabHttp.post({ url: Api.RevokeExcelUpload, data }, { errorMessageMode: 'message' }); +export const taskCenterQueryListApi = (data) => tmallabHttp.post({ url: Api.QueryList, data }); /** * @description: 撤销 diff --git a/src/views/regionalSpotManage/components/downLoadTask.vue b/src/views/regionalSpotManage/components/downLoadTask.vue index 5d7a79d42eaa268fb9c314c5f653d08e616eab45..44191171aa4776a4c2a4fe1ed17fa8d4bf1e80ce 100644 --- a/src/views/regionalSpotManage/components/downLoadTask.vue +++ b/src/views/regionalSpotManage/components/downLoadTask.vue @@ -8,7 +8,7 @@ let list = ref([]); let listLoading = ref(false); const downLoad = (url) => { - window.open(config.VITE_GLOB_API_URL + '/system/' + url, '_blank'); + window.open(config.VITE_GLOB_TMALLAB_URL + '/system/' + url, '_blank'); }; const getList = async () => { listLoading.value = true; @@ -60,8 +60,8 @@ diff --git a/src/views/regionalSpotManage/components/list.vue b/src/views/regionalSpotManage/components/list.vue index 8cef6c2d538d7049eae1cd793a5a282c39d43c01..9413ee90b9ba52708a4d850646fd732825480019 100644 --- a/src/views/regionalSpotManage/components/list.vue +++ b/src/views/regionalSpotManage/components/list.vue @@ -28,6 +28,7 @@ const config = import.meta.env; const userInfo: any = getAuthCache('USER__INFO__'); const ghsCode = userInfo.supplier.ghsCode; + const ghsName = userInfo.supplier.ghsName; const router = useRouter(); const list = ref([]); onMounted(async () => { @@ -383,7 +384,10 @@ productExcelList.value = []; }; const downLoad = () => { - window.open(config.VITE_GLOB_API_URL, '_blank'); + window.open( + config.VITE_GLOB_TMALLAB_URL + '/system/resources/区域现货商品上传模板.xlsx', + '_blank', + ); }; let importLoading = ref(false); const confirmImport = async () => { @@ -391,6 +395,7 @@ if (!impotrCheckboxValue.value.length) return message.error('请选择现货区域'); const param: FormData = new FormData(); param.append('ghsCode', ghsCode); + param.append('ghsName', ghsName); param.append('file', productExcelList.value[0]); param.append('areaIds', impotrCheckboxValue.value as any); importLoading.value = true; diff --git a/src/views/regionalSpotManage/components/platformProBatch.vue b/src/views/regionalSpotManage/components/platformProBatch.vue index 65039520096ac09c4b2ad7b2feec2ede511468cb..af8b991a5112beb70201fbca586520e6b3632c39 100644 --- a/src/views/regionalSpotManage/components/platformProBatch.vue +++ b/src/views/regionalSpotManage/components/platformProBatch.vue @@ -38,7 +38,7 @@ pageSize: pagination.value.pageSize, }); listLoading.value = true; - const res = await platformProBatchGetListApi(param); + const res = await platformProBatchGetListApi(param.value); if (res.success) { list.value = res.data; pagination.value.total = res.data[0].total; @@ -59,11 +59,13 @@ }; const getDetails = async (item) => { const param = ref<{ [key: string]: any }>({ + currentPage: 1, + pageSize: 10, sysid: item.sysid, type: '', }); detailLoading.value = true; - const res = await platformProBatchGetDetailApi(param); + const res = await platformProBatchGetDetailApi(param.value); if (res.success) { operationList.value = res.data; } else { @@ -75,33 +77,12 @@ // =================导出======================== let exportLoading = ref(false); const exportExcel = async () => { - handleDownload([ - { - brand: '生工', - category: '', - createTime: '2024-03-29 14:42:35', - discount: null, - expirationDate: null, - failReason: '该商品在商品目录不存在;', - identificationType: '商品议价', - itemNo: 'G508013-0001', - negotiationPrice: 5000, - operateSysid: 13877, - platforms: ['北京协和医院'], - productName: '微孔板迷你离心机,500~3000 rpm', - spec: '1 /PK', - status: false, - sysid: 83466873, - total: 32, - type: 2, - }, - ]); const param = ref<{ [key: string]: any }>({ sysid: curItem.value.sysid, type: '', }); exportLoading.value = true; - const res = await platformProBatchGetDetailApi(param); + const res = await platformProBatchGetDetailApi(param.value); if (res.success) { handleDownload(res.data); } else { @@ -145,13 +126,13 @@ }); const data = formatJson(filterVal, list); excel.export_json_to_excel({ - header: tHeader as any, - data: data as any, - filename: '操作记录详情' as any, - autoWidth: true as any, - bookType: 'xlsx' as any, - XlsWidth: null as any, - searchList: [] as any, + header: tHeader, + data: data, + filename: '操作记录详情', + autoWidth: false, + bookType: 'xlsx', + XlsWidth: [], + searchList: null, }); }); }; @@ -232,7 +213,6 @@ :loading="detailLoading" bordered :rowKey="(record) => record.sysid" - style="margin-top: -15px" >