wangziqian пре 5 година
родитељ
комит
05a10a9fbe

+ 26 - 1
src/views/projectManage/iteration/components/requiredTable.vue

@@ -103,7 +103,16 @@
       <el-table-column label="需求名称" min-width="250" show-overflow-tooltip>
         <template v-slot="scope">
           <div class="table-project-name" @click="clickRequiredName(scope.row.id)">
-            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;"></span>
+            <span class="id">
+              {{ scope.row.requirementDisplayId }}
+              <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;">
+              <div
+                v-if="scope.row.optionsObject && scope.row.optionsObject.tagsType !==-1 && scope.row.optionsObject.remindTags && scope.row.status !== -2"
+                :class="'tag-tip'+scope.row.optionsObject.tagsType"
+              >{{ scope.row.optionsObject.remindTags }}
+              </div>
+              <div v-if="scope.row.status === -2" class="tag-tip1">hold</div>
+            </span>
             <span class="public_Jump">{{ scope.row.name }}</span>
           </div>
         </template>
@@ -353,6 +362,22 @@ export default {
   border:1px solid #DCDFE6;
   cursor: pointer;
 }
+.tag-tip0,.tag-tip1 {
+  margin-left: 5px;
+  display: inline-block;
+  padding: 0 5px;
+  border-radius: 8px;
+  height: 16px;
+  line-height: 16px;
+}
+.tag-tip0 {
+  background: rgba(255,137,82,0.15);
+  color: rgba(255,137,82,1);
+}
+.tag-tip1{
+  background: rgba(245,108,108,0.17);
+  color: rgba(245,108,108,1);
+}
 /deep/ .el-table__expand-icon{
   font-size: 14px;
   .el-icon{

+ 27 - 2
src/views/projectManage/projectList/components/needsList.vue

@@ -18,10 +18,19 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="需求名称" fixed width="250" align="left" show-overflow-tooltip>
+      <el-table-column label="需求名称" fixed min-width="300" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="table-project-name" @click="needs_link(scope.row.id)">
-            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;"></span>
+            <span class="id">
+              {{ scope.row.requirementDisplayId }}
+              <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;">
+              <div
+                v-if="scope.row.optionsObject && scope.row.optionsObject.tagsType !==-1 && scope.row.optionsObject.remindTags && scope.row.status !== -2"
+                :class="'tag-tip'+scope.row.optionsObject.tagsType"
+              >{{ scope.row.optionsObject.remindTags }}
+              </div>
+              <div v-if="scope.row.status === -2" class="tag-tip1">hold</div>
+            </span>
             <span class="name">{{ scope.row.name }}</span>
           </div>
         </template>
@@ -188,6 +197,22 @@ export default {
 .status150 {
   @include setStatus(#7ED321)
 }
+.tag-tip0,.tag-tip1 {
+  margin-left: 5px;
+  display: inline-block;
+  padding: 0 5px;
+  border-radius: 8px;
+  height: 16px;
+  line-height: 16px;
+}
+.tag-tip0 {
+  background: rgba(255,137,82,0.15);
+  color: rgba(255,137,82,1);
+}
+.tag-tip1{
+  background: rgba(245,108,108,0.17);
+  color: rgba(245,108,108,1);
+}
 .div_priority {
   text-align: center;
   color: #ffffff;

+ 27 - 2
src/views/workbench/team/components/needsList.vue

@@ -24,10 +24,19 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="需求名称" fixed min-width="250" align="left" show-overflow-tooltip>
+      <el-table-column label="需求名称" fixed min-width="300" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="table-project-name" @click="needs_link(scope.row.id)">
-            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;"></span>
+            <span class="id">
+              {{ scope.row.requirementDisplayId }}
+              <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;">
+              <div
+                v-if="scope.row.optionsObject && scope.row.optionsObject.tagsType !==-1 && scope.row.optionsObject.remindTags && scope.row.status !== -2"
+                :class="'tag-tip'+scope.row.optionsObject.tagsType"
+              >{{ scope.row.optionsObject.remindTags }}
+              </div>
+              <div v-if="scope.row.status === -2" class="tag-tip1">hold</div>
+            </span>
             <span class="name">{{ scope.row.name }}</span>
           </div>
         </template>
@@ -268,6 +277,22 @@ export default {
 .status150 {
   @include setStatus(#7ED321)
 }
+.tag-tip0,.tag-tip1 {
+  margin-left: 5px;
+  display: inline-block;
+  padding: 0 5px;
+  border-radius: 8px;
+  height: 16px;
+  line-height: 16px;
+}
+.tag-tip0 {
+  background: rgba(255,137,82,0.15);
+  color: rgba(255,137,82,1);
+}
+.tag-tip1{
+  background: rgba(245,108,108,0.17);
+  color: rgba(245,108,108,1);
+}
 .search-control {
 	padding: 30px 17px 0;
 	color: #333B4A;