diff --git a/public/development_address_config.js b/public/development_address_config.js index 0a010d3..37d2ed3 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -3,7 +3,7 @@ */ window._CONFIG = {}; window._CONFIG["domianURL"] = "/jero-boot"; // 路由转发 devServer -window._CONFIG["domianWebSocketURL"] = "http://localhost:21824/jero-boot"; +window._CONFIG["domianWebSocketURL"] = "http://localhost:8080/jero-boot"; // 单点登录地址 window._CONFIG["staticDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/download"; window._CONFIG["pdfDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/pdf/pdfPreviewIframe"; diff --git a/src/api/api.js b/src/api/api.js index ed19975..052a94a 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -46,7 +46,7 @@ const queryDepartTreeList = (params)=>getAction('/sys/sysDepart/queryTreeList',p const queryIdTree = (params)=>getAction('/sys/sysDepart/queryIdTree',params) const queryParentName = (params)=>getAction('/sys/sysDepart/queryParentName',params) const searchByKeywords = (params)=>getAction('/sys/sysDepart/searchBy',params) -const deleteByDepartId = (params)=>deleteAction('/sys/sysDepart/delete',params) +const deleteByDepartId = (params)=>getAction('/sys/sysDepart/delete',params) //二级部门管理 const queryDepartPermission = (params)=>getAction('/sys/permission/queryDepartPermission',params) diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index 22e38ae..ef07b2a 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -74,6 +74,8 @@ const homePageDataStatistics = (param) => getAction('/home/dataStatistics', para const sysReminders = (param) => postAction('/reminders/edit', param) // 检测企业审核是否通过 const checkCompanyAduit = (param) => getAction('/payMailContract/payMailContract/check', param) +// 获取全部部门 +const getAllDepartTreeList = (param) => getAction('/sys/sysDepart/queryTreeAllList', param) export { getWorkingGroupById, @@ -112,5 +114,6 @@ export { homePageStatistics, homePageDataStatistics, sysReminders, - checkCompanyAduit + checkCompanyAduit, + getAllDepartTreeList } diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index b83c118..2d48d00 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -10,43 +10,59 @@

基本信息

- + - + - + + + + + + + - - + + {{ basicInfo.chargeWay_dictText }} - + {{ basicInfo.contractNum }} + + + + + + + + + +

企业信息

