页面显示修改

src/views/dashboard/index.vue

@@ -4,7 +4,7 @@
       <el-col :span="6">
         <el-card class="card">
           <div style="color: white;">
-            <h2>我的待办事项：{{ todoTaskList }}</h2>
+            <h2>我的待办事项：{{ todoNum }}</h2>
           </div>
         </el-card>
       </el-col>
@@ -37,47 +37,49 @@
         <el-table
           :data="tableData"
           style="width: 100%" border stripe size="small">
-          <el-table-column type="index" label="序号" width="80" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="任务名称" align="center"
-            width="180">
-          </el-table-column>
-          <el-table-column
-            prop="hname"
-            label="实施医院" align="center"
-            width="180">
-          </el-table-column>
-          <el-table-column
-            prop="hsytem"
-            label="实施系统" align="center"
-            width="160">
-          </el-table-column>
-          <el-table-column
-            prop="content"
-            label="实施内容" align="center"
-            min-width="250">
-          </el-table-column>
-          <el-table-column
-            prop="taskName"
-            label="当前处理步骤" align="center"
-            width="180">
-          </el-table-column>
-          <el-table-column
-            prop="flowType"
-            label="流程类型" align="center"
-            width="180">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="createTime"
-                           label="创建时间" width="200">
-          </el-table-column>
-          <el-table-column prop="op" width="200" label="操作" align="center">
-            <template scope="scope">
-              <el-button size="mini" type="success" @click="searchWorkFlow(scope.row)">查阅流程</el-button>
-              <el-button size="mini" type="primary" @click="auditFlow(scope.row)">处理</el-button>
-            </template>
+          <el-table-column label="实施待办">
+            <el-table-column type="index" label="序号" width="80" align="center">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="任务名称" align="center"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="hname"
+              label="实施医院" align="center"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="hsytem"
+              label="实施系统" align="center"
+              width="160">
+            </el-table-column>
+            <el-table-column
+              prop="content"
+              label="实施内容" align="center"
+              min-width="250">
+            </el-table-column>
+            <el-table-column
+              prop="taskName"
+              label="当前处理步骤" align="center"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="flowType"
+              label="流程类型" align="center"
+              width="180">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="createTime"
+                             label="创建时间" width="200">
+            </el-table-column>
+            <el-table-column prop="op" width="200" label="操作" align="center">
+              <template scope="scope">
+                <el-button size="mini" type="success" @click="searchWorkFlow(scope.row)">查阅流程</el-button>
+                <el-button size="mini" type="primary" @click="auditFlow(scope.row)">处理</el-button>
+              </template>
+            </el-table-column>
           </el-table-column>
         </el-table>
 
@@ -88,54 +90,57 @@
           stripe
           size="mini"
           style="width: 100%">
