工单修改。

src/styles/index.scss

@@ -58,6 +58,9 @@
   line-height: 40px;
   text-align: left;
   margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
 .elColClasss {

src/views/process/components/steps.vue

@@ -8,15 +8,13 @@
         @click="boxClick(item, index)"
       >
         <div
-          :class="
-            item.exists == true
-              ? selectStepIndex == index
-                ? 'stepBox stepBoxHover'
-                : item?.canDo === 0
-                  ? 'stepBox'
-                  : 'stepBox1'
-              : 'stepBox stepExistsHover'
-          "
+          class="stepBox"
+          :class="[
+            item?.canDo ? 'stepBox1' : '',
+            item.exists == true ? '' : 'stepExistsHover',
+            item.isEnd ? 'taskFinishedColor' : '',
+            selectStepIndex == index ? 'stepBoxHover' : '',
+          ]"
         >
           <div style="display: flex; align-items: center">
             <div
@@ -52,7 +50,7 @@
                     : 'stepStation'
                 "
               >
-                {{ item.operationCode }}
+                <!--                {{ item.stationName }}-->
               </div>
             </div>
           </div>
@@ -64,11 +62,11 @@
             {{ item.completeNum }}
           </div>
         </div>
-        <Transition>
-          <div v-if="item.exists != true" class="existsText">
-            注：该工位计划上未分配此任务！
-          </div>
-        </Transition>
+        <!--        <Transition>-->
+        <!--          <div v-if="item.exists != true" class="existsText">-->
+        <!--            注：该工位计划上未分配此任务！-->
+        <!--          </div>-->
+        <!--        </Transition>-->
         <div class="line" v-if="index != opsArray.length - 1"></div>
       </div>
     </TransitionGroup>
