小程序打卡数据
This commit is contained in:
parent
80c071c890
commit
2588ce49ca
|
|
@ -86,3 +86,12 @@ export function getAttGroupList() {
|
||||||
method: 'get'
|
method: 'get'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 查询部门列表
|
||||||
|
export function listDept(query) {
|
||||||
|
return request({
|
||||||
|
url: '/system/attDetails/orgList',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -530,6 +530,18 @@ export default {
|
||||||
return selectedUserNames.join(', ');
|
return selectedUserNames.join(', ');
|
||||||
},
|
},
|
||||||
|
|
||||||
|
getSelectedUserNameEvecTion() {
|
||||||
|
const selectedUserIdsStr = this.form.hostUserId;
|
||||||
|
// 将字符串分割成字符串数组,并将每个元素转换为整数
|
||||||
|
const selectedUserIds = selectedUserIdsStr.split(',').map(id => parseInt(id.trim(), 10));
|
||||||
|
|
||||||
|
const selectedUsers = this.userList.filter(option => selectedUserIds.includes(option.userId));
|
||||||
|
|
||||||
|
const selectedUserNames = selectedUsers.map(user => user.userName);
|
||||||
|
|
||||||
|
return selectedUserNames.join(', ');
|
||||||
|
},
|
||||||
|
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
submitForm: function () {
|
submitForm: function () {
|
||||||
console.log(this.form)
|
console.log(this.form)
|
||||||
|
|
@ -548,6 +560,10 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.form.hostUserId = list;
|
this.form.hostUserId = list;
|
||||||
|
var hostNameList = this.getSelectedUserNameEvecTion();
|
||||||
|
this.form.hostUserName = hostNameList;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var lists = this.form.orgHeadUserIdList.join(",");
|
var lists = this.form.orgHeadUserIdList.join(",");
|
||||||
this.form.travelers = lists;
|
this.form.travelers = lists;
|
||||||
|
|
|
||||||
|
|
@ -345,9 +345,7 @@ export default {
|
||||||
leaveDuration: [
|
leaveDuration: [
|
||||||
{required: true, message: "休假时长不能为空", trigger: "blur"}
|
{required: true, message: "休假时长不能为空", trigger: "blur"}
|
||||||
],
|
],
|
||||||
location: [
|
|
||||||
{required: true, message: "地点不能为空", trigger: "blur"}
|
|
||||||
],
|
|
||||||
isAgree: [
|
isAgree: [
|
||||||
{required: true, message: "是否请示领导同意不能为空", trigger: "blur"}
|
{required: true, message: "是否请示领导同意不能为空", trigger: "blur"}
|
||||||
],
|
],
|
||||||
|
|
@ -520,6 +518,9 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.form.hostUserId = list;
|
this.form.hostUserId = list;
|
||||||
|
var nameList = this.getSelectedUserNameLeave();
|
||||||
|
this.form.hostUserName = nameList;
|
||||||
|
|
||||||
if (this.form.id != undefined) {
|
if (this.form.id != undefined) {
|
||||||
this.form.examineStatus = 0
|
this.form.examineStatus = 0
|
||||||
updateLeaveReporting(this.form).then(response => {
|
updateLeaveReporting(this.form).then(response => {
|
||||||
|
|
@ -537,6 +538,19 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
getSelectedUserNameLeave() {
|
||||||
|
const selectedUserIdsStr = this.form.hostUserId;
|
||||||
|
// 将字符串分割成字符串数组,并将每个元素转换为整数
|
||||||
|
const selectedUserIds = selectedUserIdsStr.split(',').map(id => parseInt(id.trim(), 10));
|
||||||
|
|
||||||
|
const selectedUsers = this.userList.filter(option => selectedUserIds.includes(option.userId));
|
||||||
|
|
||||||
|
const selectedUserNames = selectedUsers.map(user => user.userName);
|
||||||
|
|
||||||
|
return selectedUserNames.join(', ');
|
||||||
|
},
|
||||||
|
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
const Ids = row.id;
|
const Ids = row.id;
|
||||||
|
|
|
||||||
|
|
@ -229,11 +229,10 @@
|
||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
listOrg, getOrg, delOrg, addOrg, updateOrg, changeOrgStatus, exportOrg, getPostName,
|
listOrg, getOrg, delOrg, addOrg, updateOrg, changeOrgStatus, exportOrg, getPostName,
|
||||||
getAttGroupList,
|
getAttGroupList,listDept
|
||||||
} from "@/api/process/orgApply";
|
} from "@/api/process/orgApply";
|
||||||
import Treeselect from "@riophae/vue-treeselect";
|
import Treeselect from "@riophae/vue-treeselect";
|
||||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
import {listDept} from "@/api/system/dept";
|
|
||||||
export default {
|
export default {
|
||||||
name: "OrgApply",
|
name: "OrgApply",
|
||||||
components: { Treeselect },
|
components: { Treeselect },
|
||||||
|
|
|
||||||
|
|
@ -100,27 +100,13 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="所属部门:" prop="orgId">
|
<el-form-item label="所属部门:" prop="orgId">
|
||||||
<el-select v-model="form.orgId" @change="changDept" style="width: 100%;" :disabled="true">
|
<el-input v-model="form.orgName" :disabled="true"/>
|
||||||
<el-option
|
|
||||||
v-for="item in orgList"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="出行人:" prop="orgHeadUserIdList">
|
<el-form-item label="出行人:" prop="orgHeadUserIdList">
|
||||||
<el-select v-model="form.orgHeadUserIdList" :disabled="true" multiple placeholder="请选择出行人" filterable clearable style="width: 100%;">
|
<el-input v-model="form.travelersName" :disabled="true"/>
|
||||||
<el-option
|
|
||||||
v-for="item in personOptions"
|
|
||||||
:key="item.userIds"
|
|
||||||
:label="item.userName"
|
|
||||||
:value="item.userIds"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -176,15 +162,7 @@
|
||||||
|
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="代理主持工作人员:" prop="hostUserId">
|
<el-form-item label="代理主持工作人员:" prop="hostUserId">
|
||||||
<el-select v-model="form.hostUserId" :disabled="true" multiple placeholder="请选择人员姓名" filterable clearable style="width: 100%;">
|
<el-input v-model="form.hostUserName" :disabled="true"/>
|
||||||
<el-option
|
|
||||||
v-for="item in userList"
|
|
||||||
:key="item.userId"
|
|
||||||
:label="item.userName"
|
|
||||||
:value="item.userId"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -217,11 +195,11 @@ import {
|
||||||
listEvection,
|
listEvection,
|
||||||
getUserList,
|
getUserList,
|
||||||
exportEvection,
|
exportEvection,
|
||||||
getPersonSelect
|
getPersonSelect,
|
||||||
|
getEvection
|
||||||
} from "@/api/process/wechatEvection";
|
} from "@/api/process/wechatEvection";
|
||||||
import Treeselect from "@riophae/vue-treeselect";
|
import Treeselect from "@riophae/vue-treeselect";
|
||||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
import {getEvection} from "@/api/process/evection";
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "rules",
|
name: "rules",
|
||||||
|
|
|
||||||
|
|
@ -101,14 +101,7 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="所属部门:" prop="orgId">
|
<el-form-item label="所属部门:" prop="orgId">
|
||||||
<el-select v-model="form.orgId" @change="changDept" style="width: 100%;" :disabled="true">
|
<el-input v-model="form.orgName" :disabled="true" />
|
||||||
<el-option
|
|
||||||
v-for="item in orgList"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
|
|
@ -177,15 +170,7 @@
|
||||||
|
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="代理主持工作人员:" prop="hostUserId">
|
<el-form-item label="代理主持工作人员:" prop="hostUserId">
|
||||||
<el-select v-model="form.hostUserId" :disabled="true" multiple placeholder="请选择人员姓名" filterable clearable style="width: 100%;">
|
<el-input v-model="form.hostUserName" :disabled="true" />
|
||||||
<el-option
|
|
||||||
v-for="item in userList"
|
|
||||||
:key="item.userId"
|
|
||||||
:label="item.userName"
|
|
||||||
:value="item.userId"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue