Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -8,9 +8,11 @@
             <el-form-item :label="'类型'" prop="taskPlanType">
                 <el-select v-model="addForm.taskPlanType" :placeholder="$t('defaultText.pleaseChoose')" style="width:100%;" :disabled="doYouWantToDisableAll" @change="onTypeChange($event)">
                     <el-option v-for="item in typeList" :label="item.name" :value="item.id" :key="item.id">
-                        <!--左边是文字，右边是色块(有color的话)-->
-                        <span style="float: left; ">{{ item.name }}</span>
-                        <span v-if="item.color" :style="'display:block;float: right;width:40px;text-align: align-items:center;center;line-height:30px;height:30px;background-color:'+item.color"></span>
+                        <div style="display: flex;justify-content: space-between;align-items: center;">
+                            <!--左边是文字，右边是色块(有color的话)-->
+                            <div style="float: left; ">{{ item.name }}</div>
+                            <div v-if="item.color" :style="'width:80px;height:20px;background-color:'+item.color"></div>
+                        </div>
                     </el-option>
                 </el-select>
             </el-form-item>

fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/list.vue

@@ -1015,7 +1015,7 @@
             </div>
         </el-dialog>
         <!-- 计划分类配置 -->
-        <el-dialog title="计划类型管理" show-header="false" v-if="planClassificationPopUpWindow" :visible.sync="planClassificationPopUpWindow" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog title="计划类型管理" show-header="false" v-if="planClassificationPopUpWindow" :visible.sync="planClassificationPopUpWindow" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-table :data="planTypeList" highlight-current-row  height="400" style="width: 100%;" v-loading="planTypeListLoading">
             <el-table-column type="index" width="60" :label="$t('headerTop.serialNumber')">
                 <template slot-scope="scope" >
@@ -1023,6 +1023,11 @@
                     </template>
             </el-table-column>
             <el-table-column prop="name" :label="$t('names')" ></el-table-column>
+            <el-table-column label="颜色" width="80">
+                <template slot-scope="scope" >
+                    <div class="planTypeColor" :style="`background: ${scope.row.color}`"></div>
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('operation')" :width="user.companyId == '862' ? '300px' : '180px'">
                 <template slot-scope="scope" >
                      <el-button size="small" type="primary"  @click="auditProcess(scope.row)" v-if="user.companyId == '862'" >{{ $t('AuditProcess') }}</el-button>
@@ -6601,4 +6606,9 @@ a {
 .gongcheng .el-table .cell{
     overflow: inherit !important;
 }
+
+.planTypeColor {
+    width: 60px;
+    height: 20px;
+}
 </style>