Ver código fonte

班次bug修复提交

LAPTOP-16IUEB3P\Lenovo 2 anos atrás
pai
commit
0897d453ce

+ 1 - 1
src/views/workforceManagement/classes/components/timeTable.vue

@@ -88,7 +88,7 @@
       <template v-slot:action="{ row }">
       <template v-slot:action="{ row }">
         <el-popconfirm
         <el-popconfirm
           class="ele-action"
           class="ele-action"
-          title="确定要删除此角色吗?"
+          title="确定要删除此工作时间段吗?"
           @confirm="remove(row)"
           @confirm="remove(row)"
         >
         >
           <template v-slot:reference>
           <template v-slot:reference>

+ 19 - 18
src/views/workforceManagement/schedule/detail.vue

@@ -88,21 +88,7 @@ export default {
       rules: {},
       rules: {},
       type: '', // add/edit
       type: '', // add/edit
       loading: false,
       loading: false,
-      colorList: [
-        '#fb6f7b',
-        '#f59a23',
-        '#4672ca',
-        '#2196f3',
-        '#00bcd4',
-        '#009688',
-
-        '#fb6f7b',
-        '#f59a23',
-        '#4672ca',
-        '#2196f3',
-        '#00bcd4',
-        '#009688'
-      ],
+      colorList: [],
       showClassesList: [],
       showClassesList: [],
       classesList: [],
       classesList: [],
       defaultbtn: [
       defaultbtn: [
@@ -381,6 +367,18 @@ export default {
             )})`
             )})`
           };
           };
         });
         });
+        const len = Math.round(this.classesList.length/5)
+        const color = [
+            '#fb6f7b',
+            '#f59a23',
+            '#4672ca',
+            '#2196f3',
+            '#00bcd4',
+            '#009688',
+        ]
+        for(var i = 0;i<len;i++){
+            this.colorList = this.colorList.concat(color)
+        }
         this.showClassesList = this.classesList;
         this.showClassesList = this.classesList;
       });
       });
     },
     },
@@ -454,13 +452,11 @@ export default {
 .top-search-group {
 .top-search-group {
   max-width: 400px;
   max-width: 400px;
   display: flex;
   display: flex;
-
   :deep(.el-input input) {
   :deep(.el-input input) {
     border-top-right-radius: 0;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-width: 0;
     border-right-width: 0;
   }
   }
-
   .el-button {
   .el-button {
     border-top-left-radius: 0;
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-bottom-left-radius: 0;
@@ -468,21 +464,26 @@ export default {
 }
 }
 .bc-warp {
 .bc-warp {
   display: flex;
   display: flex;
+  flex-wrap:wrap;
   .item {
   .item {
     height: 34px;
     height: 34px;
     padding: 0 10px;
     padding: 0 10px;
     color: #fff;
     color: #fff;
     border-radius: 4px;
     border-radius: 4px;
     cursor: pointer;
     cursor: pointer;
+    margin-right: 10px;
+    margin-bottom:10px;
   }
   }
   .item + .item {
   .item + .item {
-    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom:10px;
   }
   }
   .tag {
   .tag {
     color: #fff;
     color: #fff;
     height: 34px;
     height: 34px;
     border: none;
     border: none;
     line-height: 34px;
     line-height: 34px;
+    margin:0 10px 10px 0;
     :deep(.el-tag__close) {
     :deep(.el-tag__close) {
       color: #fff;
       color: #fff;
     }
     }