zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加人员筛选以及被退回的相应处理

This commit is contained in:
shijing 2023-03-31 14:22:22 +08:00
parent ec38844851
commit a6a0fcdc5a
3 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/opm/usecl.vue
View File

@ -311,19 +311,13 @@
<el-row> <el-row>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="作业人员"> <el-form-item label="作业人员">
<el-select <el-input
v-model="formworker.worker" v-model="formworker.worker_name"
@change="selectWorker" style="width:200px"
placeholder="选择作业人员" disabled
> ></el-input>
<el-option <ehsUserSelect :multiple="false" @submit="getWorker"/>
v-for="item in useroptions" </el-form-item>
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="工作职责"> <el-form-item label="工作职责">
@ -559,7 +553,7 @@ export default {
}); });
}, },
//作业 //作业
//根据作业许可证ID获取，风险、措施 //根据作业许可证ID获取，风险、措施
getOplcates() { getOplcates() {
this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => { this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
@ -616,7 +610,11 @@ export default {
} }
// this.stepSuc.push(++this.active) // this.stepSuc.push(++this.active)
}, },
getWorker(data) {
this.formworker.worker=data.id,
this.formworker.worker_name=data.name
this.selectWorker()
},
//选择人员后，调出该人员的所有证书 //选择人员后，调出该人员的所有证书
selectWorker() { selectWorker() {
this.$API.hrm.certificate.list this.$API.hrm.certificate.list

55
src/views/sys/user.vue
View File

@ -35,19 +35,30 @@
@click="add" @click="add"
></el-button> ></el-button>
<el-select <el-select
v-model="query.type" v-model="query.type"
placeholder="账号类型" placeholder="账号类型"
@change="handleQuery" @change="handleQuery"
clearable clearable
style="margin-left: 2px" style="margin-left: 2px"
> >
<el-option <el-option
v-for="item in userTypeOptions2" v-for="item in userTypeOptions2"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>
<el-select
v-model="query.is_deleted"
placeholder="筛选"
@change="handleQuery"
clearable
style="margin-left: 2px"
>
<el-option label="全部" value=""></el-option>
<el-option label="在用" :value="deletedIs"></el-option>
<el-option label="已删" :value="isDeleted"></el-option>
</el-select>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<div class="right-panel-search"> <div class="right-panel-search">
@ -83,8 +94,8 @@
<el-table-column label="登录账号" prop="username" width="140"></el-table-column> <el-table-column label="登录账号" prop="username" width="140"></el-table-column>
<el-table-column label="是否启用" prop="is_active"> <el-table-column label="是否启用" prop="is_active">
<template #default="scope"> <template #default="scope">
<el-tag type="success" v-if="scope.row.is_active">启用</el-tag> <el-tag type="danger" v-if="scope.row.is_deleted">已删</el-tag>
<el-tag v-else type="danger">禁用</el-tag> <el-tag v-else type="success">在用</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="微信通知" width="80"> <!-- <el-table-column label="微信通知" width="80">
@ -129,6 +140,7 @@
type="primary" type="primary"
link link
size="small" size="small"
v-if="!query.is_deleted"
@click="formSetting(scope.row)" @click="formSetting(scope.row)"
v-auth="'user.update'" v-auth="'user.update'"
> >
@ -148,6 +160,7 @@
link link
size="small" size="small"
type="danger" type="danger"
v-if="!query.is_deleted"
@click="formReset(scope.row)" @click="formReset(scope.row)"
v-auth="'user.update'" v-auth="'user.update'"
> >
@ -213,8 +226,8 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否在用"> <el-form-item label="是否删除">
<el-switch v-model="addForm.is_active" /> <el-switch active-color="#f56c6c" v-model="addForm.is_deleted" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
@ -254,7 +267,9 @@ export default {
save: false, save: false,
// certSave:false, // certSave:false,
}, },
query: {}, isDeleted: true,
deletedIs: false,
query: {is_deleted:''},
baseUrl: baseUrl.API_URL, baseUrl: baseUrl.API_URL,
type: "add", type: "add",
titleMap: { titleMap: {
@ -266,7 +281,6 @@ export default {
addForm: { addForm: {
username: "", username: "",
name: "", name: "",
// email: "",
phone: null, phone: null,
// belong_dept: [], // belong_dept: [],
is_active: true, is_active: true,
@ -301,7 +315,7 @@ export default {
apiObj: this.$API.system.user.list, apiObj: this.$API.system.user.list,
temp: [], temp: [],
postList: [], postList: [],
userTypeOptions :{ userTypeOptions :{
'employee': '正式员工', 'employee': '正式员工',
'remployee': '相关方', 'remployee': '相关方',
'visitor': '访客', 'visitor': '访客',
@ -428,6 +442,7 @@ export default {
if (valid) { if (valid) {
this.isSaveing = true; this.isSaveing = true;
let res; let res;
if (this.type === "add") { if (this.type === "add") {
res = await this.$API.system.user.create.req(this.addForm); res = await this.$API.system.user.create.req(this.addForm);
} else if (this.type === "edit") { } else if (this.type === "edit") {

4
src/views/wf/dutywork.vue
View File

@ -70,8 +70,8 @@
link link
size="small" size="small"
v-if=" v-if="
(scope.row.act_state === 1 || scope.row.act_state === 3) && (scope.row.act_state === 1&&scope.row.state_.type === 0) || (scope.row.act_state === 3&&
scope.row.state_.type === 0 scope.row.state_.type === 0) ||scope.row.act_state === 2
" "
type="primary" type="primary"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)"