添加工期

applications/dee-mes/src/views/assemblyPlanManagement/inspectionDispatch/index.vue

@@ -188,7 +188,8 @@ export default {
         { title: '机型', key: 'extProcessPlan.planeType', align: 'left' },
         { title: '架次', key: 'extProcessPlan.sorties', align: 'left' },
         { title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' },
-        { title: '工时定额', key: 'extProcessPlan.workHour', align: 'left' },
+        { title: '工时定额', key: 'extProcessPlan.opHour', align: 'left' },
+        { title: '工时', key: 'extProcessPlan.workHour', align: 'left' },
         { title: '计划员', key: 'planner.name', align: 'left' },
         { title: '工艺员', key: 'extProcessPlan.noteName', align: 'left' },
         { title: '计划开始', key: 'scheduledStart', align: 'left' },

applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue

@@ -244,7 +244,8 @@ export default {
         { title: '机型', key: 'extProcessPlan.planeType', align: 'left' },
         { title: '架次', key: 'extProcessPlan.sorties', align: 'left' },
         { title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' },
-        { title: '工时定额', key: 'extProcessPlan.workHour', align: 'left' },
+        { title: '工时定额', key: 'extProcessPlan.opHour', align: 'left' },
+        { title: '工时', key: 'extProcessPlan.workHour', align: 'left' },
         { title: '计划员', key: 'planner.name', align: 'left' },
         { title: '工艺员', key: 'extProcessPlan.noteName', align: 'left' },
         { title: '计划开始', key: 'scheduledStart', align: 'left' },

applications/dee-mes/src/views/taskExecution/index.vue

@@ -14,12 +14,12 @@
               }}</span></el-col>
               <el-col
                 :md="12"
-                :lg="6"
+                :lg="3"
                 :sm="12"
               ><label class="label">机型：</label>{{ headerData.resName }}</el-col>
               <el-col
                 :md="12"
-                :lg="6"
+                :lg="3"
                 :sm="12"
               ><label class="label">架次：</label>{{ headerData.serialNo }}</el-col>
               <el-col
@@ -28,6 +28,11 @@
                 :sm="12"
                 class="fai"
               ><label class="label">首检标识：</label><span v-if="headerData.firstCheckFlag">FAI</span></el-col>
+              <el-col
+                :md="12"
+                :lg="6"
+                :sm="12"
+              ><label class="label">工艺员：</label>{{ headerData.noteName }}</el-col>
             </el-row>
             <el-row>
               <el-col
@@ -52,6 +57,11 @@
               ><label v-show="false" class="label">{{
                 headerData.isQualified ? "不合格品" : ""
               }}</label></el-col>
+              <!-- <el-col
+                :md="12"
+                :lg="6"
+                :sm="12"
+              ><label class="label">检验员：</label>{{ headerData.scheduledEnd }}</el-col> -->
             </el-row>
           </el-col>
           <el-col :lg="3" :md="6" :sm="6" :xs="12">
@@ -731,7 +741,8 @@ export default {
               aoId: data.extProcessPlan.id,
               workDescription: data.extProcessPlan.workDescription,
               versionChangeDesc: data.workDescription,
-              prepareDescription: data.extProcessPlan.prepareDescription
+              prepareDescription: data.extProcessPlan.prepareDescription,
+              noteName: data.extProcessPlan.noteName
               // 不合格
             }
             that.getWorkingProcedure()