1.2

src/renderer/components/productInfo/allFilter.jade

@@ -39,12 +39,18 @@
           span.isUrgent(v-if='item.isUrgent') 紧急
           span.not(v-else) -
         span.title(v-text='item.title')
-        .state
-          span.type(v-if='item.type == 1') Bug
-          span.type.newNeed(v-else-if='item.type == 2') 需求
-        span.tag {{item.to.name}}
         span.tag(v-if='item.tag') {{item.tag}}
-        span.tag(v-if='item.version') V{{item.version}}
+        //- .state
+        //-   span.type(v-if='item.type == 1') Bug
+        //-   span.type.newNeed(v-else-if='item.type == 2') 需求
+        span.tag {{item.finisherId ? item.finisherId.name : item.to.name}}
+        span.tag(v-if='item.level == 1') 待办
+        span.tag(v-if='item.level == 2') 待审核
+        span.tag(v-if='item.level == 5') 归档
+        //- .tag
+        //-   span.type(v-if='item.type == 1') Bug
+        //-   span.type.newNeed(v-else-if='item.type == 2') 需求
+        //- span.tag(v-if='item.version') V{{item.version}}
     .loadMore(@click='getAllData' v-if='allData && allData.length > 0 && nextPageNo > 0') 加载更多
     NoData(v-if='allData && allData.length == 0 && nextPageNo==0')
     TodoEdit.todoEdit-wrapper(:curPost='curPost', :page='$route.name', :class='{"isEdit": isEdit}')

src/renderer/components/productInfo/allFilter.sass

@@ -14,7 +14,7 @@
     line-height: 44px
     border-bottom: $border
     cursor: pointer
-    opacity: 0.5
+    opacity: 0.6
     font-weight: $fw-lg
     &:hover, &.selected
       // background: $bg-color

src/renderer/components/productInfo/allFilter.vue

@@ -111,9 +111,10 @@ export default {
       this.getAllData()
     },
     handleReset () {
-      this.reset()
-      this.resetForm()
-      this.getAllData()
+      // this.reset()
+      // this.resetForm()
+      // this.getAllData()
+      window.location.reload()
     },
     handleEdit (item) {
       this.busEventRouteName()

src/renderer/components/productInfo/allPost.sass

@@ -10,7 +10,7 @@
     line-height: 44px
     border-bottom: $border
     cursor: pointer
-    opacity: 0.5
+    opacity: 0.6
     font-weight: $fw-lg
     &:hover, &.selected
       // background: $bg-color

src/renderer/components/productInfo/allpost.jade

@@ -12,12 +12,11 @@
         span.isUrgent(v-if='item.isUrgent') 紧急
         span.not(v-else) -
       span.title(v-text='item.title')
-      .state
-        span.type(v-if='item.type == 1') Bug
-        span.type.newNeed(v-else-if='item.type == 2') 需求
-      span.tag {{item.to.name}}
       span.tag(v-if='item.tag') {{item.tag}}
-      span.tag(v-if='item.version') V{{item.version}}
+      span.tag {{item.finisherId ? item.finisherId.name : item.to.name}}
+      span.tag(v-if='item.level == 1') 待办
+      span.tag(v-if='item.level == 2') 待审核
+      span.tag(v-if='item.level == 5') 归档
   .loadMore(@click='getAllData' v-if='allData && allData.length > 0 && nextPageNo > 0') 加载更多
   NoData(v-if='allData && allData.length == 0 && nextPageNo==0')
   TodoEdit.todoEdit-wrapper(:curPost='curPost', :page='$route.name', :class='{"isEdit": isEdit}')

src/renderer/components/productInfo/create.vue

@@ -18,7 +18,7 @@ export default {
         productId: this.$route.params.id,
         title: '',
         content: '',
-        type: 2,
+        type: 1,
         isImportant: 'false',
         isUrgent: 'false',
         createrId: '',
@@ -51,9 +51,8 @@ export default {
       }
       this.editor.create()
       this.editor.txt.html(`
-        <p>1、平台</p>
-        <p>2、版本</p>
-        <p>3、问题</p>
+        <p>1、问题</p>
+        <p>2、预期</p>
         `)
     })
 

src/renderer/components/productInfo/index.jade

@@ -24,9 +24,9 @@
       .border-dive
       div.con
         p.con-title 全部
-        //- router-link(:to='{name: "ProductStatistics"}' exact)
-        //-   i.iconfont.icon-tongji
-        //-   span 概览
+        router-link(:to='{name: "ProductStatistics"}' exact)
+          i.iconfont.icon-tongji
+          span 概览
         router-link(:to='{name: "ProductAllFilter"}' exact)
           i.iconfont.icon-filter
           span 全部任务

src/renderer/components/productInfo/todoEdit.jade

@@ -69,11 +69,12 @@
           span.time {{item.createdAt}}
           span.from {{item.from.name || $api.placeholder.noname}}
           span.action(v-if='item.action == 1') 指派给
-          span.action(v-if='item.action == 2') 完成，并指派给
+          span.action(v-if='item.action == 2') 完成，等待
           span.action(v-if='item.action == 3') 拒绝
           span.action(v-if='item.action == 4') 评论
           span.action(v-if='item.action == 5') 归档该任务
           span.to(v-if='item.action != 5') {{item.to.name || $api.placeholder.noname}}
+          span.action(v-if='item.action == 2') 审核归档
           .content(v-if='item.action != 5') {{item.content}}
         p.anotation 最多显示50条日志
     .comment-info

src/renderer/components/productInfo/todoEdit.sass

@@ -3,7 +3,7 @@
 .todoEdit-contain
   position: fixed
   top: 0
-  z-index: 99
+  z-index: 100
   padding-top: 50px
   padding-bottom: 50px
   background: white
@@ -83,7 +83,7 @@
           line-height: 100px
         .item-wrapper
           position: relative
-          margin-bottom: 15px
+          margin-bottom: 30px
           line-height: 20px
           overflow: hidden
           span.from
@@ -99,6 +99,10 @@
             right: 0
             top: 0
             color: $gray-sub
+          .content
+            margin-top: 5px
+            // color: $gray
+            font-weight: $fw-lg
     .comment-info
       position: absolute
       bottom: 0

src/renderer/components/productInfo/todoL.sass

@@ -11,7 +11,7 @@
     line-height: 44px
     border-bottom: $border
     cursor: pointer
-    opacity: 0.5
+    opacity: 0.6
     font-weight: $fw-lg
     &:hover, &.selected
       // background: $bg-color

src/renderer/components/productInfo/todoMItem.sass

@@ -30,7 +30,7 @@
     line-height: 44px
     border-bottom: $border
     cursor: pointer
-    opacity: 0.5
+    opacity: 0.6
     font-weight: $fw-lg
     &:hover, &.selected
       // background: $bg-color