Merge remote-tracking branch 'origin/develop' into develop

src/views/task/component/task.vue

@@ -37,10 +37,41 @@
           </div>
         </div>
 
-        <div class="mt-10 flex flex-center flex-justify-start">
+        <div class="mt-10 flex lex-align-start flex-justify-start">
           <span class="mr-10 title flex flex-justify-start">执行者:</span>
           <div><tasker /></div>
         </div>
+        <div class="mt-10 flex flex-align-start flex-justify-start">
+          <span class="mr-10 title flex flex-justify-start">备注:</span>
+          <el-input type="textarea" :rows="5"></el-input>
+        </div>
+
+        <div class="mt-10 flex flex-align-start flex-justify-start flex-col">
+          <div class="flex flex-center flex-justify-start">
+            <span class="mr-10 title flex flex-justify-start">关联附件:</span>
+            <filepicker project-id="" />
+          </div>
+          <div class="flex flex-center flex-justify-start full-width mt-10">
+            <div class="title mr-10"></div>
+            <el-input type="textarea" :rows="5"></el-input>
+          </div>
+        </div>
+
+        <div class="flex flex-justify-start full-width flex-col">
+          <div class="mt-10 flex flex-align-start flex-justify-start">
+            <span class="mr-10 title flex flex-justify-start">任务进展:</span>
+            <el-input type="textarea" :rows="5"></el-input>
+          </div>
+          <div class="flex flex-justify-start flex-center mt-10 full-width">
+            <div class="title mr-10" />
+            <el-icon><Paperclip /></el-icon>
+            <div>附件</div>
+          </div>
+        </div>
+      </div>
+      <div class="flex flex-justify-end full-width">
+        <el-button type="primary" plain>取 消</el-button>
+        <el-button type="primary">确 定</el-button>
       </div>
     </div>
   </el-dialog>
@@ -49,9 +80,10 @@
 <script>
 import WtTag from '@/views/task/component/wt-tag.vue'
 import Tasker from '@/views/task/component/tasker.vue'
+import filepicker from '@/components/filepicker/index.vue'
 
 export default {
-  components: { Tasker, WtTag },
+  components: { Tasker, WtTag, filepicker },
   props: {
     task: {
       type: Object,

src/views/task/component/tasker.vue

@@ -1,11 +1,23 @@
 <template>
-  <div>
-    <div>33</div>
+  <div class="flex flex-align-center flex-justify-start flex-wrap">
+    <div class="flex flex-center" v-for="i in 20">
+      <el-avatar
+        src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"
+      ></el-avatar>
+      <div class="ml-5">张三</div>
+    </div>
   </div>
 </template>
 
 <script>
-export default {}
+export default {
+  props: {
+    data: {
+      type: Array,
+      default: []
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped></style>