@@ -591,13 +591,13 @@ import elSelectTree from '@/components/selectTree'
},
changeName7(e) {
if (e) {
- this.form.accept_department_ids = []
- this.form.accept_admin_ids = []
- this.form.mission_groups = []
- this.mission_groups_list = []
- this.valueArr = []
- this.valueMultiple = []
- this.$forceUpdate()
+ // this.form.accept_department_ids = []
+ // this.form.accept_admin_ids = []
+ // this.form.mission_groups = []
+ // this.mission_groups_list = []
+ // this.valueArr = []
+ // this.valueMultiple = []
+ // this.$forceUpdate()
}
},
changeAudit(e) {
@@ -736,7 +736,7 @@ import elSelectTree from '@/components/selectTree'
start_date: res?.start_date,
name: res?.name,
end_date: res?.end_date,
- mission_level:res?.mission_level,
+ mission_level:0,
mission_plan_id:res?.mission_plan_id,
@@ -981,14 +981,14 @@ import elSelectTree from '@/components/selectTree'
}
}
},
- department_id(val){
- if(val){
- console.log('this.department_id',this.department_id)
- this.form.mission_level = this.department_id
- }else{
- this.form.mission_level = 0
- }
- },
+ // department_id(val){
+ // if(val){
+ // console.log('this.department_id',this.department_id)
+ // this.form.mission_level = this.department_id
+ // }else{
+ // this.form.mission_level = 0
+ // }
+ // },
isShow(newVal) {
if (newVal) {
diff --git a/src/views/task/list/components/showPlan.vue b/src/views/task/list/components/showPlan.vue
index 5367507..b7d0dce 100644
--- a/src/views/task/list/components/showPlan.vue
+++ b/src/views/task/list/components/showPlan.vue
@@ -72,7 +72,7 @@
-->
- 参与对象:
+ 责任科室:
@@ -125,7 +125,7 @@
任务情况
+ @click="editorUnit('add')">发布任务
导出
-
+
@@ -38,6 +38,9 @@
:list="list"
:total="total"
stripe
+ :span-method="spanMethod"
+ :showIndex='false'
+ :isPage="false"
@cell-dblclick='cellClicks'
@selection-change='selectionChange'
@pageSizeChange="e => {select.page_size = e,getList()}"
@@ -53,9 +56,15 @@
-
+
+
+
+
+
@@ -88,6 +97,10 @@
saveAs
} from "file-saver";
import state from '@/store/modules/user.js'
+ import {
+ getMergeCells,
+ groupBy
+ } from '@/utils/contactTable.js'
export default{
components:{
addPatrol,
@@ -104,7 +117,7 @@
select:{
keyword:'',
page:1,
- page_size:10,
+ page_size:9999,
status:'',
myself:0,
mission_id:'',
@@ -179,21 +192,8 @@
}
],
table:[{
- type:'selection',
- // selectable:(row,index)=>{
- // if((this.is_guiji||this.is_chuzhang||this.login_id==row.up_admin_id)&&row.status==0){
- // return true
- // }else{
- // return false
- // }
- // }
- },{
label:"任务名称",
- prop:'mission',
- align:'left',
- formatter:(cell,data,value,index)=>{
- return value?value.name:'日常巡查'
- }
+ prop:'missionName',
// width:180
},{
label:"状态",
@@ -395,6 +395,18 @@
}],
}
},
+ computed: {
+ // 获取所有单元格合并数据
+ spanArr() {
+ for(var k in this.list){
+ if (!this.list.length) return []
+ const mergeCols = ['missionName'] // 需要合并的列(字段)
+ // const data = groupBy(this.list, 'monthIndex')
+ // console.log("data",data)
+ return getMergeCells(this.list, this.table, mergeCols)
+ }
+ }
+ },
created(){
// this.getUserId()
@@ -468,9 +480,19 @@
// }
},
+ spanMethod({
+ row,
+ colomn,
+ rowIndex,
+ columnIndex
+ }) {
+ return this.spanArr[rowIndex][columnIndex]
+ },
async getList(){
const res = await listpatrol({...this.select})
for(var k of res.data){
+ k.missionName = k.mission?k.mission.name:'日常巡查'
+ console.log("k.missionName",k.missionName)
k.is_myself = false
if(k.status==2||k.status==3||k.status==4||k.status==7){
if(k.accept_admin_ids&&k.accept_admin_ids.length>0){
@@ -703,6 +725,9 @@