Merge remote-tracking branch 'remotes/origin/master' into minJeecg

# Conflicts:
#	env/.env.development

src/api/system/user.ts

@@ -20,10 +20,19 @@ export function queryPostByUserIdApi(userid : string) {
  * @param config 用户信息
  * @returns
  */
-export function editUserApi(config) {
+export function editUserApi(config : object) {
 	return http({
 		url: '/sys/user/appEdit',
 		method: 'PUT',
 		data: config
 	});
+}
+
+/*根据部门Cod和角色Id查询用户信息*/
+export function queryUserByOrgRoleApi(config : object) { 
+	return http({
+		url: '/cxcChangesInPersonnel/cxcChangesInPersonnel/queryByDepCodRoleId',
+		method: 'GET',
+		data: config
+	})
 }

src/pages-humanResource/absence/add.vue

@@ -27,6 +27,8 @@
 					:rules="[{ required: true, message: '请选择结束时间' }]" :min-date="minEndtime" />
 				<wd-picker :label="examineleader" prop="examineleader" v-model="model.examineleader"
 					:columns="examineleaderData" :rules="[{ required: true, message: '请选择' + examineleader }]" />
+				<wd-picker label="单位劳资员" prop="hr" v-model="model.hr" :columns="hrData" v-if="zwmc == '0'"/>
+				<SelectUser label="班组长" v-model="model.teamleader" isRadioSelection v-if="zwmc == '0'"></SelectUser>
 				<wd-input label="出发地" prop="departure" v-model="model.departure"
 					:rules="[{ required: true, message: '请输入出发地' }]" />
 				<wd-input label="目的地" prop="destination" v-model="model.destination"
@@ -64,7 +66,8 @@
 		queryHisDateApi
 	} from '@/api/humanResource/absence'
 	import {
-		queryPostByUserIdApi
+		queryPostByUserIdApi,
+		queryUserByOrgRoleApi
 	} from '@/api/system/user'
 	import {
 		getEnvBaseUrl
@@ -86,6 +89,8 @@
 		begintime: null,
 		endtime: null,
 		examineleader: '',
+		hr: '',
+		teamleader: '',
 		departure: appStore.location,
 		destination: '',
 		reason: '',
@@ -95,6 +100,7 @@
 	const data = ref([])
 	const typeData = ref([])
 	const examineleaderData = ref([])
+	const hrData = ref([])
 	/**判断显示审批 / 分管领导*/
 	const examineleader = ref('')
 	const zwmc = ref('')
@@ -161,6 +167,7 @@
 			errors
 		}) => {
 			if (valid) {
+				console.log('----',model)
 				const submitData = {
 					...model,
 					type: model.type[model.type.length - 1], // 取最后一级
@@ -196,7 +203,7 @@
 
 	const startMutilProcess = (id) => {
 		startMutilProcessApi({
-			flowCode: "dev_cxc_qxj",
+			flowCode: "dev_cxc_qxj_new",
 			id,
 			formUrl: "modules/qxj/modules/CxcQxjBpmModel",
 			formUrlMobile: "leaveApplication"
@@ -245,7 +252,7 @@
 					}
 				})
 				zwmc.value = res.result.zwmc
-				if (zwmc.value == '单位专家' || zwmc.value == '基层正职' || zwmc.value == '高级主管') {
+				if (zwmc.value == '2') {
 					examineleader.value = '分管领导';
 				} else {
 					examineleader.value = '审批领导';
@@ -330,11 +337,28 @@
 		minEndtime.value = model.begintime
 	}
 
+	const getHrList = () => {
+		queryUserByOrgRoleApi({
+			roleId: '1554379432313397250',
+			orgCode: userStore.userInfo.orgCode
+		}).then(res => {
+			model.hr = res.result[0].username
+			hrData.value = res.result.map(item => {
+				return {
+					label: item.realname,
+					value: item.username
+				}
+			})
+		})
+	}
+
 	onLoad(() => {
 		/*获取请假类别*/
 		getTypeList()
 		/*获取审批领导*/
 		getZwmcAndExa()
+		/*获取劳资员*/
+		getHrList()
 		/*获取*/
 		queryHisDate()
 	});

src/utils/index.ts

@@ -391,7 +391,7 @@ function handleDefaultLocation() {
 function weatherRequest(params : { lat ?: number; lon ?: number; q ?: string }) {
 	const store = useAppStore()
 	uni.request({
-		url: 'https://api.openweathermap.org/data/2.5/weather',
+		url: 'http://api.openweathermap.org/data/2.5/weather',
 		method: 'GET',
 		data: {
 			...params,