Bladeren bron

feature(督办): 前端调整

likai 2 jaren geleden
bovenliggende
commit
fb6bef6278
2 gewijzigde bestanden met toevoegingen van 46 en 30 verwijderingen
  1. 3 3
      src/views/plat/task/components/TaskAdd.vue
  2. 43 27
      src/views/plat/task/index.vue

+ 3 - 3
src/views/plat/task/components/TaskAdd.vue

@@ -1,8 +1,8 @@
 <!-- eslint-disable vue/no-mutating-props -->
 <template>
-  <el-dialog title="添加" :visible.sync="selfVisible" width="650px" @close="close" @open="open">
-    <el-form ref="form" label-width="80px" :model="form" :rules="rules">
-      <el-row>
+  <el-dialog append-to-body title="添加" :visible.sync="selfVisible" @close="close" @open="open">
+    <el-form ref="form" :model="form" :rules="rules">
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="标题" prop="taskTitle">
             <el-input v-model="form.taskTitle" placeholder="请输入标题" />

+ 43 - 27
src/views/plat/task/index.vue

@@ -9,11 +9,11 @@
         </div>
         <div style="margin-top: 20px; cursor: pointer" @click="search('2')">
           <i class="el-icon-video-play" style="margin-right: 10px"></i>
-          我发起的({{ statisticsForm.createNumber }})
+          我发起的
         </div>
         <div style="margin-top: 20px; cursor: pointer" @click="search('3')">
           <i class="el-icon-folder-checked" style="margin-right: 10px"></i>
-          我处理的({{ statisticsForm.completedNumber }})
+          我处理的
         </div>
         <div class="type" style="margin-top: 50px">督办类型</div>
         <div style="margin-top: 20px; cursor: pointer" @click="searchType('')">全部</div>
@@ -26,7 +26,27 @@
         </div>
       </el-col>
       <el-col :span="18">
-        <el-row :gutter="10" style="margin-bottom: 10px">
+        <vab-query-form>
+          <vab-query-form-top-panel>
+            <el-form :inline="true" :model="queryForm" @submit.native.prevent>
+              <el-form-item>
+                <el-input v-model.trim="queryForm.taskTitle" clearable placeholder="请输入督办标题" />
+              </el-form-item>
+              <el-form-item>
+                <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+                <el-button icon="el-icon-refresh-right" @click="reset">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </vab-query-form-top-panel>
+          <vab-query-form-left-panel :span="12">
+            <el-button icon="el-icon-plus" type="primary" @click="handleAdd">添加</el-button>
+          </vab-query-form-left-panel>
+          <vab-query-form-right-panel :span="12">
+            <el-button icon="el-icon-download" @click="exportData" />
+            <table-tool :check-list.sync="checkList" :columns="columns" />
+          </vab-query-form-right-panel>
+        </vab-query-form>
+        <!-- <el-row :gutter="10" style="margin-bottom: 10px">
           <el-col :span="4">
             <el-input v-model.trim="queryForm.taskTitle" clearable placeholder="请输入督办标题" />
           </el-col>
@@ -43,7 +63,7 @@
             <el-button icon="el-icon-download" @click="exportData" />
             <table-tool :check-list.sync="checkList" :columns="columns" />
           </vab-query-form-right-panel>
-        </vab-query-form>
+        </vab-query-form> -->
         <!-- 主页面 -->
         <el-table v-loading="listLoading" border :data="list" height="calc(100vh - 340px)">
           <el-table-column
@@ -56,11 +76,16 @@
             :sortable="item.sortable"
             :width="item.width">
             <template #default="{ row }">
+              <el-button v-if="item.prop === 'taskTitle'" class="link-button" type="text" @click="showDetail(row)">
+                {{ row.taskTitle }}
+              </el-button>
               <span v-if="item.prop === 'taskType'">
                 {{ typeMap[row.taskType] }}
               </span>
               <span v-else-if="item.prop === 'taskStatus'">
-                {{ row.taskStatus === '10' ? '进行中' : '关闭' }}
+                <span v-if="row.taskStatus === '10'">发起</span>
+                <span v-if="row.taskStatus === '20'">进行中</span>
+                <span v-if="row.taskStatus === '30'">流程完成</span>
               </span>
               <span v-else-if="item.prop === 'isOverdue'">
                 {{ row.isOverdue === '10' ? '否' : '是' }}
@@ -75,11 +100,11 @@
               <span v-else>{{ row[item.prop] }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" width="85">
+          <!-- <el-table-column align="center" label="操作" width="85">
             <template #default="{ row }">
               <el-button type="text" @click="showDetail(row)">查看</el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <template #empty>
             <el-image class="vab-data-empty" :src="require('@/assets/empty_images/data_empty.png')" />
           </template>
@@ -141,9 +166,7 @@
           pageSize: 10,
           taskTitle: undefined,
           taskType: undefined,
-          taskStatus: undefined,
-          mySelf: undefined,
-          isMain: undefined,
+          operateType: undefined,
         },
         // 用户信息
         userMap: {},
@@ -233,6 +256,7 @@
       },
     },
     async created() {
+      this.queryForm.operateType = '1'
       this.statistics()
       await this.initData()
       this.fetchData()
@@ -277,27 +301,11 @@
         this.queryForm.pageSize = 10
         this.queryForm.taskTitle = undefined
         this.queryForm.taskType = undefined
-        this.queryForm.taskStatus = undefined
-        this.queryForm.mySelf = undefined
-        this.queryForm.isMain = undefined
         this.queryData()
       },
       // 左侧操作栏搜索
       search(type) {
-        this.queryForm.taskStatus = undefined
-        this.queryForm.mySelf = undefined
-        this.queryForm.isMain = undefined
-        if (type == '1') {
-          this.queryForm.taskStatus = '10'
-          this.queryForm.isMain = '1'
-        }
-        if (type == '2') {
-          this.queryForm.mySelf = '1'
-        }
-        if (type == '3') {
-          this.queryForm.taskStatus = '20'
-          this.queryForm.isMain = '1'
-        }
+        this.queryForm.operateType = type
         this.queryData()
       },
       // 督办类型搜索
@@ -383,4 +391,12 @@
   .type {
     font-weight: bold;
   }
+  $base: '.list';
+  .link-button {
+    font-size: 14px;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 </style>