工人执行界面增加转序标识

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

@@ -126,6 +126,9 @@
                   操作说明
                 </div>
               </div>
+              <div v-show="item.isExceptionOptIden" class="exceptionOptIdenBox">
+                转序
+              </div>
             </div>
           </div>
           <div v-else class="not-content">暂无数据</div>
@@ -874,6 +877,9 @@ export default {
                 'name': 'jrExecuteOpPlans'
               }
             ]
+          },
+          {
+            'name': 'exceptionOperationVOS'
           }
         ],
         'sortItem': [
@@ -929,7 +935,8 @@ export default {
                     p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans && p.joExecuteOpPlan[0].jrExecuteOpPlans.length &&
                     p.joExecuteOpPlan[0].jrExecuteOpPlans[0].dmirTime
                 },
-                fileList: p.objFileLinks ? p.objFileLinks : []
+                fileList: p.objFileLinks ? p.objFileLinks : [],
+                isExceptionOptIden: !!(p.exceptionOperationVOS && p.exceptionOperationVOS.find(r => r.state === 'Finish'))
               }
             })
             var status = that.workingProcedure.every(
@@ -1599,6 +1606,7 @@ export default {
       height: 20px;
       flex-grow: 1;
       .step-sel-item {
+        position: relative;
         // width: 200px;
         height: 100px;
         background: #fff;
@@ -1915,6 +1923,17 @@ export default {
         //   border-bottom: 5px solid #fff;
         //   border-left: 5px solid #fff;
         // }
+        .exceptionOptIdenBox{
+            position: absolute;
+            top: 2px;
+            right: 2px;
+            color:red;
+            display: inline-block;
+            line-height: 20px;
+            font-size: 12px;
+            border: 1px solid red;
+            border-radius: 5%;
+          }
       }
       .do-ing-step {
         .step-sel-item-content {

applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue

@@ -55,8 +55,9 @@
                   </div>
                 </div>
                 <div>
-                  <div v-show="item.firstCheckFlag === '是'">
-                    <span>首件检验</span>
+                  <div>
+                    <span v-show="item.firstCheckFlag === '是'">首件检验</span>
+                    <span v-show="item.exceptionOptIden">转序</span>
                   </div>
                   <div v-show="item.isQualified">
                     <span>不合格品</span>
@@ -379,7 +380,9 @@ export default {
                 isExit: p.isExit,
                 isOK: p.planVer === p.extProcessPlan.gaceVersion,
                 // // 例外放行
-                isException: p.isException
+                isException: p.isException,
+                // 转序
+                exceptionOptIden: p.exceptionOptIden
               }
             })
             this.visible = false