feat: 添加质检流程 #1009863

components.d.ts

@@ -12,10 +12,6 @@ declare module 'vue' {
     DatePicker: typeof import('./src/components/Form/DatePicker.vue')['default']
     DatePicker: typeof import('./src/components/Form/DatePicker.vue')['default']
     DateRangePicker: typeof import('./src/components/Form/DateRangePicker.vue')['default']
     DateRangePicker: typeof import('./src/components/Form/DateRangePicker.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
-    ElCascaderPanel: typeof import('element-plus/es')['ElCascaderPanel']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
@@ -31,9 +27,10 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
@@ -42,6 +39,8 @@ declare module 'vue' {
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTree: typeof import('element-plus/es')['ElTree']

src/views/order/factoryOrderNew/index.vue

@@ -794,6 +794,7 @@
             打印操作单
             打印操作单
           </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"
@@ -810,6 +811,7 @@
             重新生产
             重新生产
           </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