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

fix: rpj_show选择证书不显示的bug

This commit is contained in:
caoqianming 2024-02-27 15:20:15 +08:00
parent 6e7b2a9f57
commit f0b16b601c
1 changed files with 97 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
src/views/rpm/rpj_show.vue
View File

@ -14,8 +14,7 @@
<el-descriptions-item label="所属部门:">{{ form.belong_dept_name }}</el-descriptions-item> <el-descriptions-item label="所属部门:">{{ form.belong_dept_name }}</el-descriptions-item>
<el-descriptions-item label="相关方:">{{ form.rparty_name }}</el-descriptions-item> <el-descriptions-item label="相关方:">{{ form.rparty_name }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-button type="primary" size="small" <el-button type="primary" size="small" v-if="form.state == 30 || form.state == 40"
v-if="form.state==30||form.state==40"
@click="addWorker('add')">添加成员 @click="addWorker('add')">添加成员
</el-button> </el-button>
</el-card> </el-card>
@ -49,7 +48,8 @@
<el-table-column label="工作职责" prop="duty" width="100"></el-table-column> <el-table-column label="工作职责" prop="duty" width="100"></el-table-column>
<el-table-column label="证书" prop="rcertificates"> <el-table-column label="证书" prop="rcertificates">
<template #default="scope"> <template #default="scope">
<span v-for="cer in scope.row.rcertificates_" :key="cer.id">{{cer.name}}-{{cer.number}}/</span> <span v-for="cer in scope.row.rcertificates_"
:key="cer.id">{{ cer.name }}-{{ cer.number }}/</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="负责人" prop="is_manager" width="80"> <el-table-column label="负责人" prop="is_manager" width="80">
@ -61,15 +61,14 @@
<el-table-column label="备注" prop="note" width="100"></el-table-column> <el-table-column label="备注" prop="note" width="100"></el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" size="small" <el-button link type="primary" size="small" v-if="form.state !== 50 && form.state !== 60"
v-if="form.state!==50&&form.state!==60" @click="addWorker('edit', scope.row)" v-auth="'blt_bind.create'">编辑
@click="addWorker('edit',scope.row)" v-auth="'blt_bind.create'">编辑
</el-button> </el-button>
<el-button link v-if="scope.row.blt_ == null&&(form.state==30||form.state==40)" type="primary" size="small" <el-button link v-if="scope.row.blt_ == null && (form.state == 30 || form.state == 40)"
@click="bindCard(scope.row, 10)" v-auth="'blt_bind.create'">绑卡 type="primary" size="small" @click="bindCard(scope.row, 10)"
v-auth="'blt_bind.create'">绑卡
</el-button> </el-button>
<el-button link type="warning" size="small" <el-button link type="warning" size="small" v-if="form.state == 30 || form.state == 40"
v-if="form.state==30||form.state==40"
@click="leaveDialog(scope.row)">提前离厂 @click="leaveDialog(scope.row)">提前离厂
</el-button> </el-button>
</template> </template>
@ -100,13 +99,9 @@
</el-card> </el-card>
</el-main> </el-main>
<ScBind v-model="showBindBlt" :bindBtl="bindBtl" :bindType="bindType" :bindName="bindName" <ScBind v-model="showBindBlt" :bindBtl="bindBtl" :bindType="bindType" :bindName="bindName"
:bindEmployee="bindEmployee" @success="showBindBltSuccess" @closed="showBindBltClose" :bindEmployee="bindEmployee" @success="showBindBltSuccess" @closed="showBindBltClose"></ScBind>
></ScBind> <el-dialog title="提前离厂" v-model="leaveVisible" width="30%">
<el-dialog title="提前离厂" v-model="leaveVisible" width="30%" > <el-form ref="dialogForm" label-width="80px">
<el-form
ref="dialogForm"
label-width="80px"
>
<el-form-item label="离厂原因"> <el-form-item label="离厂原因">
<el-input v-model="reason" type="text" clearable></el-input> <el-input v-model="reason" type="text" clearable></el-input>
</el-form-item> </el-form-item>
@ -119,75 +114,52 @@
<!-- 人员添加编辑 --> <!-- 人员添加编辑 -->
<el-dialog v-model="workerVisible" :title="workDialogTitle"> <el-dialog v-model="workerVisible" :title="workDialogTitle">
<el-form ref="workerForm" :model="formworker" label-width="120px"> <el-form ref="workerForm" :model="formworker" label-width="120px">
<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-select v-if="workDialogType == 'add'" v-model="formworker.remployee"
v-if="workDialogType=='add'" @change="selectWorker" filterable placeholder="选择项目成员">
v-model="formworker.remployee" <el-option v-for="item in remployeeoptions" :key="item.id" :label="item.name"
@change="selectWorker" :value="item.id" />
filterable </el-select>
placeholder="选择项目成员" <el-input v-else v-model="formworker.remployee_name" type="text" disabled
> style="width:200px"></el-input>
<el-option </el-form-item>
v-for="item in remployeeoptions" </el-col>
:key="item.id" <el-col :md="24" :sm="12" :xs="24">
:label="item.name" <el-form-item label="是否项目负责人">
:value="item.id" <el-radio-group v-model="formworker.is_manager" :disabled="workDialogType == 'edit'">
/> <el-radio :label="true">是</el-radio>
</el-select> <el-radio :label="false">否</el-radio>
<el-input v-else v-model="formworker.remployee_name" type="text" disabled style="width:200px"></el-input> </el-radio-group>
</el-form-item> </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="工作职责">
<el-radio-group v-model="formworker.is_manager" :disabled="workDialogType=='edit'"> <el-input :disabled="workDialogType == 'edit'" v-model="formworker.duty" type="text"
<el-radio :label="true">是</el-radio> clearable></el-input>
<el-radio :label="false">否</el-radio> </el-form-item>
</el-radio-group> </el-col>
</el-form-item> <el-col :md="24" :sm="12" :xs="24">
</el-col> <el-form-item label="证书">
<el-col :md="24" :sm="12" :xs="24"> <el-select v-model="formworker.rcertificates" multiple placeholder="选择证书">
<el-form-item label="工作职责"> <el-option v-for="item in certificatesOptions" :key="item.id" :label="item.name"
<el-input :value="item.id" />
:disabled="workDialogType=='edit'" </el-select>
v-model="formworker.duty" </el-form-item>
type="text" </el-col>
clearable <el-col :md="24" :sm="12" :xs="24">
></el-input> <el-form-item label="原因">
</el-form-item> <el-input :disabled="workDialogType == 'edit'" v-model="formworker.reason" type="text"
</el-col> clearable></el-input>
<el-col :md="24" :sm="12" :xs="24"> </el-form-item>
<el-form-item label="证书"> </el-col>
<el-select </el-row>
v-model="formworker.rcertificates"
multiple
placeholder="选择证书"
>
<el-option
v-for="item in certificatesOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="24" :sm="12" :xs="24">
<el-form-item label="原因">
<el-input
:disabled="workDialogType=='edit'"
v-model="formworker.reason"
type="text"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="workerdialog = false">取 消</el-button> <el-button @click="workerdialog = false">取 消</el-button>
<el-button type="primary" @click="submitWorker" :loading="btnloading" :disabled="btnloading">确 定</el-button> <el-button type="primary" @click="submitWorker" :loading="btnloading" :disabled="btnloading">确
定</el-button>
</template> </template>
</el-dialog> </el-dialog>
</el-container> </el-container>
@ -208,13 +180,14 @@ export default {
}, },
data() { data() {
return { return {
leaveVisible:false, certificatesOptions: [],
workerVisible:false, leaveVisible: false,
workerVisible: false,
loading: false, loading: false,
visible: false, visible: false,
isSaveing: false, isSaveing: false,
showBindBlt: false, showBindBlt: false,
btnloading:false, btnloading: false,
state_: { state_: {
10: "创建中", 10: "创建中",
20: "审批中", 20: "审批中",
@ -228,7 +201,7 @@ export default {
30: "保安保洁服务", 30: "保安保洁服务",
40: "其他", 40: "其他",
}, },
formworker : { formworker: {
duty: "", duty: "",
rcertificates: [], rcertificates: [],
rpj: "", rpj: "",
@ -238,14 +211,14 @@ export default {
bindType: 10, bindType: 10,
bindBtl: null, bindBtl: null,
bindEmployee: '', bindEmployee: '',
logLists:[], logLists: [],
rpjFileList: [], rpjFileList: [],
memeberList: [], memeberList: [],
remployeeoptions:[], remployeeoptions: [],
reason:"", reason: "",
leaveId:"", leaveId: "",
workDialogType:"add", workDialogType: "add",
workDialogTitle:"添加项目成员" workDialogTitle: "添加项目成员"
}; };
}, },
@ -310,7 +283,7 @@ export default {
}); });
}, },
//成员变动操作日志 //成员变动操作日志
getLogs(){ getLogs() {
this.$API.rpm.rpj.logs.req({ rpj: this.form.id, page: 0 }).then((res) => { this.$API.rpm.rpj.logs.req({ rpj: this.form.id, page: 0 }).then((res) => {
debugger; debugger;
this.logLists = res; this.logLists = res;
@ -327,16 +300,16 @@ export default {
this.$API.rpm.rcertificate.list this.$API.rpm.rcertificate.list
.req({ remployee: this.formworker.remployee, page: 0 }) .req({ remployee: this.formworker.remployee, page: 0 })
.then((res) => { .then((res) => {
this.certificatesOptions = res; this.certificatesOptions = res;
}); });
}, },
addWorker(type,row){ addWorker(type, row) {
let that = this; let that = this;
that.workDialogType = type; that.workDialogType = type;
if(type=='add'){ if (type == 'add') {
that.workDialogTitle = "添加项目成员"; that.workDialogTitle = "添加项目成员";
that.getremployee(); that.getremployee();
}else{ } else {
that.workDialogTitle = "项目成员编辑"; that.workDialogTitle = "项目成员编辑";
that.formworker = row; that.formworker = row;
that.formworker.remployee_name = row.remployee_.name; that.formworker.remployee_name = row.remployee_.name;
@ -346,32 +319,32 @@ export default {
} }
that.workerVisible = true; that.workerVisible = true;
}, },
//提交作业成员信息 //提交作业成员信息
submitWorker() { submitWorker() {
let that = this; let that = this;
that.btnloading = true; that.btnloading = true;
that.formworker.rpj = that.form.id; that.formworker.rpj = that.form.id;
if(that.workDialogType=="add"){ if (that.workDialogType == "add") {
that.$refs.workerForm.validate(async (valid) => { that.$refs.workerForm.validate(async (valid) => {
that.$API.rpm.member.create that.$API.rpm.member.create
.req(that.formworker) .req(that.formworker)
.then((res) => { .then((res) => {
that.$message.success("项目成员添加成功"); that.$message.success("项目成员添加成功");
that.workerVisible = false; that.workerVisible = false;
that.btnloading = false; that.btnloading = false;
that.getMemberList(); that.getMemberList();
}) })
.catch((err) => { .catch((err) => {
this.btnloading = false; this.btnloading = false;
return err; return err;
}); });
}); });
}else{ } else {
let formworker = {}; let formworker = {};
formworker.is_manager = that.formworker.is_manager; formworker.is_manager = that.formworker.is_manager;
formworker.rcertificates = that.formworker.rcertificates; formworker.rcertificates = that.formworker.rcertificates;
that.$API.rpm.member.update that.$API.rpm.member.update
.req(that.formworker.id,formworker) .req(that.formworker.id, formworker)
.then((res) => { .then((res) => {
that.$message.success("项目成员证书添加成功"); that.$message.success("项目成员证书添加成功");
that.workerVisible = false; that.workerVisible = false;
@ -383,31 +356,31 @@ export default {
return err; return err;
}); });
} }
}, },
leaveDialog(row){ leaveDialog(row) {
// debugger; // debugger;
this.leaveVisible = true; this.leaveVisible = true;
this.leaveId=row.id; this.leaveId = row.id;
console.log(this.leaveId) console.log(this.leaveId)
}, },
preLeave(){ preLeave() {
// debugger; // debugger;
this.btnloading = true; this.btnloading = true;
if(this.reason!=''){ if (this.reason != '') {
this.$API.rpm.member.leave.req(this.leaveId,{reason:this.reason}).then(res=>{ this.$API.rpm.member.leave.req(this.leaveId, { reason: this.reason }).then(res => {
this.leaveVisible = false; this.leaveVisible = false;
this.btnloading = false; this.btnloading = false;
this.getMemberList(); this.getMemberList();
this.getLogs(); this.getLogs();
}).catch(e=>{ }).catch(e => {
this.btnloading = false; this.btnloading = false;
}) })
}else{ } else {
this.btnloading = false; this.btnloading = false;
this.$message.error("请填写离厂原因"); this.$message.error("请填写离厂原因");
} }
}, },
}, },
}; };