排班日历

src/views/mes/cal/calendar/calendarType.vue

@@ -26,12 +26,15 @@
                           </el-row>
                           <el-row v-for="calendarDay in calendarDayList " :key="calendarDay.theDay">
                                 <el-col :span="24" v-if="calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1">
-                                      <div v-for="(teamShift,index) in calendarDay.calPlanWorkunitList" :key="index" class="grid-content">
-                                          <el-button type="primary" v-if="teamShift.shiftName === '白班'" icon="el-icon-sunny">{{ teamShift.workunitName }}</el-button>
+                                    <div v-for="(teamShift,index) in calendarDay.calPlanWorkunitList" :key="index" class="grid-content" >
+                                          <el-tooltip content="Bottom center" placement="bottom" effect="light" v-if="teamShift.shiftName === '白班'">
+                                                <el-button type="primary" v-if="teamShift.shiftName === '白班'" icon="el-icon-sunny">{{ teamShift.workunitName }}</el-button>
+                                          </el-tooltip>
+                                         
                                           <el-button type="success" v-else-if="teamShift.shiftName === '中班'" icon="el-icon-sunrise">{{ teamShift.workunitName }}</el-button>
                                           <el-button type="warning" v-else-if="teamShift.shiftName === '夜班'" icon="el-icon-moon">{{ teamShift.workunitName }}</el-button>
-                                      </div>
-                                </el-col>
+                                    </div>
+                              </el-col>
                           </el-row>
                     </div>
                     </template>

src/views/mes/qc/qcindex/index.vue

@@ -157,8 +157,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检验要求" prop="indexName">
-              <el-input v-model="form.indexName" placeholder="请输入检验要求" />
+            <el-form-item label="检验名称" prop="qcTool">
+              <el-input v-model="form.qcTool" placeholder="请输入检验名称" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -185,11 +185,12 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="检验名称" prop="qcTool">
-              <el-input v-model="form.qcTool" placeholder="请输入检验名称" />
+          <el-col :span="24">
+            <el-form-item label="检验要求" prop="indexName">
+              <el-input v-model="form.indexName" placeholder="请输入检验要求" />
             </el-form-item>
           </el-col>
+          
         </el-row>
         <el-row>
           <el-col :span="24">