@@ -227,13 +225,7 @@ onBeforeUnmount(() => {
   box-shadow: 0px 1px 1px 1px #00000025;
 }
 .stepBox1 {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 88px;
-  border-radius: 44px;
   background-color: $select-activehover;
-  box-shadow: 0px 1px 1px 1px #00000025;
 }
 
 .stepBoxHover {
@@ -255,6 +247,10 @@ onBeforeUnmount(() => {
   cursor: not-allowed;
 }
 
+.taskFinishedColor {
+  background-color: #2b712b;
+}
+
 .stepIndexHover {
   border-color: white !important;
 
@@ -319,4 +315,6 @@ onBeforeUnmount(() => {
   width: 1px;
   margin-left: 44px;
 }
+
+//设置
 </style>

src/views/process/components/transferNum.vue

@@ -30,11 +30,12 @@
             >
               <span
                 :ref="(el) => refArray.push(el)"
-                :class="
-                  index == selectSeqIndex
-                    ? 'describeText active'
-                    : item.canDo == 0 ? 'describeText' : 'describeText active1'
-                "
+                :class="[
+                  'describeText',
+                  index == selectSeqIndex ? 'active' : '',
+                  item.canDo == 1 ? 'active1' : '',
+                  item.state == 2 ? 'taskFinishedColor' : '',
+                ]"
                 @dblclick="fz(index)"
                 >{{ item.seqNo }}</span
               >
@@ -42,7 +43,13 @@
             <div
               style="display: flex; flex-direction: column; align-items: end"
             >
-              <div :class="item.state == '0' || item.state == '2' ? 'status success' : 'status'">
+              <div
+                :class="[
+                  'status',
+                  item.state == '1' ? 'active1' : '',
+                  item.state == '2' ? 'taskFinishedColor' : '',
+                ]"
+              >
                 {{
                   dictS.getLableByValue(
                     "station_task_state",
@@ -50,7 +57,7 @@
                   )
                 }}
               </div>
-<!--              <el-button
+              <!--              <el-button
                 class="btn"
                 style="margin-bottom: 5px"
                 color="#0A59F7"
@@ -191,4 +198,8 @@ onMounted(() => {
 .scrollbar {
   height: calc(100vh - 210px);
 }
+
+.taskFinishedColor {
+  color: #2b712b;
+}
 </style>

src/views/process/orders.vue

@@ -1,12 +1,32 @@
 <template>
   <div>
-    <div class="commonTitle">{{ activeName == "ok" ? "已完成工单" : "待完成工单" }}[{{ ordersSum }}]</div>
+    <!--    <div class="commonTitle">-->
+    <!--      {{ activeName == "ok" ? "已完成工单" : "待完成工单" }}[{{ ordersSum }}]-->
+    <!--    </div>-->
+    <div class="commonTitle">
+      工单[{{ ordersSum }}]<el-icon
+        :size="40"
+        style="margin-left: 20px"
+        @click="resetOrdersDataArray"
+        ><Refresh
+      /></el-icon>
+    </div>
 
-    <el-tabs v-model="activeName" class="demo-tabs" type="card" @tab-click="handleClick">
+    <el-tabs
+      v-model="activeName"
+      class="demo-tabs"
+      type="card"
+      @tab-click="handleClick"
+    >
       <el-tab-pane label="未完成" name="false" />
       <el-tab-pane label="已完成" name="ok" />
     </el-tabs>
-    <el-scrollbar class="barHeight" ref="wrapRef" @scroll="handleScroll" v-loading="map.get('getProcessOrders')">
+    <el-scrollbar
+      class="barHeight"
+      ref="wrapRef"
+      @scroll="handleScroll"
+      v-loading="map.get('getProcessOrders')"
+    >
       <!-- <el-scrollbar class="barHeight" ref="wrapRef" @scroll="handleScroll"> -->
 
       <Order
@@ -17,7 +37,12 @@
         :item="item"
       />
 
-      <div class="describeText notice" v-if="ordersQuery.pageNo == ordersQuery.totalPages">已经到底啦~</div>
+      <div
+        class="describeText notice"
+        v-if="ordersQuery.pageNo == ordersQuery.totalPages"
+      >
+        已经到底啦~
+      </div>
     </el-scrollbar>
     <Empty v-if="ordersDataArray.length < 1" />
   </div>
@@ -39,10 +64,11 @@ const map = commonS.loadingMap;
 const emit = defineEmits(["getindex"]);
 const ordersDataArray = inject("ordersDataArray");
 const selectSeqArray = inject("selectSeqArray");
+const opsArray = inject("opsArray");
 //获取未完成订单的参数
 const ordersQuery = ref({
   pageNo: 1,
-  pageSize: 5,
+  pageSize: 10,
   queryComplete: 0,
   totalPages: 1,
 });
@@ -58,7 +84,9 @@ const getOrdersData = async () => {
 };
 
 const getOps = async (item, index) => {
-  const { code, data } = await getOrderDetails({ workOrderCode: item.workOrderCode });
+  const { code, data } = await getOrderDetails({
+    workOrderCode: item.workOrderCode,
+  });
   if (code == "200") {
     ordersDataArray.value[index].ops = data;
   }
@@ -80,6 +108,9 @@ const resetOrdersDataArray = async () => {
   store.processInfo.operationCode = "";
   store.processInfo.operationName = "";
   store.useSeqNo = "";
+  selectedOderStatus.value = false;
+  opsArray.value = [];
+  selectIndex.value = null;
   selectSeqArray.value = [];
   selectSeqIndex.value = null;
   getOrdersData();
@@ -96,10 +127,14 @@ const setSlectIndex = async (index: number, item) => {
   }
   await getOps(item, index);
   selectIndex.value = index;
-  store.odersData.productLineId = ordersDataArray.value[selectIndex.value].productLineId;
-  store.odersData.workOrderCode = ordersDataArray.value[selectIndex.value].workOrderCode;
-  store.processInfo.materialName = ordersDataArray.value[selectIndex.value].materialName;
-  store.processInfo.materialModel = ordersDataArray.value[selectIndex.value].materialModel;
+  store.odersData.productLineId =
+    ordersDataArray.value[selectIndex.value].productLineId;
+  store.odersData.workOrderCode =
+    ordersDataArray.value[selectIndex.value].workOrderCode;
+  store.processInfo.materialName =
+    ordersDataArray.value[selectIndex.value].materialName;
+  store.processInfo.materialModel =
+    ordersDataArray.value[selectIndex.value].materialModel;
   store.odersData.operationId = "";
   store.processInfo.operationCode = "";
   store.processInfo.operationName = "";
@@ -118,7 +153,10 @@ const handleClick = async (tab: TabsPaneContext, event: Event) => {
 //滚动事件
 const handleScroll = (obj: obj) => {
   //当发生滚动触底时
-  if (wrapRef.value.wrapRef.scrollHeight == Math.ceil(obj.scrollTop) + wrapRef.value.wrapRef.clientHeight) {
+  if (
+    wrapRef.value.wrapRef.scrollHeight ==
+    Math.ceil(obj.scrollTop) + wrapRef.value.wrapRef.clientHeight
+  ) {
     if (ordersQuery.value.pageNo < ordersQuery.value.totalPages) {
       ordersQuery.value.pageNo = ordersQuery.value.pageNo + 1;
       getOrdersData();