diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts index a3794e9..a2b753d 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts @@ -40,6 +40,11 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'status_dictText', }, + { + title: '当前阶段', + align: 'center', + dataIndex: 'buildStatus_dictText', + }, { title: '工单状态', align: 'center', diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue b/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue index ff90c27..6fc7b5b 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue +++ b/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue @@ -76,6 +76,7 @@ import JRangeNumber from "/@/components/Form/src/jeecg/components/JRangeNumber.v import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; import { cloneDeep } from "lodash-es"; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; +import { defHttp } from '/@/utils/http/axios'; const formRef = ref(); const queryParam = reactive({}); @@ -91,7 +92,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ canResize: false, useSearchForm: false, actionColumn: { - width: 120, + width: 140, fixed: 'right', }, beforeFetch: async (params) => { @@ -198,6 +199,11 @@ function handleBuildPlat(record) { * @param record */ function handleInitAccount(record) { + var userInfo = {userName: record.tel,realname: record.name,orgCode:record.id} + console.log("🚀 ~ handleInitAccount ~ userInfo:", userInfo) + defHttp.post({ url: '/sys/user/initialization', params: userInfo }).then(res => { + handleSuccess(); + }) } @@ -206,7 +212,12 @@ function handleInitAccount(record) { * @param record */ function handlePushInfo(record) { - + console.log("🚀 ~ handlePushInfo ~ record:", record) + var params = {openId:record.openId,id:record.id} + console.log("🚀 ~ handlePushInfo ~ params:", params) + defHttp.get({ url: '/weixinMini/sendOrgAuthInfo', params }).then(res => { + handleSuccess(); + }) } @@ -243,13 +254,13 @@ function getTableAction(record) { label: '账户初始化', onClick: handleInitAccount.bind(null, record), auth: 'orgapplyinfo:nu_org_apply_info:edit', - ifShow: record.buildStatus == '5' + ifShow: record.workOrderStatus == '2' && record.buildStatus == '4' }, { label: '信息推送', onClick: handlePushInfo.bind(null, record), auth: 'orgapplyinfo:nu_org_apply_info:edit', - ifShow: record.buildStatus == '6' + ifShow: record.buildStatus == '5' }, ]; }