feat: 添加质检流程 #1009863

src/views/order/factoryOrderNew/index.vue

@@ -794,7 +794,6 @@
             打印操作单
             打印操作单
           </ElButton>
           </ElButton>
         </span>
         </span>
-        <<<<<<< HEAD
         <span
         <span
           v-if="status === 'PENDING_QUALITY' && qualitySubTab === 'NO_QUALITY'"
           v-if="status === 'PENDING_QUALITY' && qualitySubTab === 'NO_QUALITY'"
           class="item"
           class="item"
@@ -811,7 +810,6 @@
             重新生产
             重新生产
           </ElButton>
           </ElButton>
         </span>
         </span>
-        ======= >>>>>>> e9da2e7 (feat: 添加质检流程 #1009863)
       </div>
       </div>
       <div v-if="status === 'SUSPEND'" class="status-subtabs">
       <div v-if="status === 'SUSPEND'" class="status-subtabs">
         <div
         <div