任务管理模块样式修改

src/components/DeptUserTree/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dut">
-    <el-input v-model="userNames" size="mini" disabled>
+    <el-input v-model="userNames" size="mini" placeholder="执行（负责）人" disabled>
       <el-button @click="openUserDialog" icon="el-icon-search" slot="append"></el-button>
     </el-input>
 

src/views/task/components/taskAudit.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <task-detail :detail-form="detailForm"></task-detail>
-
     <el-form ref="form" :model="form" :rules="auditRules" size="mini" label-width="100px">
       <el-row>
         <el-col :span="12">

src/views/task/projectView.vue

@@ -1,15 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
-      <el-form-item label="所属项目" prop="projectId">
+      <el-form-item prop="projectId">
         <el-cascader
           :options="projectTree"
           @change="selectProjectChange"
           :props="{ expandTrigger: 'hover',value:'id',label:'name', checkStrictly: true }"
           collapse-tags
+          placeholder="选择分类/项目"
           :show-all-levels="false" clearable></el-cascader>
       </el-form-item>
-      <el-form-item label="负责人" prop="executors">
+      <el-form-item prop="executors">
         <dept-user-tree ref="dut" :userList="userList" :multiple="true"
                         @selected="selectExecutors"></dept-user-tree>
       </el-form-item>
@@ -21,7 +22,7 @@
           @change="getList"
           placeholder="开始日期"
           :clearable="false"
-          style="width: 130px">
+          style="width: 135px">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="至" prop="endDate">
@@ -32,7 +33,7 @@
           @change="getList"
           placeholder="结束日期"
           :clearable="false"
-          style="width: 130px">
+          style="width: 135px">
         </el-date-picker>
       </el-form-item>
       <el-form-item prop="status">

src/views/task/task.vue

@@ -7,7 +7,7 @@
       <el-col :span="19">
         <div class="query-container">
           <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
-            <el-form-item label="执行（负责）人" prop="executors">
+            <el-form-item prop="executors">
               <dept-user-tree ref="dut" :userList="userList" :multiple="true"
                               @selected="(val)=>queryParams.executors=val"></dept-user-tree>
             </el-form-item>
@@ -18,7 +18,7 @@
                 value-format="yyyy-MM-dd"
                 placeholder="开始日期"
                 clearable
-                style="width: 128px">
+                style="width: 135px">
               </el-date-picker>
             </el-form-item>
             <el-form-item prop="endDate">
@@ -28,7 +28,7 @@
                 value-format="yyyy-MM-dd"
                 placeholder="结束日期"
                 clearable
-                style="width: 128px">
+                style="width: 135px">
               </el-date-picker>
             </el-form-item>
             <el-form-item prop="status">
@@ -497,11 +497,10 @@ export default {
     },
 
     sortChange({column, prop, order}) {
-      if (!order) {
-        return
-      }
       this.queryParams.sortField = prop
-      this.queryParams.order = order.replace('ending', '')
+      if (order) {
+        this.queryParams.order = order.replace('ending', '')
+      }
       this.getList()
     },
 

src/views/task/view.vue

@@ -1,71 +1,56 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
-      <el-row type="flex" justify="space-between">
-        <!--        <el-col :span="22">-->
-        <el-form-item label="日期" prop="startDate">
-          <el-date-picker
-            v-model="queryParams.startDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            @change="getList"
-            placeholder="开始日期"
-            :clearable="false"
-            style="width: 130px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至" prop="endDate">
-          <el-date-picker
-            v-model="queryParams.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            @change="getList"
-            placeholder="结束日期"
-            :clearable="false"
-            style="width: 130px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item prop="status">
-          <el-radio-group v-model="queryParams.status" size="mini" @change="getList">
-            <el-radio-button
-              v-for="dict in dict.type.task_status"
-              :key="dict.value"
-              :label="dict.value"
-            >{{ dict.label }}
-            </el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item prop="priority">
-          <el-select
-            v-model="queryParams.priority"
-            @change="getList"
-            clearable
-            placeholder="优先级"
-            style="width: 85px">
-            <el-option
-              v-for="dict in dict.type.task_priority"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value">
-              <el-tag :color="priorityColorMap[dict.value]" effect="dark" :hit="false">
-                {{ dict.label }}
-              </el-tag>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!--        </el-col>-->
-        <!--        <el-col :span="2">-->
-        <!--          <el-button-->
-        <!--            type="primary"-->
-        <!--            plain-->
-        <!--            icon="el-icon-plus"-->
-        <!--            size="mini"-->
-        <!--            @click="handleAdd"-->
-        <!--          >日常任务-->
-        <!--          </el-button>-->
-        <!--        </el-col>-->
-      </el-row>
-
+      <el-form-item label="日期" prop="startDate">
+        <el-date-picker
+          v-model="queryParams.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          @change="getList"
+          placeholder="开始日期"
+          :clearable="false"
+          style="width: 135px">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="至" prop="endDate">
+        <el-date-picker
+          v-model="queryParams.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          @change="getList"
+          placeholder="结束日期"
+          :clearable="false"
+          style="width: 135px">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item prop="status">
+        <el-radio-group v-model="queryParams.status" size="mini" @change="getList">
+          <el-radio-button
+            v-for="dict in dict.type.task_status"
+            :key="dict.value"
+            :label="dict.value"
+          >{{ dict.label }}
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="priority">
+        <el-select
+          v-model="queryParams.priority"
+          @change="getList"
+          clearable
+          placeholder="优先级"
+          style="width: 85px">
+          <el-option
+            v-for="dict in dict.type.task_priority"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value">
+            <el-tag :color="priorityColorMap[dict.value]" effect="dark" :hit="false">
+              {{ dict.label }}
+            </el-tag>
+          </el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
 
     <el-table