提交

src/views/business/dayworkUpdate/turnoverForm.vue

@@ -104,19 +104,49 @@
           </el-col>
           <el-col :span="9" v-if="form.outsourceDetailId != '0'">
             <el-form-item label="周转区：" label-width="94px" prop="deptId">
+              <template #label>
+                <el-popover placement="top-start" effect="dark" trigger="hover" content="车间内周转显示工段内周转区，车间外周转显示车间周转区">
+                  <template #reference>
+                    <el-icon style="display: inline-block;line-height: 36px; height: 36px;">
+                      <QuestionFilled />
+                    </el-icon>
+                  </template>
+                </el-popover>
+                <div>周转区</div>
+              </template>
               <div>{{ form.place }}</div>
             </el-form-item>
           </el-col>
           <el-col :span="9" v-else-if="form.turnoverType == '1'">
             <el-form-item label="周转区：" label-width="90px" prop="placeId" required>
+              <template #label>
+                <el-popover placement="top-start" effect="dark" trigger="hover" content="车间内周转显示工段内周转区，车间外周转显示车间周转区">
+                  <template #reference>
+                    <el-icon style="display: inline-block;line-height: 36px;height: 36px;">
+                      <QuestionFilled />
+                    </el-icon>
+                  </template>
+                </el-popover>
+                <div>周转区</div>
+              </template>
               <el-select v-model="placeIds" :disabled="!editStatus || !isLatest" collapse-tags multiple
                 placeholder="请选择周转区" style="width: 220px;" @change="turnoverChangeHandler">
                 <el-option v-for="dict in turnoverList" :key="dict.id" :label="dict.code" :value="dict.id" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="9" v-else-if="form.isWx == 0">
+          <el-col :span="9" v-else-if="form.isWx == 0 && form.isQuick == 0">
             <el-form-item label="周转区：" label-width="90px" prop="turnoverId" required>
+              <template #label>
+                <el-popover placement="top-start" effect="dark" trigger="hover" content="车间内周转显示工段内周转区，车间外周转显示车间周转区">
+                  <template #reference>
+                    <el-icon style="display: inline-block;line-height: 36px; height: 36px;">
+                      <QuestionFilled />
+                    </el-icon>
+                  </template>
+                </el-popover>
+                <div>周转区</div>
+              </template>
               <el-select v-model="form.turnoverId" :disabled="!editStatus || !isLatest" placeholder="请选择周转区"
                 style="width: 220px;" @change="workshopTurnoverChangeHandler">
                 <el-option v-for="dict in workShopTurnoverList" :key="dict.id" :label="dict.code" :value="dict.id" />
@@ -288,6 +318,7 @@ const setTurnoverList = () => {
     // console.log(fromWorkshop)
     workShopTurnoverList.value = fromWorkshop == null ? [{ id: form.value.turnoverId, code: form.value.turnoverArea }] : fromWorkshop.turnovers
     deptList.value = allDepts.filter(t => t.workshopId != form.value.workshopId).map(e => ({ ...e }))
+
   } else if (form.value.turnoverType == '3') {
     // console.log('turnoverType 3')
     form.value.deptId = '114'
@@ -385,6 +416,7 @@ const open = (row) => {
     }
     form.value.qualifiedNum = row.qualifiedNum;
     form.value.isWx = row.isWx
+    form.value.isQuick = row.isQuick
     //合格数最大能修改数值
     maxQuailifiedNum.value = row.maxQuailifiedNum;
     form.value.workHoursTimestamp = 0;