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 69e3acd447
commit 9d76ae0abb
5 changed files with 752 additions and 757 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape View File

@ -2,6 +2,6 @@
ENV = 'production'
# base api
VUE_APP_BASE_API = http://192.168.60.99:9001/
#VUE_APP_BASE_API = http://192.168.60.99:9001/
#VUE_APP_BASE_API = 'http://safety.115.langye.net/'
VUE_APP_BASE_API = 'http://safety.115.langye.net/'

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

@ -143,6 +143,7 @@
</template>
<template v-slot:name7>
<div v-if="!plan_unit">
<div v-if="type!='send'">
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -231,6 +232,8 @@
</div>
</div>
</div>
</div>
<div v-if="type=='add'||type=='editor'">
<div class="xy-table-item">
@ -409,6 +412,7 @@
isShow: false,
type: 'add',
typeName:'新增任务',
plan_unit:'', // 年度计划发布任务不用选参与对象
subtitle:'',
is_what_unitType: '',
id: '',
@ -594,6 +598,9 @@
setoutLineId(id) {
this.form.out_line_id = id ? id : ''
},
setPlanUnit(type){
this.plan_unit = type?type:''
},
setMissionPlanId(id){
this.form.mission_plan_id = id?id:''
},
@ -990,7 +997,9 @@
// }
// console.log("this.form",this.form)
// return
if (this.form.name7 == 3) {
// 如果在年度计划大纲发起任务 不用验证参与人员
if (this.form.name7 == 3 && !this.plan_unit) {
if (this.mission_groups_list.length == 0) {
Message({
type: 'warning',
@ -1200,6 +1209,7 @@
}]
this.department_id = ''
this.plan_id = ''
this.plan_unit = ''
this.is_what_unitType = ''
this.hasPlanId = false
this.upload_link = ''

15
src/views/task/list/plan.vue
Unescape View File

@ -4,12 +4,12 @@
<lx-header icon="md-apps" :text="textName" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<slot>
<div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
<!-- <Select filterable clearable style='width:200px;margin-right: 10px;' v-model="select.status"
placeholder="计划状态">
<Option v-for="item in statusList" :value="item.id">{{item.value}}</Option>
</Select> -->
<DatePicker v-model="select.year" style='width:200px;margin-right: 10px;' placeholder="年份"
placement="bottom" format='yyyy' type="year" @on-change="changeYear"></DatePicker>
<Select filterable clearable style='width:200px;margin-right: 10px;' v-model="select.audit_status"
placeholder="计划状态">
<Option v-for="item in auditStatusList" :value="item.id">{{item.value}}</Option>
</Select>
<Input v-model="select.keyword" clearable style="width: 200px;margin-right: 10px;" placeholder="关键字搜索" />
<Button type="primary" @click="getList">查询</Button>
</div>
@ -39,7 +39,7 @@
</div>
<div v-if="scope.row.audit_status==1">
<Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
@click="editUnit(scope.row,1)">发布任务</Button>
@click="editUnit(scope.row,1,'plan_unit')">发布任务</Button>
</div>
<div v-if="scope.row.audit_status!=0">
<Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
@ -80,6 +80,7 @@
keyword: '',
page: 1,
page_size: 10,
audit_status:'',
// is_myself_audit:0,
year: '',
plan_type: '',
@ -181,11 +182,13 @@
console.log(e)
this.select.year = e
},
editUnit(row,type){
editUnit(row,type,plan_unit){
this.$refs.addUnit.type="add"
this.$refs.addUnit.setoutLineId(row.out_line_id)
this.$refs.addUnit.setMissionPlanId(row.id)
this.$refs.addUnit.setType(type)
this.$refs.addUnit.setPlanUnit(plan_unit)
this.$refs.addUnit.setNameContent(row.name,row.content)
this.$refs.addUnit.setMenuLevel(row.menu,row.level,row.menu_id,row.level_id)
this.$refs.addUnit.setMainId(row.main_department_id,row.main_admin_id)

80
src/views/task/list/unit.vue
Unescape View File

@ -49,13 +49,13 @@
</div>
<div class="tablewrap">
<div class="tablemonth" v-if="showSelectMonth">
<!-- <div class="tablemonth" v-if="showSelectMonth">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
<div style="margin: 15px 0;"></div>
<el-checkbox-group v-model="selectMonth" @change="changeMonth">
<el-checkbox v-for="item in allMonths" :label="item.id">{{item.value}}</el-checkbox>
</el-checkbox-group>
</div>
</div> -->
<div class="tablecontent" :style="{'width':showSelectMonth?'89%':'100%'}">
<div>
@ -99,66 +99,50 @@
v-if="(scope.row.accept_department_ids && scope.row.accept_department_ids.length>0 && stateObj.is_manger
) || scope.row.main_admin_id==stateObj.login_id
">
<Dropdown trigger="click" v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)">
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务
<!-- <Icon type="ios-arrow-down"></Icon> -->
</Button>
<template #list>
<DropdownMenu>
<DropdownItem>
<el-tooltip placement="left" effect="light" v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content">
<div style="margin-bottom:5px;">
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</DropdownItem>
<DropdownItem>
</div>
<div style="margin-bottom:5px;">
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</DropdownItem>
<DropdownItem>
</div>
<div v-for="item in unitTypeList">
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</div>
</DropdownItem>
</DropdownMenu>
</template>
</Dropdown>
</div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务
</Button>
</el-tooltip>
</div>
<!-- 小组的带头人 和小组组长 -->
<div v-else-if="(scope.row.groups && scope.row.groups.length>0 )
|| scope.row.main_admin_id==stateObj.login_id">
<!-- 组长权限 -->
<Dropdown trigger="click" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务
<!-- <Icon type="ios-arrow-down"></Icon> -->
</Button>
<template #list>
<DropdownMenu>
<DropdownItem>
<el-tooltip placement="left" effect="light" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content">
<div style="margin-bottom:5px;">
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</DropdownItem>
<DropdownItem>
</div>
<div style="margin-bottom:5px;">
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</DropdownItem>
<DropdownItem>
</div>
<div v-for="item in unitTypeList">
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</div>
</DropdownItem>
</DropdownMenu>
</template>
</Dropdown>
</div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务
</Button>
</el-tooltip>
<!-- 组里面所有人都能执行任务 -->
<div v-else>
@ -168,8 +152,6 @@
@click="openMyMission(item.value,scope.row)">执行任务</Button>
</div>
</div>
</div>
<!-- 直接 执行任务 -->
<div v-else>
@ -464,8 +446,8 @@
let currentMonth = (new Date()).getMonth() + 1 < 10 ? "0" + ((new Date()).getMonth() + 1) : (new Date())
.getMonth() + 1
// this.selectMonth.push(currentMonth)
this.selectMonth.push(currentMonth)
this.select.month = currentMonth
// this.selectMonth.push(currentMonth)
// this.select.month = currentMonth
if (this.$route.path) {
let path = this.$route.path.split("_")
this.select.type = path[1]
@ -489,10 +471,10 @@
}
if (path[1] == 4) {
this.selectMonth = []
this.allMonths.map(item=>{
this.selectMonth.push(item.id)
})
this.select.month = this.selectMonth.join(',')
// this.allMonths.map(item=>{
// this.selectMonth.push(item.id)
// })
// this.select.month = this.selectMonth.join(',')
this.select.type = 4
this.type_name = '专项专题任务'
this.path_type = path[1]
@ -505,7 +487,7 @@
})
}
if (path[1] == 1) {
this.showSelectMonth = true
this.showSelectMonth = false
this.select.type = 1
// this.select.pid = ''
// this.treeProps = {children: 'nochildren', hasChildren: 'hasChildren' }

Write Preview
Loading…
Cancel
Save