Merge branch 'wq' into dev

4545b5dc · wuqian · 02083ceb · 22a5a2d2 · 4545b5dc · 4545b5dc
Commit 4545b5dc authored Jun 11, 2025 by wuqian
12 changed files
--- a/src/api/order.ts
+++ b/src/api/order.ts
-import { BasePaginationData, BaseRespData, RejectParams } from '@/types/api'
+import { BasePaginationData, BaseRespData } from '@/types/api'
 import axios from './axios'
-import { PaymentForm } from '@/types/api/index.ts'
 import {
  LogListData,
  OrderData,
@@ -11,6 +10,8 @@ import {
  ShipmentOrderRes,
  Tab,
  InspectionData,
+  PaymentForm,
+  RejectParams
 } from '@/types/api/order'
 import {
  apiSubmitPodOrderForm,
@@ -151,7 +152,7 @@ export function apiSetCraftData({
 }: {
  id: number | undefined
  craftTotalPrice: number | undefined
-  recNumber:string|undefined
+  recNumber: string | undefined
  craftPriceList: IUpdatePrice[]
 }) {
  return axios.post<never, BaseRespData<never>>(

--- a/src/api/warehouse.ts
+++ b/src/api/warehouse.ts
@@ -314,9 +314,9 @@ export function InRecordBatchCheckPrintApi(ids: string) {
    },
  )
 }
-export function warehouseInRecordInventory(data: ExportInWarehouseInfo) {
+export function warehouseInRecordExport(data: ExportInWarehouseInfo) {
  return axios.post<never, BasePaginationData<never>>(
-    'factory/warehouseInRecord/inventory',
+    'factory/warehouseInRecord/export',
    data,
  )
 }
@@ -438,6 +438,20 @@ export function getInRecordLogApi(inRecordId?: number) {
  )
 }
 // 出库单
+export function warehouseOutRecordExport(data: ExportInWarehouseInfo) {
+  return axios.post<never, BasePaginationData<never>>(
+    'factory/warehouseOutRecord/export',
+    data,
+  )
+}
+export function OutRecordBatchCheckPrintApi(ids: string) {
+  return axios.get<never, BaseRespData<never[]>>(
+    'factory/warehouseOutRecord/batchCheckPrint',
+    {
+      params: { ids },
+    },
+  )
+}
 export function getOutRecordStatusTree() {
  return axios.get<never, BaseRespData<InterWarehouseTree[]>>(
    'factory/warehouseOutRecord/status_tree',

--- a/src/components/NavMenu.vue
+++ b/src/components/NavMenu.vue
@@ -87,8 +87,9 @@
          >
            <div class="nav-tabs-node_label">
              <span>{{ item.title }}</span>
+              <!-- 首页不可删除 -->
              <el-icon
-                v-if="tabs.length > 1"
+                v-if="item.path != '/dashboard' && tabs.length > 1"
                class="el-icon-close"
                @click.stop="removeTab(item.name)"
              >

--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -27,8 +27,8 @@ import WarehouseManage from '@/views/warehouse/manage.vue'
 import WarehouseWarning from '@/views/warehouse/warning.vue'
 import WarehousePosition from '@/views/warehouse/position.vue'
 import receiptDoc from '@/views/warehouse/receiptDoc.vue'
+import issueDoc from '@/views/warehouse/issueDoc.vue'
 import ExternalAuthorisationPage from '@/views/system/externalAuthorisationPage.vue'
-// import issueDoc from '@/views/warehouse/issueDoc.vue'
 const router = createRouter({
  history: createWebHistory(),
  routes: [
@@ -197,13 +197,13 @@ const router = createRouter({
          },
          component: receiptDoc,
        },
-        // {
+        {
-        //   path: '/warehouse/issue-doc',
+          path: '/warehouse/issue-doc',
-        //   meta: {
+          meta: {
-        //     title: '出库单',
+            title: '出库单',
-        //   },
+          },
-        //   component: issueDoc,
+          component: issueDoc,
-        // },
+        },
        {
          path: '/warehouse/warning',
          meta: {

--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -78,11 +78,11 @@ const menu: MenuItem[] = [
        id: 123,
        label: '入库单',
      },
-      // {
+      {
-      //   index: '/warehouse/issue-doc',
+        index: '/warehouse/issue-doc',
-      //   id: 124,
+        id: 124,
-      //   label: '出库单',
+        label: '出库单',
-      // },
+      },
      {
        index: '/warehouse/manage',

--- a/src/types/api/index.ts
+++ b/src/types/api/index.ts
@@ -35,17 +35,4 @@ export interface baseRes {
  code: number
  msg: string
 }
-export interface PaymentForm {
-  waterList: string
-  id?: number | string
-  actualAmount?: number | string
-  payableAmount?: number | string
-  recNumber?: number | string
-}
-export interface RejectParams {
-  id: number
-  description?: string
-  ids?: string
-  pass?: number
-}
--- a/src/types/api/order.ts
+++ b/src/types/api/order.ts
@@ -81,7 +81,7 @@ export interface ProductList {
  subOrderNumber?: string
  shopNumber?: string
  material?: string
-  materialPrice?: number|null
+  materialPrice?: number | null
  count?: number
  baseSku?: string
  erpSubOrderNumber?: string
@@ -277,3 +277,16 @@ export interface ICompareObjects {
  lanshouPost?: string
  lanshouRegion?: string
 }
+export interface PaymentForm {
+  waterList: string
+  id?: number | string
+  actualAmount?: number | string
+  payableAmount?: number | string
+  recNumber?: number | string
+}
+export interface RejectParams {
+  id: number
+  description?: string
+  ids?: string
+  pass?: number
+}
--- a/src/types/api/warehouse.ts
+++ b/src/types/api/warehouse.ts
@@ -5,6 +5,8 @@ export interface warehouseSearchForm {
  billStatus?: string
  createTimeEnd?: string
  createTimeStart?: string
+  startTime?: string
+  endTime?: string
  inNo?: string
  outNo?: string
  warehouseSku?: string
@@ -14,6 +16,7 @@ export interface warehouseSearchForm {
 export interface InterProductList {
  createTime?: string
  id?: number
+  inventoryId?: number | null
  inId?: number
  productNo?: string | null //custom的货号
  buyStored?: number | null //入库数量
@@ -42,6 +45,7 @@ export interface InterWarehouseBase {
  total?: number
  totalPrice?: number
  billStatus?: string
+  billStatusTxt?: string
  remark?: string | null
  dataVersion?: number
  createTime?: string | null
@@ -86,6 +90,9 @@ export interface InterProductList {
  warehouseSku?: string
  locationId?: number | null
  locationCode?: string | null
+  inventory?: {
+    usableInventory?: number
+  }
 }
 export interface InterskuList {
  id?: number
@@ -101,6 +108,7 @@ export interface InterskuList {
  price?: number | null //出库单的
  usableInventory?: number | null
  warehouseSku?: string
+  remark?: string | null
 }
 export interface ILocation {
  id?: number

--- a/src/utils/hooks/commonUtil.ts
+++ b/src/utils/hooks/commonUtil.ts
@@ -108,7 +108,6 @@ export function checkUpdateParams(
          removeList = arr1.map((item) => item['id'] as IdType)
        }
        if (isBackKeyName) {
-          console.log(isBackKeyName)
          // 将列表直接添加到 params 顶层
          if (addList.length > 0) params['addList'] = addList || undefined
          if (updateList.length > 0)

--- a/src/views/warehouse/issueDoc.vue
+++ b/src/views/warehouse/issueDoc.vue
--- a/src/views/warehouse/receiptDoc.vue
+++ b/src/views/warehouse/receiptDoc.vue
--- a/src/views/warehouse/warning.vue
+++ b/src/views/warehouse/warning.vue
@@ -112,18 +112,16 @@ const submitExportForm = async () => {
    return ElMessage.error('请选择导出类型')
  }
  exportLoading.value = true
-  let purchaseIds = ''
+  let purchaseIds: number[] = []
  let exportTotal: number | undefined = undefined
  const params: AnyObject = {}
  const resourceType = Number(exportForm.value.resource)
  if (resourceType === 0) {
-    purchaseIds = leftData.value.map((el: WarehouseWarning) => el.id).join(',')
+    purchaseIds = leftData.value.map((el: WarehouseWarning) => Number(el.id))
  } else if (resourceType === 1) {
-    purchaseIds = selections.value
+    purchaseIds = selections.value.map((el: WarehouseWarning) => Number(el.id))
-      .map((el: WarehouseWarning) => el.id)
-      .join(',')
  } else if (resourceType === 2) {
-    purchaseIds = ''
+    purchaseIds = []
    exportTotal = pagination.value.total
  }
  params.idList = purchaseIds