diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 59b6547..3939739 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -37,6 +37,7 @@ "url": "https://gitee.com/KonBAI-Q/ruoyi-flowable-plus.git" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@babel/parser": "7.7.4", "@handsontable/vue": "^15.3.0", "@jiaminghi/data-view": "^2.10.0", diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html index 4d71211..0733f44 100644 --- a/ruoyi-ui/public/index.html +++ b/ruoyi-ui/public/index.html @@ -10,6 +10,8 @@ <%= webpackConfig.name %> + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/hrm/requests/travel.vue b/ruoyi-ui/src/views/hrm/requests/travel.vue index f6ffcf3..9edd6b0 100644 --- a/ruoyi-ui/src/views/hrm/requests/travel.vue +++ b/ruoyi-ui/src/views/hrm/requests/travel.vue @@ -65,8 +65,8 @@ - -
请填写具体目的地,便于审批人判断出差必要性
+ +
请通过地图或搜索选择具体城市,便于审批人判断出差必要性
出差说明
@@ -223,13 +223,15 @@ import { ccFlowTask, listFlowNode, listFlowTemplate } from '@/api/hrm/flow' import FileUpload from '@/components/FileUpload' import UserMultiSelect from '@/components/UserSelect/multi.vue' import UserSelect from '@/components/UserSelect/single.vue' +import AmapCitySelect from '@/components/AmapCitySelect/index.vue' export default { name: 'HrmTravelRequest', components: { UserSelect, FileUpload, - UserMultiSelect + UserMultiSelect, + AmapCitySelect }, data () { return {