- + - + {{ basicInfo.name }} @@ -56,47 +72,47 @@ {{ basicInfo.gender_dictText }} - + {{ basicInfo.post }} - + {{ basicInfo.phone }} - + {{ basicInfo.email }} - + {{ basicInfo.postalCodeContacts }} - + - + {{ basicInfo.needInvoice_dictText }} - + {{ basicInfo.pack_dictText }} - + {{ basicInfo.postalCodeCompany }} - + @@ -142,8 +158,9 @@ - \ No newline at end of file diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index 6fd83fa..ef7b76d 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -158,7 +158,7 @@ import IconImg from '@/assets/imgs/icon/icon_statistical_report.png' import PageHeaderTitle from '../../components/layouts/PageHeaderTitle' import { JeroListMixin } from '../../mixins/JeroListMixin' -import { queryDepartTreeList } from '../../api/api' +import { getAllDepartTreeList } from '../../api/incomePaymentsApi' import SelectPrincipal from '../../components/company/SelectPrincipal' import JYearDate from '../../components/jero/JYearDate' import { getAction } from '../../api/manage' @@ -318,7 +318,7 @@ export default { * 获取科室（部门）数据 */ loadDepartTreeData() { - queryDepartTreeList().then((res) => { + getAllDepartTreeList().then((res) => { if (res.success) { this.treeDepartData = [] let treeList = res.result diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue index 5956df2..87a0605 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue @@ -121,7 +121,7 @@ import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle' import { JeroListMixin } from '../../../mixins/JeroListMixin' import JYearDate from '../../../components/jero/JYearDate' import SelectPrincipal from '../../../components/company/SelectPrincipal' -import { queryDepartTreeList } from '../../../api/api' +import { getAllDepartTreeList } from '../../../api/incomePaymentsApi' import { getAction } from '@api/manage' export default { @@ -256,7 +256,7 @@ export default { * 获取科室（部门）数据 */ loadDepartTreeData() { - queryDepartTreeList().then((res) => { + getAllDepartTreeList().then((res) => { if (res.success) { this.treeDepartData = [] let treeList = res.result diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue index d30ad26..55e505d 100644 --- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue @@ -143,7 +143,7 @@ import { JeroListMixin } from '../../../mixins/JeroListMixin' import JYearDate from '../../../components/jero/JYearDate' import { getAction } from '@api/manage' import SelectPrincipal from '@comp/company/SelectPrincipal' -import { queryDepartTreeList } from '@api/api' +import { getAllDepartTreeList } from '../../../api/incomePaymentsApi' import ProjectDetailModal from '../../../components/ProjectDetailModal' export default { @@ -284,7 +284,7 @@ export default { * 获取科室（部门）数据 */ loadDepartTreeData() { - queryDepartTreeList().then((res) => { + getAllDepartTreeList().then((res) => { if (res.success) { this.treeDepartData = [] let treeList = res.result diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue index c1fce68..82f0126 100644 --- a/src/views/system/DepartList.vue +++ b/src/views/system/DepartList.vue @@ -8,7 +8,8 @@ 新增 添加下级 - 导出 + 导出 + 导入 @@ -23,7 +24,7 @@ 取消选择 - + @@ -73,7 +74,7 @@ - + @@ -103,28 +104,28 @@ @change="event => event.target.value = event.target.value.trim()" :maxLength="50" v-decorator="['orgCode', validatorRules.orgCode ]"/> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
- 重置 + 重置 保存 @@ -189,6 +190,7 @@ import { JeroListMixin } from '@/mixins/JeroListMixin' import { checkDepartName } from '@/utils/validateOnly' import PageHeaderTitle from '../../components/layouts/PageHeaderTitle' import IconImg from '@/assets/imgs/icon/icon_system.png' +import { downloadFile } from '../../api/manage' // 表头 const columns = [ { @@ -414,6 +416,21 @@ export default { } }, + /** + * 导出 + * @param fileName + */ + handleExportXls(fileName) { + if (!fileName || typeof fileName != 'string') { + fileName = '导出文件' + } + let param = this.getQueryParams() + if (this.checkedKeys && this.checkedKeys.length > 0) { + param['selections'] = this.checkedKeys.join(',') + } + console.log('导出参数', param) + downloadFile(this.url.exportXlsUrl, fileName + '.xls', param) + }, nodeModalOk() { this.loadTree() }, @@ -655,6 +672,11 @@ export default { diff --git a/src/views/system/PermissionList.vue b/src/views/system/PermissionList.vue index afc6102..d1d715e 100644 --- a/src/views/system/PermissionList.vue +++ b/src/views/system/PermissionList.vue @@ -39,28 +39,28 @@ 编辑 - - - - - - - - - - - - - - + + + 更多 + + + + 详情 + + + 添加下级 + + + 数据规则 + - - - - - - - + + + + 删除 + + + diff --git a/src/views/system/SystemDept.vue b/src/views/system/SystemDept.vue index c929bb8..5ee9a2b 100644 --- a/src/views/system/SystemDept.vue +++ b/src/views/system/SystemDept.vue @@ -51,7 +51,7 @@
- 保存 + 保存 取消 diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index 39aea45..a03236b 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -7,19 +7,19 @@ - + - + - + - + - + @@ -97,6 +97,7 @@ import { queryIdTree } from '@/api/api' import pick from 'lodash.pick' import ATextarea from 'ant-design-vue/es/input/TextArea' import {checkDepartName} from '@/utils/validateOnly' +import { isPhone } from '../../../utils/validate' export default { name: 'SysDepartModal', @@ -225,10 +226,10 @@ export default { }) }, validateMobile(rule, value, callback) { - if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)) { + if (!value || isPhone(value)) { callback() } else { - callback('您的手机号码格式不正确!') + callback('您的电话格式不正确!') } } diff --git a/src/views/system/modules/DictItemModal.vue b/src/views/system/modules/DictItemModal.vue index 5e73c07..c74b998 100644 --- a/src/views/system/modules/DictItemModal.vue +++ b/src/views/system/modules/DictItemModal.vue @@ -37,7 +37,7 @@ :wrapperCol="wrapperCol" label="排序值"> - 值越小越靠前，支持小数 + 值越小越靠前 diff --git a/src/views/system/modules/DictModal.vue b/src/views/system/modules/DictModal.vue index aa46c14..0108676 100644 --- a/src/views/system/modules/DictModal.vue +++ b/src/views/system/modules/DictModal.vue @@ -62,7 +62,7 @@ confirmLoading: false, form: this.$form.createForm(this), validatorRules: { - dictName: { rules: [{ required: true, message: '请输入字典名称!' }], validateTrigger: 'blur' }, + dictName: { rules: [{ required: true, message: '请输入字典名称' }], validateTrigger: 'blur' }, dictCode: { rules: [{ required: true,validator: this.validateDictCode }, ], diff --git a/src/views/system/modules/RoleModal.vue b/src/views/system/modules/RoleModal.vue index 018bf05..7d44946 100644 --- a/src/views/system/modules/RoleModal.vue +++ b/src/views/system/modules/RoleModal.vue @@ -91,7 +91,7 @@ export default { validatorRules: { roleName: { rules: [ - {required: true, message: '请输入角色名称!'}, + {required: true, message: '请输入角色名称'}, {min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur'} ], validateTrigger: 'blur' diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index 2a702c0..057b4b3 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -24,7 +24,7 @@ + :readOnly="!!model.id" :disabled="disableSubmit || disabledEdit" />