wangyifang
/
szhd-safety-web-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

Browse Source
master
lion 1 year ago
parent 5ad4dd02b1
commit e6af2ed9be
3 changed files with 165 additions and 136 deletions
Show Stats Download Patch File Download Diff File

22
src/views/task/list/components/addUnit.vue
Unescape View File

@ -372,7 +372,7 @@
<template v-slot:footerContent>
<Button type="primary" style='margin-left:5px;margin-bottom:5px;' @click="clickSubmit">确认</Button>
</Button>
<Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
<Button v-if="type!='send'" type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
<Poptip v-if="type=='editor'" transfer confirm title="确认要删除吗？" @on-ok="deleteList">
<Button type="primary" style="margin-left:5px;margin-bottom:5px;" ghost>删除</Button>
</Poptip>
@ -802,7 +802,7 @@
if (this.type === 'send') {
this.now_do_admin_ids = _arr
console.log("this.now_do_admin_ids",this.now_do_admin_ids)
if(this.form.do_admin_ids && this.form.do_admin_ids.length>0){
if(this.form.do_admin_ids){
_arr.map(item=>{
if(!this.form.do_admin_ids.includes(item)){
this.form.do_admin_ids.push(item)
@ -1139,7 +1139,9 @@
if(!(this.form.audit_status==3||this.form.audit_status==5)){
console.log("this.betweenSe",this.form.start_date, this.form.end_date)
this.betweenSe(this.form.start_date, this.form.end_date)
if(!this.betweenSe(this.form.start_date, this.form.end_date)){
return
}
}
console.log("this.form",this.form)
// return
@ -1182,6 +1184,15 @@
}
if (this.type === 'editor' || this.type === 'send') {
if(this.type==='send'){
if(this.now_do_admin_ids.length<1){
Message({
type: 'warning',
message: '请选择承办人员'
})
return
}
}
save({
id: this.id,
...this.form
@ -1216,8 +1227,6 @@
from_user_id:this.stateObj.login_id
})
}
this.sendNotice({
id:res.model.id,
name:res.model.name,
@ -1242,7 +1251,7 @@
type:'warning',
message: '任务完成时间不能小于开始时间'
})
return
return false
}
if (nowTime < startTime) {
this.form.audit_status = 4
@ -1253,6 +1262,7 @@
if (nowTime >= startTime && nowTime <= endTime) {
this.form.audit_status = 1
}
return true
},
handleRemove(file, fileList) {
this.pictureList = fileList

15
src/views/task/list/components/checkUnit.vue
Unescape View File

@ -82,7 +82,8 @@
</span>
</el-descriptions-item>
<!-- 我的任务中的 转办 -->
<el-descriptions-item span='4' v-if="url_type==5&&showform.mission_distribute&&showform.mission_distribute.length>0">
<el-descriptions-item span='4'
v-if="url_type==5&&showform.mission_distribute&&showform.mission_distribute.length>0">
<template slot="label">
任务承办人
</template>
@ -94,7 +95,8 @@
</span>
</el-descriptions-item>
<!-- 任务追踪中的 转办 -->
<el-descriptions-item span='4' v-if="url_type!=5&&showform.mission_distribute&&showform.mission_distribute.length>0">
<el-descriptions-item span='4'
v-if="url_type!=5&&showform.mission_distribute&&showform.mission_distribute.length>0">
<template slot="label">
任务承办人
</template>
@ -162,6 +164,7 @@
<template slot-scope="scope">
<!-- 有组别的 -->
<div v-if="scope.row.mission_group_id">
<div v-if="scope.row.from_user">转办来源:{{scope.row.from_user?scope.row.from_user.name:''}}</div>
{{scope.row.mission_group?(scope.row.mission_group.name?scope.row.mission_group.name:''):''}}
{{scope.row.mission_group?(scope.row.mission_group.type==1?'组长'+':':':'):''}}
{{scope.row.accept_admin?scope.row.accept_admin.name:''}}
@ -192,7 +195,8 @@
<template slot-scope="scope">
<div v-if="scope.row.carry_status===0">待执行</div>
<div v-else-if="scope.row.carry_status===1">执行中</div>
<div v-else-if="scope.row.carry_status===2">已完成</div>
<div v-else-if="scope.row.carry_status===2 && scope.row.carry_type!=2">已完成</div>
<div v-else-if="scope.row.carry_status===2 && scope.row.carry_type===2">已转办</div>
<div v-else></div>
</template>
</el-table-column>
@ -246,6 +250,8 @@
<template slot-scope="scope">
<!-- 有组别的 -->
<div v-if="scope.row.mission_group_id">
<div v-if="scope.row.from_user">转办来源:{{scope.row.from_user?scope.row.from_user.name:''}}</div>
{{scope.row.mission_group?(scope.row.mission_group.name?scope.row.mission_group.name:''):''}}
{{scope.row.mission_group?(scope.row.mission_group.type==1?'组长'+':':':'):''}}
{{scope.row.accept_admin?scope.row.accept_admin.name:''}}
@ -547,7 +553,7 @@
reloadList() {
this.$emit("refresh")
},
// 提交完 执行状态之后
// 提交完 执行状态之后 sendid是转办返回生成的id
carryTypeWhat(e) {
console.log("carryTypeWhat", e)
@ -556,6 +562,7 @@
// this.openMyMission()
} else if (e == 'carry_type1') {
// 任务分解 初始责任人直接编辑选择参与对象
// 参与对象任务分解，新建任务 且责任人为他自己
if (this.showform.mission_distribute.length > 1) {
this.editorUnit('pid')

14
src/views/task/list/components/openLoad.vue
Unescape View File

@ -8,7 +8,8 @@
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>执行方式：
</div>
<div class="xy-table-item-content">
<el-select v-if="formObj.admin_type==2 || formObj.from==1" :disabled="isdisabled || isEditor" v-model="formObj.carry_type"
<!-- 承办人或参与对象为个人 只能执行-->
<el-select v-if="formObj.admin_type==2 || formObj.from==1 || formObj.from_user_id" :disabled="isdisabled || isEditor" v-model="formObj.carry_type"
style="width: 400px;" placeholder="请选择">
<el-option v-for="item in carryPidList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
@ -306,10 +307,18 @@
this.$Message.warning('预计完成时间不能为空或晚于任务完成时间')
return
}
if (this.type == 'add') {
// 如果是任务转办 就完成 责任人还是原样
if(this.formObj.carry_type===2 && this.formObj.admin_type!=1){
this.formObj.keep_status = 2
this.formObj.carry_status = 2
}else{
this.formObj.carry_status = 1
this.formObj.keep_status = 0
}
}
if (this.type == 'editor') {
if(!this.formObj.finish_status){
this.$Message.warning('请选择完成情况')
@ -321,6 +330,8 @@
this.formObj.keep_status = this.check_status
this.formObj.carry_status = this.check_status == 2 ? 2 : 1
}
let _files = []
if (this.fileList.length > 0) {
for (var h of this.fileList) {
@ -348,6 +359,7 @@
} else if (this.formObj.carry_type == 1) {
this.$emit('refresh', 'carry_type1')
} else if (this.formObj.carry_type == 2) {
// 任务转办
this.$emit('refresh', 'carry_type2')
}
}

Write Preview
Loading…
Cancel
Save