需求更改

src/views/pro-operation/report-work/index.vue

@@ -105,7 +105,7 @@
         style="display: flex; margin-bottom: 10px"
         v-if="processStore.scanInfo.outTime == true"
       >
-        <div style="width: 120px">超期原因：</div>
+        <div style="margin-top:3px;font-size:18px;">超期原因: &nbsp;</div>
 
         <el-select
           v-model="outTimeReason"
@@ -156,7 +156,7 @@ const router = useRouter();
 
 const drawerVisible = ref(false);
 const formDisabled = ref(true);
-const outTimeReason = ref("");
+const outTimeReason = ref(dictStroe.dicts.out_time_reason[0].dictValue);
 const formRef = ref<InstanceType<typeof ElForm>>();
 
 const persons = ref<

src/views/process/components/steps.vue

@@ -9,11 +9,10 @@
       >
         <div
           :class="
-            item.exists == true
-              ? selectStepIndex == index
-                ? 'stepBox stepBoxHover'
-                : 'stepBox'
-              : 'stepBox stepExistsHover'
+            item.exists == true ? selectStepIndex == index ? 'stepBox stepBoxHover' :
+            (item.opComplete == true ? 'stepBox stepCompleteHover' : item.bugExists == true ? 'stepBox stepBugHover' : 'stepBox') : (item.opComplete == true ?
+            'stepBox stepExistsCompleteHover' :
+            item.bugExists == true ? 'stepBox stepExistsBugHover' : 'stepBox stepExistsHover')
           "
         >
           <div style="display: flex; align-items: center">
@@ -215,6 +214,30 @@ onBeforeUnmount(() => {
   animation-duration: $animation-duration;
 }
 
+.stepCompleteHover {
+  box-shadow: 0px 0px 0px 0px;
+  background-color: #62bb49;
+  animation-name: bodyHover;
+  animation-duration: $animation-duration;
+}
+.stepExistsCompleteHover {
+  box-shadow: 0px 0px 0px 0px;
+  background-color: #587c4e;
+  animation-name: bodyHover;
+  animation-duration: $animation-duration;
+}
+.stepBugHover {
+  box-shadow: 0px 0px 0px 0px;
+  background-color: #f56e6e;
+  animation-name: bodyHover;
+  animation-duration: $animation-duration;
+}
+.stepExistsBugHover {
+  box-shadow: 0px 0px 0px 0px;
+  background-color: #7e2121;
+  animation-name: bodyHover;
+  animation-duration: $animation-duration;
+}
 .stepExistsHover {
   background-color: grey;
   animation-name: stepHover;

src/views/traceability/components/materials.vue

@@ -12,7 +12,7 @@
             <el-table-column prop="itemName" label="物料名称" />
             <el-table-column prop="itemModel" label="物料规格" />
             <el-table-column prop="itemCode" label="物料编号" />
-            <el-table-column prop="itemSeq" label="采集编码" />
+            <el-table-column prop="batchNo" label="采集批次" />
             <el-table-column prop="needNum" label="需求数量" />
             <el-table-column prop="realNum" label="已采集数量" />
           </el-table>