工厂端修改

src/api/order.ts

@@ -58,9 +58,14 @@ export function printOrder(ids: number[]) {
 }
 
 // 导出生产单
-export function exportOrder() {
+export function exportOrder(status?:string | number) {
   return axios.get<never, BaseRespData<never>>(
     'factory/customJomallOrder/exportData',
+    {
+      params:{
+        status
+      }
+    }
   )
 }
 

src/types/api/order.ts

@@ -3,10 +3,10 @@ import type { TableColumnCtx } from 'element-plus'
 export interface SearchForm {
   mainSku: string
   endProductId: string
+  OrderNumber: string
   shopNumber: string
   internalMemo: string
   status?: number
-  erpOrderNumber: string
   subOrderNumber: string
 }
 export interface Tab {

src/views/order/index.vue

@@ -3,34 +3,47 @@
     <div class="header-filter">
       <div class="header-filter-form">
         <ElForm :model="searchForm" size="default" inline>
-          <ElFormItem label="Base SKU">
+
+          <ElFormItem label="SKU">
             <ElInput
+              @blur="searchForm.mainSku = searchForm.mainSku.trim()"
               v-model="searchForm.mainSku"
-              placeholder="请输入Base SKU"
+              placeholder=" SKU"
               clearable
               style="width: 160px"
             ></ElInput>
           </ElFormItem>
           <ElFormItem label="成品ID">
             <ElInput
+              @blur="searchForm.endProductId = searchForm.endProductId.trim()"
               v-model="searchForm.endProductId"
               placeholder="请输入成品ID"
               clearable
               style="width: 160px"
             ></ElInput>
           </ElFormItem>
-          <ElFormItem label="第三方订单号">
+<!--          <ElFormItem label="第三方订单号">-->
+<!--            <ElInput-->
+<!--              v-model="searchForm.erpOrderNumber"-->
+<!--              placeholder="请输入第三方订单号"-->
+<!--              clearable-->
+<!--              style="width: 160px"-->
+<!--            ></ElInput>-->
+<!--          </ElFormItem>-->
+          <ElFormItem label="生产单号">
             <ElInput
-              v-model="searchForm.erpOrderNumber"
-              placeholder="请输入第三方订单号"
+              @blur="searchForm.subOrderNumber = searchForm.subOrderNumber.trim()"
+              v-model="searchForm.subOrderNumber"
+              placeholder="生产单号"
               clearable
               style="width: 160px"
             ></ElInput>
           </ElFormItem>
-          <ElFormItem label="生产单号">
+          <ElFormItem label="订单号">
             <ElInput
-              v-model="searchForm.subOrderNumber"
-              placeholder="生产单号"
+              v-model="searchForm.orderNumber"
+              placeholder="订单号"
+              @blur="searchForm.orderNumber = searchForm.orderNumber.trim()"
               clearable
               style="width: 160px"
             ></ElInput>
@@ -38,6 +51,7 @@
           <ElFormItem label="店铺单号">
             <ElInput
               v-model="searchForm.shopNumber"
+              @blur="searchForm.shopNumber = searchForm.shopNumber.trim()"
               placeholder="店铺单号"
               clearable
               style="width: 160px"
@@ -46,6 +60,7 @@
           <ElFormItem label="内部标签">
             <ElInput
               v-model="searchForm.internalMemo"
+              @blur="searchForm.internalMemo = searchForm.internalMemo.trim()"
               placeholder="内部标签"
               clearable
               style="width: 160px"
@@ -102,7 +117,7 @@
           >打印生产单</ElButton
           >
         </span>
-        <span v-if="statusCode === 2" class="item">
+        <span v-if="statusCode === 2 || statusCode === 3 || statusCode === 7" class="item">
           <ElButton type="success" dark @click="exportManuscript"
           >导出生产单</ElButton
           >
@@ -531,8 +546,8 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({
   mainSku: '',
   endProductId: '',
   shopNumber: '',
+  OrderNumber: '',
   internalMemo: '',
-  erpOrderNumber: '',
   subOrderNumber: '',
 })
 const tabsNav = ref<Tab[]>([])
@@ -776,7 +791,7 @@ const printManuscript = async () => {
 // 导出生产单
 const exportManuscript = async () => {
   try {
-    const res = await exportOrder()
+    const res = await exportOrder(statusCode.value)
     window.open(filePath + res.message)
   } catch (e) {
     showError(e)