feat: 添加质检流程 #1009863

058f49bf · wusiyi · 986db23a · 058f49bf
Commit 058f49bf authored Jul 29, 2026 by wusiyi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

src/views/order/factoryOrderNew/index.vue
+0 -2

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