-          <el-table-column type="index" label="序号" width="60">
-          </el-table-column>
-          <el-table-column label="会议主题" prop="meetingName">
-          </el-table-column>
-          <el-table-column label="会议类型" prop="meetingType" width="120">
-            <template scope="scope">
-              <!--会议类型（1-周例会，2-项目会议，3-实施会议，4-其他会议）-->
-              <div v-if="scope.row.meetingType===1">周例会</div>
-              <div v-else-if="scope.row.meetingType===2">项目会议</div>
-              <div v-else-if="scope.row.meetingType===3">实施会议</div>
-              <div v-else>其他会议</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="会议地点" prop="meetingPlace" width="120">
-          </el-table-column>
-          <el-table-column prop="status" label="会议状态" width="120">
-            <template scope="scope">
-              <!--会议状态，0待开始，1进行中，2已结束-->
-              <div v-if="scope.row.status===0" style="color: green">待开始</div>
-              <div v-else-if="scope.row.status===1" style="color: #3A71A8">进行中</div>
-              <div v-else>已结束</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="name" label="会议时间" width="300">
-            <template scope="scope">
-              <div>{{ scope.row.beginTime }}——{{ scope.row.endTime }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="address" label="参会人员">
-            <template scope="scope">
-              <span>{{ scope.row.outAttendees }}</span>
-              <span v-if="scope.row.outAttendees!=''">、</span>
-              <span v-for="(item,index) in JSON.parse(scope.row.innerAttendees) ">
+          <el-table-column label="待办会议">
+            <el-table-column type="index" label="序号" width="60">
+            </el-table-column>
+            <el-table-column label="会议主题" prop="meetingName">
+            </el-table-column>
+            <el-table-column label="会议类型" prop="meetingType" width="120">
+              <template scope="scope">
+                <!--会议类型（1-周例会，2-项目会议，3-实施会议，4-其他会议）-->
+                <div v-if="scope.row.meetingType===1">周例会</div>
+                <div v-else-if="scope.row.meetingType===2">项目会议</div>
+                <div v-else-if="scope.row.meetingType===3">实施会议</div>
+                <div v-else>其他会议</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="会议地点" prop="meetingPlace" width="120">
+            </el-table-column>
+            <el-table-column prop="status" label="会议状态" width="120">
+              <template scope="scope">
+                <!--会议状态，0待开始，1进行中，2已结束-->
+                <div v-if="scope.row.status===0" style="color: green">待开始</div>
+                <div v-else-if="scope.row.status===1" style="color: #3A71A8">进行中</div>
+                <div v-else>已结束</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="会议时间" width="300">
+              <template scope="scope">
+                <div>{{ scope.row.beginTime }}——{{ scope.row.endTime }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="address" label="参会人员">
+              <template scope="scope">
+                <span>{{ scope.row.outAttendees }}</span>
+                <span v-if="scope.row.outAttendees!=''">、</span>
+                <span v-for="(item,index) in JSON.parse(scope.row.innerAttendees) ">
              <template v-if="index > 0">,</template>
              <span>{{ item.name }}</span>
            </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" width="150">
+              </template>
+            </el-table-column>
+            <el-table-column prop="createTime" label="创建时间" width="150">
 
+            </el-table-column>
+            <el-table-column label="操作" prop="op" width="150">
+              <template slot-scope="scope">
+                <el-button v-if="scope.row.status===2" type="primary" size="mini" @click="confirmMeeting(scope.row)">
+                  结果确认
+                </el-button>
+              </template>
+            </el-table-column>
           </el-table-column>
-          <el-table-column label="操作" prop="op" width="150">
-            <template slot-scope="scope">
-              <el-button v-if="scope.row.status===2" type="primary" size="mini" @click="confirmMeeting(scope.row)">
-                结果确认
-              </el-button>
-            </template>
-          </el-table-column>
+
         </el-table>
 
       </el-col>
@@ -283,7 +288,10 @@ export default {
   computed: {
     ...mapGetters([
       'name'
-    ])
+    ]),
+    todoNum() {
+      return this.tableData.length + this.todoMeetings.length
+    }
   },
   data() {
     return {
@@ -300,7 +308,6 @@ export default {
       formData: {},
       workFlowVisble: false,
       activeFlow: 0,
-      todoTaskList: 0,
       editEnforceFormVisible: false,
       enforceForm: {
         id: null,
@@ -346,7 +353,6 @@ export default {
     getTaskList() {
       getPersonalTaskList().then(res => {
         this.tableData = res.data
-        this.todoTaskList = this.tableData.length
       })
     },
     getTodoMeetingList() {

src/views/task/components/taskDetail.vue

@@ -30,7 +30,7 @@
       </el-form-item>
     </el-form>
     <el-table :data="detailForm.feedbacks" size="mini" border>
-      <el-table-column width="70" label="反馈状态">
+      <el-table-column width="75" label="反馈状态">
         <template slot-scope="scope">
           <div>{{ getFeedbackTypeName(scope.row.feedbackType) }}</div>
         </template>

src/views/task/view.vue

@@ -70,8 +70,8 @@
             placement="top"
             width="680"
             trigger="click">
-            <el-table :data="feedbacks" border style="font-size: 12px">
-              <el-table-column width="70" label="反馈状态">
+            <el-table :data="feedbacks" border size="mini">
+              <el-table-column width="75" label="反馈状态">
                 <template slot-scope="scope">
                   <div>{{ getFeedbackTypeName(scope.row.feedbackType) }}</div>
                 </template>
@@ -155,9 +155,9 @@ const statusMap = {
   '0': {name: '待查看', type: 'info'},
   '1': {name: '未开始', type: 'info'},
   '2': {name: '进行中', type: ''},
-  '3': {name: '延期', type: 'warning'},
+  '3': {name: '延期', type: 'danger'},
   '4': {name: '完成', type: 'success'},
-  '5': {name: '终止', type: 'danger'}
+  '5': {name: '终止', type: 'warning'}
 }
 
 export default {