diff --git a/src/http/api/enterprise.ts b/src/http/api/enterprise.ts index 09a5ada..b31c652 100644 --- a/src/http/api/enterprise.ts +++ b/src/http/api/enterprise.ts @@ -90,16 +90,30 @@ export const apiGetCompanyInfoById = (id: any) => { return post(strUrl,params) } -/* - - - - - -POST +//=============================================企业业务开通管理 +// business​/open​/exportExcel +export const apiBusinessOpenExportExcel = (params: any) => { + let strUrl = `business/open/exportExcel` + return get(strUrl,{}) +} +// 新增业务开通请求 +export const apiBusinessOpenInsert = (params: any) => { + let strUrl = `/business/open/insert` + return post(strUrl,params) +} +// 根据条件查询企业业务开通信息列表 +export const apiBusinessOpenselectList = (params: any) => { + let strUrl = `/business/open/selectList` + return post(strUrl,params) +} +// 企业业务开通数据修改 +export const apiBusinessUpdateBusiness = (params: any) => { + let strUrl = `/business/open/updateBusiness` + return post(strUrl,params) +} -POST -企业信息变更 */ \ No newline at end of file + + \ No newline at end of file diff --git a/src/utils/time.ts b/src/utils/time.ts index 8ff6302..e0c4546 100644 --- a/src/utils/time.ts +++ b/src/utils/time.ts @@ -117,3 +117,37 @@ export function formatDate(timestamp: any) { } return '刚刚' } + + + + +export const getNewDay = (dateTemp: any, days: any) => { + console.log("dateTemp",dateTemp,days) + if(!dateTemp ){ + return "" + } + dateTemp = dateTemp.split("."); + //转换为MM-DD-YYYY格式 + let nDate: any = new Date(dateTemp[1] + "-" + dateTemp[2] + "-" + dateTemp[0]); + let millSeconds: any = Math.abs(nDate) - days * 24 * 60 * 60 * 1000; + let rDate: any = new Date(millSeconds); + let year: any = rDate.getFullYear(); + let month: any = rDate.getMonth() + 1; + if (month < 10) month = "0" + month; + let date = rDate.getDate(); + if (date < 10) date = "0" + date; + return year + "." + month + "." + date; + +} + +export const getdatatime = () => { //默认显示今天 + //this.queryInfos.sheetDate= new Date(); + const currentDate = new Date() + const year = currentDate.getFullYear(); + const month = currentDate.getMonth(); + const date = currentDate.getDate(); + const end = (new Date(year, month, date, 0, 0, 0)).getTime(); // 2021-12-24 00:00:00 + const start = end - (3600 * 1000 * 24 * 30) + return [start,end] + +} diff --git a/src/views/com/details.vue b/src/views/com/details.vue index e6ebb08..b464fb4 100644 --- a/src/views/com/details.vue +++ b/src/views/com/details.vue @@ -102,7 +102,7 @@ -
+
审批 @@ -113,9 +113,10 @@ diff --git a/src/views/enterpriseManagement/businessReview/index.vue b/src/views/enterpriseManagement/businessReview/index.vue index 559a6f2..acb996a 100644 --- a/src/views/enterpriseManagement/businessReview/index.vue +++ b/src/views/enterpriseManagement/businessReview/index.vue @@ -6,31 +6,31 @@ :max-height="'calc(100vh - 72px - 48px - 65px - 12px - 60px - 88px)'" :height="'calc(100vh - 72px - 48px - 65px - 12px - 60px - 88px)'"> - - + + - + - + - + - + @@ -38,15 +38,18 @@
- +
@@ -56,75 +59,40 @@ import headerTop from "./com/headerTop.vue" import addCom from "./com/addCom.vue" import { ElConfirmBeforeOpert } from "utils/elementCom" +import {apiBusinessOpenselectList} from "http/api/enterprise" const router = useRouter() const addComRef = ref() const paginationInfo = reactive({ - currentPage: 1, + pageNum: 1, pageSize: 15 }) -const tableData = [ - { - v_id: '1', - v_company: '2016-05-03', - v_businessType: 'Tom', - v_username: 'California', - v_account: 'Los Angeles', - v_code: 'No. 189, Grove St, Los Angeles', - v_applyTime: 'CA 90036', - v_status: '1', - }, - { - v_id: '2', - v_company: '2016-05-03', - v_businessType: 'Tom', - v_username: 'California', - v_account: 'Los Angeles', - v_code: 'No. 189, Grove St, Los Angeles', - v_applyTime: 'CA 90036', - v_status: '1', - }, - { - v_id: '3', - v_company: '2016-05-03', - v_businessType: 'Tom', - v_username: 'California', - v_account: 'Los Angeles', - v_code: 'No. 189, Grove St, Los Angeles', - v_applyTime: 'CA 90036', - v_status: '1', - }, - { - v_id: '4', - v_company: '2016-05-03', - v_businessType: 'Tom', - v_username: 'California', - v_account: 'Los Angeles', - v_code: 'No. 189, Grove St, Los Angeles', - v_applyTime: 'CA 90036', - v_status: '1', - - }, - { - v_id: '5', - v_company: '2016-05-03', - v_businessType: 'Tom', - v_username: 'California', - v_account: 'Los Angeles', - v_code: 'No. 189, Grove St, Los Angeles', - v_applyTime: 'CA 90036', - v_status: '1', - }, - -] - +let total = ref(0) let tableListInfo = reactive({ - list: tableData + list: [] }) - +let searchParams: any = {} const editRowFn = (row: any) => { router.push({ - name:'entryAuditDetails' + name:'entryAuditDetails', + query:{ + type:'open', + subType:'edit', + id:row.id, + coId:row.coId + } + }) + +} +const showRowFn = (row: any) => { + router.push({ + name:'entryAuditDetails', + query:{ + type:'open', + subType:'show', + id:row.id, + coId:row.coId + } }) } @@ -159,14 +127,25 @@ const exportFn = () => { } const getPageFn = (val: any) => { - paginationInfo.currentPage = val.currentPage + paginationInfo.pageNum = val.pageNum paginationInfo.pageSize = val.pageSize initTableList() } -const initTableList = () => { - +const initTableList =async () => { + const params = { + ...searchParams, + ...paginationInfo + } + const res: any = await apiBusinessOpenselectList(params) + console.log("apiGetCompanyInfoSelectList", res) + tableListInfo.list = res.rows + // tableListInfo.list = + total.value = res.total } +onMounted(() => { + initTableList() +}) diff --git a/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue b/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue index 6a55817..18f03a8 100644 --- a/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue +++ b/src/views/enterpriseManagement/enterpriseEntryReview/com/headerTop.vue @@ -12,13 +12,13 @@ - + 查询 重置 - +
导出 @@ -27,14 +27,17 @@ diff --git a/src/views/enterpriseManagement/enterpriseEntryReview/index.vue b/src/views/enterpriseManagement/enterpriseEntryReview/index.vue index e87aac8..63cae0c 100644 --- a/src/views/enterpriseManagement/enterpriseEntryReview/index.vue +++ b/src/views/enterpriseManagement/enterpriseEntryReview/index.vue @@ -41,7 +41,7 @@ 审批 - + 查看 diff --git a/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue b/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue index 5b15efb..bda06a1 100644 --- a/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue +++ b/src/views/enterpriseManagement/enterpriseType/com/headerTop.vue @@ -24,6 +24,7 @@