任务调整，消息页面调整

src/HManagement/task/modules/add.vue

@@ -78,7 +78,7 @@
               <p slot="prepend">协助人</p>
             </el-input>
           </el-popover>
-					
+
 					<!-- &emsp;
 					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
 						<p slot="prepend">协 办</p>
@@ -118,7 +118,11 @@ export default {
         "ownertable":"",
         "ownerid":0,
         "endtime":"",
-				"leaderuserid":""
+				"leaderuserid":"",
+        "team":{
+          "justuserids":true,
+          "userids":[],
+        }
 			},
 			// 查询可选择人员参数
 			param:{
@@ -130,7 +134,7 @@ export default {
           "where":{
             "condition":"",
             "withoutselect":0,
-            
+
           }
         }
       },
@@ -173,6 +177,7 @@ export default {
       this.assistShow = false
     },
 		async submit () {
+      this.form.team.userids = this.assist
 			const res = await this.$api.requested({
         "id": 20221211112101,
         "content":this.form
@@ -189,7 +194,7 @@ export default {
 				this.dialogTableVisible = false
 				this.refresh()
 				this.errormsg = ''
-        this.insertAssist(res.data.sys_taskid)
+       /* this.insertAssist(res.data.sys_taskid)*/
       })
 		},
 		refresh () {
@@ -235,4 +240,4 @@ export default {
 .task__label{
 	color:rgb(173, 172, 172);
 }
-</style>
+</style>

src/HManagement/task/modules/edit.vue

@@ -78,7 +78,7 @@
               <p slot="prepend">协助人</p>
             </el-input>
           </el-popover>
-					
+
 					<!-- &emsp;
 					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
 						<p slot="prepend">协 办</p>
@@ -118,7 +118,11 @@ export default {
         "ownertable":"",
         "ownerid":0,
         "endtime":"",
-				"leaderuserid":""
+				"leaderuserid":"",
+        "team":{
+          "justuserids":true,
+          "userids":[],
+        }
 			},
 			// 查询可选择人员参数
 			param:{
@@ -130,7 +134,7 @@ export default {
           "where":{
             "condition":"",
             "withoutselect":0,
-            
+
           }
         }
       },
@@ -195,6 +199,7 @@ export default {
       this.assistShow = false
     },
 		async submit () {
+      this.form.team.userids = this.assist
 			const res = await this.$api.requested({
         "id": 20221211112101,
         "content":this.form
@@ -204,7 +209,8 @@ export default {
 				this.dialogTableVisible = false
 				this.refresh()
 				this.errormsg = ''
-        this.insertAssist(res.data.sys_taskid)
+        this.$emit('onSuccess')
+       /* this.insertAssist(res.data.sys_taskid)*/
       })
 		},
 		refresh () {
@@ -279,4 +285,4 @@ export default {
 .task__label{
 	color:rgb(173, 172, 172);
 }
-</style>
+</style>

src/components/normal-basic-layout/details/modules/task/addTask.vue

@@ -118,7 +118,11 @@ export default {
         "ownerid":this.$route.query.id,
         "endtime":"",
 				"leaderuserid":"",
-        "systemappid":JSON.parse(sessionStorage.getItem('activeApp')).systemappid
+        "systemappid":JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
+        "team":{
+          "justuserids":true,
+          "userids":[],
+        }
 			},
 			// 查询团队人员参数
 			params:{
@@ -218,6 +222,7 @@ export default {
     },
 		async submit () {
 			this.form.ownertable = this.ownertable
+      this.form.team.userids = this.assist
 			const res = await this.$api.requested({
         "id": 20221211112101,
         "content":this.form
@@ -234,7 +239,7 @@ export default {
 				this.dialogTableVisible = false
 				this.refresh()
 				this.errormsg = ''
-        this.insertAssist(res.data.sys_taskid)
+     /*   this.insertAssist(res.data.sys_taskid)*/
       })
 		},
 		refresh () {

src/components/normal-basic-layout/details/modules/task/index.vue

@@ -14,6 +14,7 @@
       <div class="task_list__panel" v-for="item in list" :key="item.sys_taskid">
         <div class="flex-align-center flex-between">
           <p class="task_title" @click="taskDetail(item)"><b>{{item.title}}</b></p>
+          <small>{{item.status}}</small>
           <small>{{item.starttime.split(' ')[0]}}</small>
         </div>
       </div>

src/components/pagination/Pagination1.vue

@@ -59,6 +59,7 @@ export default {
 
 <style scoped>
   .el-pagination {
-    margin-bottom: 6px;
+    margin-bottom: 5px;
+    margin-top: 5px;
   }
 </style>

src/views/message/components/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="list" v-if="list.length >= 1" >
-    <div class="item-box" v-for="(item,index) in list" :key="index" @click="detailClick(item)">
+  <div class="list" v-if="list.length >= 1" ref="listScroll">
+    <div class="item-box" v-for="(item,index) in list" :key="index" @click="detailClick(item)" >
       <div class="item">
         <div class="left">
           <p class="title">{{item.title}}</p>

src/views/message/index.vue

@@ -4,11 +4,15 @@
       <el-col :span="12">
         <div class="left">
           <div class="select">
-            <div class="select_left">
-              <div @click="selectFun('应用')"
-                   :style="currentItem==1 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">应用消息</div>
+            <div >
+              <el-button-group>
+                <el-button size="small" :type="currentItem==1?'primary':''" @click="selectFun('应用')">应用消息</el-button>
+                <el-button size="small" :type="currentItem==0?'primary':''" @click="selectFun('系统')">系统消息</el-button>
+              </el-button-group>
+<!--              <div @click="selectFun('应用')"
+                   :style="currentItem==1 ? 'background:#3874F6;color:#ffffff;vertical-align: middle;line-height: 30px;height: 30px' : 'border:1px solid #cccccc;vertical-align: middle;line-height: 30px;height: 30px'">应用消息</div>
               <div @click="selectFun('系统')"
-                   :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>
+                   :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>-->
             </div>
             <div class="select_right">
               <el-button @click="allRead" size="small">全部阅读</el-button>
@@ -16,7 +20,7 @@
           </div>
           <el-row style="margin-top: 10px">
             <el-col :span="14" >
-              <div style="margin-left: 16px">
+              <div style="margin-left: 14px">
                 总计：{{total}}
               </div>
             </el-col>
@@ -35,7 +39,7 @@
             </el-col>
           </el-row>
 
-          <list class="list" :list="list" @messageItemClick="messageItemClick"></list>
+          <list class="list" :list="list" @messageItemClick="messageItemClick" ref="list"></list>
 
           <pagination  :total="total" :pageSize="param.content.pageSize"  :currentPage="param.content.pageNumber"
                        @pageChange="pageChange">
@@ -127,6 +131,7 @@ export default {
       this.getMessageList()
     },
     pageChange (n) {
+      this.$refs.list.$refs.listScroll.scrollTop = 0
       this.param.content.pageNumber = n
       this.getMessageList()
     },
@@ -314,8 +319,9 @@ export default {
   width: 100%;
   margin: 0 auto;
   position: relative;
-  min-height: calc(100vh - 199px);
-  max-height: calc(100vh - 199px);
+  /*min-height: calc(100vh - 199px);
+  max-height: calc(100vh - 199px);*/
+  height: calc(100vh - 120px);
 
 }
 .message .left {
@@ -323,12 +329,13 @@ export default {
   padding: 20px 0 60px 0;
   box-shadow: 1px 0px 0px 1px #DDDDDD;
   background: #ffffff;
-  min-height: calc(100vh - 199px);
-  max-height: calc(100vh - 199px);
+  height: calc(100vh - 120px);
+  /*min-height: calc(100vh - 199px);
+  max-height: calc(100vh - 199px);*/
 }
 .message .list {
-  min-height: calc(100vh - 325px);
-  max-height: calc(100vh - 325px);
+  max-height: calc(100vh - 260px);
+  min-height: calc(100vh - 260px);
   overflow: auto;
 }
 .message .select {