Browse Source

样式修改

ysc 2 năm trước cách đây
mục cha
commit
48316e5be6

+ 26 - 14
src/views/task/components/taskDetail.vue

@@ -7,23 +7,35 @@
       <el-form-item label="父任务:" v-if="form.parentTaskId">
         <div class="p-task" @click="getParentTask(form.parentTaskId)">{{ form.parentTaskName }}</div>
       </el-form-item>
-      <el-form-item label="所属项目:">
-        <div>{{ form.projectName }}</div>
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col span="12">
+          <el-form-item label="所属项目:">
+            <div>{{ form.projectName }}</div>
+          </el-form-item>
+        </el-col>
+        <el-col span="12">
+          <el-form-item label="起止时间:">
+            <div>{{ form.beginDate + ' 至 ' + form.endDate }}</div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col span="12">
+          <el-form-item label="主要负责人:">
+            <div>{{ form.executorName }}</div>
+          </el-form-item>
+        </el-col>
+        <el-col span="12">
+          <el-form-item label="共同执行人:">
+            <template v-for="item in form.coExecutorNames">
+              <el-tag size="mini" style="margin-right: 5px">{{ item }}</el-tag>
+            </template>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="任务描述:">
         <div v-html="form.description"></div>
       </el-form-item>
-      <el-form-item label="起止时间:">
-        <div>{{ form.beginDate + ' 至 ' + form.endDate }}</div>
-      </el-form-item>
-      <el-form-item label="主要负责人:">
-        <div>{{ form.executorName }}</div>
-      </el-form-item>
-      <el-form-item label="共同执行人:">
-        <template v-for="item in form.coExecutorNames">
-          <el-tag size="mini" style="margin-right: 5px">{{ item }}</el-tag>
-        </template>
-      </el-form-item>
       <el-form-item label="附件:">
         <div v-for="(file,index) in form.fileList">
           <a :href="file.url" style="color: darkgreen">

+ 1 - 1
src/views/task/projectView.vue

@@ -141,7 +141,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="任务详情" :visible.sync="openDetail" width="680px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="任务详情" :visible.sync="openDetail" width="680px" class="feed-dialog" append-to-body>
       <task-detail :detailForm="detailForm"></task-detail>
     </el-dialog>
 

+ 7 - 3
src/views/task/task.vue

@@ -95,7 +95,7 @@
                          type="text"
                          icon="el-icon-edit"
                          @click="handleAudit(scope.row)"
-                         :disabled="scope.row.progressValue!=100||(scope.row.status!='2'&&scope.row.status!='3')"
+                         :disabled="scope.row.progressValue!=100||(scope.row.status!='2'&&scope.row.status!='3')||scope.row.createBy!=userId"
                          v-hasPermi="['task:task:audit']"
               >审核
               </el-button>
@@ -181,7 +181,7 @@
     </el-dialog>
 
     <!-- 详情/审核任务对话框 -->
-    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="680px" append-to-body
+    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="680px" class="add-dialog" append-to-body
                :close-on-click-modal="false">
       <task-detail :detail-form="detailForm"></task-detail>
       <div v-if="detailTitle=='审核任务'" style="margin-top: 10px">
@@ -204,7 +204,7 @@
     </el-dialog>
 
     <!-- 分解任务对话框 -->
-    <el-dialog title="分解任务" :visible.sync="splitOpen" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="分解任务" :visible.sync="splitOpen" width="500px" class="add-dialog" append-to-body>
       <el-form ref="splitForm" class="split-form" size="mini">
         <el-form-item label="任务名称:">
           <div>{{ splitForm.taskName }}</div>
@@ -287,6 +287,7 @@ import Project from "@/views/task/components/project";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import RichTextEditor from '@/components/RichTextEditor'
+import {mapGetters} from "vuex";
 
 const statusMap = {
   '0': {name: '待查看', type: 'info'},
@@ -300,6 +301,9 @@ export default {
   name: "Task",
   components: {Project, TaskDetail, DeptUserTree, FileUpload, Treeselect, RichTextEditor},
   dicts: ['task_status'],
+  computed: {
+    ...mapGetters(['userId'])
+  },
   data() {
     return {
       projectOptions: [],

+ 1 - 1
src/views/task/view.vue

@@ -181,7 +181,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="任务详情" :visible.sync="openDetail" width="680px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="任务详情" :visible.sync="openDetail" width="680px" class="feed-dialog" append-to-body>
       <task-detail :detailForm="detailForm"></task-detail>
     </el-dialog>