feat: 备货单据字段填充

src/api/supplier/stockingOrder.ts

@@ -114,3 +114,21 @@ export function stockingCompleteApi(id: number) {
     `factory/supply/stockingUpManage/delivery?id=${id}`,
   )
 }
+
+export function deleteStockingOrderApi(id: string | number) {
+  return axios.get<never, BaseRespData<void>>(
+    `factory/supply/stockingUpManage/delete`,
+    {
+      params: { id },
+    },
+  )
+}
+
+export function cancelStockingOrderApi(id: string | number) {
+  return axios.get<never, BaseRespData<void>>(
+    `factory/supply/stockingUpManage/cancel`,
+    {
+      params: { id },
+    },
+  )
+}

src/api/warehouse/stockingApplyOrder.ts

@@ -38,7 +38,7 @@ export function getStockingApplyOrderRelatedDocumentListByIdApi(
   warehouseApplyNo: string,
 ) {
   return axios.get<never, BaseRespData<RelatedDocumentList[]>>(
-    `factory/supply/stockingUpWarehouseApply/getWarehouseApplyList?warehouseApplyNo=${warehouseApplyNo}`,
+    `factory/supply/stockingUpWarehouseApply/getWarehouseInList?warehouseApplyNo=${warehouseApplyNo}`,
   )
 }
 

src/components/TableView.vue

@@ -3,6 +3,7 @@
     <ElTable
       ref="tableRef"
       :data="paginatedData"
+      show-overflow-tooltip
       border
       :stripe="stripe"
       header-align="center"

src/types/api/supply/stockingOrder.ts

@@ -50,6 +50,12 @@ export interface TableData {
   updateTime?: string
   remark?: string
   dataVersion?: number
+  shippingStatus?: number
+  delayDays?: number
+  lastDeliveryTime?: string
+  completeTime?: string
+  auditName?: string
+  auditTime?: string
 }
 export interface StockProduct {
   skuImage?: string
@@ -64,10 +70,6 @@ export interface StockProduct {
   inWarehouseQuantity?: number
   defectiveQuantity?: number
 }
-
-export interface supplierData {}
-
-// 新增备货单表单
 export interface AddStockingOrderForm {
   id?: number | string
   stockingUpManageNo?: string
@@ -107,7 +109,27 @@ export interface StockingOrderProduct {
   currentShipQuantity?: number | string // 本次发货数量
 }
 
-export interface RelatedDocumentList {}
+export interface RelatedDocumentList {
+  id: number
+  factoryId?: number
+  factoryCode?: string
+  manageId?: number
+  manageNo?: string
+  warehouseApplyNo?: string
+  warehouseId?: number
+  warehouseName?: string
+  skuTotal?: number
+  total?: number
+  buyStored?: number
+  rejectsAmount?: number
+  storeStatus?: string
+  expectDeliveryTime?: string
+  createUserId?: number
+  createUserName?: string
+  createTime?: string
+  updateTime?: string
+  dataVersion?: number
+}
 export interface InternalMemoList {}
 export interface LogListData {
   id: number

src/types/api/warehouse/stockingApplyOrder.ts

@@ -58,7 +58,29 @@ export interface StockingApplyOrderDetailList {
   finallyShipmentQuantity?: number
 }
 
-export interface RelatedDocumentList {}
+export interface RelatedDocumentList {
+  id: number
+  dataVersion?: number
+  createTime?: string
+  updateTime?: string
+  factoryId?: number
+  factoryCode?: string
+  warehouseId?: number
+  warehouseName?: string
+  inNo?: string
+  skuAmount?: number
+  total?: number
+  totalPrice?: number
+  billStatus?: string
+  billStatusTxt?: string
+  makerName?: string
+  makerUserId?: number
+  makeTime?: string
+  checkerUserId?: number
+  checkerName?: string
+  source?: string
+  sourceOn?: string
+}
 export interface StockingApplyOrderDetailData {
   id: number
   warehouseApplyNo?: string

src/views/supply/stockingOrder/StockingOrderDetailTabs.vue

@@ -43,6 +43,7 @@ import type { TabsPaneContext } from 'element-plus'
 import TableView from '@/components/TableView.vue'
 import {
   LogListData,
+  RelatedDocumentList,
   StockingOrderProduct,
   TableData,
 } from '@/types/api/supply/stockingOrder'
@@ -58,46 +59,55 @@ const relatedDocumentsColumns = computed(() => {
   return [
     {
       label: '关联单据',
-      width: 120,
-      prop: 'documentNo',
+      prop: 'warehouseApplyNo',
+      align: 'center',
     },
     {
       label: '关联单号',
+      prop: 'manageNo',
+      align: 'center',
     },
     {
       label: '制单人',
       width: 120,
       prop: 'createUserName',
+      align: 'center',
     },
     {
       label: '制单时间',
       width: 160,
+      prop:'createTime',
+      align: 'center',
     },
     {
       label: 'SKU个数',
       width: 120,
       align: 'right',
+      prop: 'skuTotal',
     },
     {
       label: '入库数量',
       width: 120,
       align: 'right',
+      prop:'buyStored'
     },
     {
       label: '申请数量',
       width: 120,
-      prop: 'shipmentQuantity',
+      prop: 'total',
       align: 'right',
     },
     {
       label: '预计到货日期',
       width: 160,
       align: 'center',
+      prop:'expectDeliveryTime'
     },
     {
       label: '实际到货日期',
       width: 160,
       align: 'center',
+      prop:'deliveryTime'
     },
   ]
 })
@@ -173,7 +183,7 @@ const props = defineProps<{
 }>()
 
 const stockProductsData = ref<StockingOrderProduct[]>([])
-const relatedDocumentsData = ref<StockingOrderProduct[]>([])
+const relatedDocumentsData = ref<RelatedDocumentList[]>([])
 const internalMemoData = ref<StockingOrderProduct[]>([])
 const operationLogData = ref<LogListData[]>([])
 const activeTab = ref('stockProducts')

src/views/supply/stockingOrder/index.vue

@@ -169,10 +169,10 @@
             v-if="['PENDING_SUBMIT', 'STOCKING_UP'].includes(status)"
             class="item"
           >
-            <ElButton type="warning">取消</ElButton>
+            <ElButton type="warning" @click="handleCancelOrder">取消</ElButton>
           </span>
           <span v-if="status === 'PENDING_SUBMIT'" class="item">
-            <ElButton type="danger">删除</ElButton>
+            <ElButton type="danger" @click="handleDeleteOrder">删除</ElButton>
           </span>
         </div>
       </div>
@@ -226,10 +226,13 @@
 </template>
 <script setup lang="tsx">
 import { computed, ref } from 'vue'
+import dayjs from 'dayjs'
 import {
   getStockingOrderListApi,
   stockingCompleteApi,
   submitStockingOrderAuditApi,
+  deleteStockingOrderApi,
+  cancelStockingOrderApi,
 } from '@/api/supplier/stockingOrder'
 import TableView from '@/components/TableView.vue'
 import StockingOrderDetailTabs from './StockingOrderDetailTabs.vue'
@@ -252,13 +255,39 @@ import {
 import { getStockingOrderStatusTreeApi } from '@/api/supplier/stockingOrder'
 import { userData } from '@/types/api/user'
 import { ElButton, ElTag } from 'element-plus'
+const deliveryStatusList = ref([
+  { label: '待发货', value: 0 },
+  { label: '部分发货', value: 1 },
+  { label: '全部发货', value: 2 },
+])
 const tableColumns = computed(() => {
   return [
     {
       label: '备货单号',
       prop: 'stockingUpManageNo',
-      minWidth: 150,
+      minWidth: 200,
       align: 'center',
+      render: (row: TableData) => {
+        const isDelayed =
+          row.expectDeliveryTime &&
+          dayjs()
+            .startOf('day')
+            .diff(dayjs(row.expectDeliveryTime).startOf('day'), 'day') > 0
+        return (
+          <div style="position: relative; width: 100%;">
+            {isDelayed && (
+              <ElTag
+                type="danger"
+                size="small"
+                style="position: absolute; left: -10px; top: 2px; transform: scale(0.8);"
+              >
+                延期
+              </ElTag>
+            )}
+            <span>{row.stockingUpManageNo}</span>
+          </div>
+        )
+      },
     },
     {
       label: '备货仓库',
@@ -327,9 +356,20 @@ const tableColumns = computed(() => {
     },
     {
       label: '发货状态',
-      prop: 'deliveryStatus',
+      prop: 'shippingStatus',
       width: 100,
       align: 'center',
+      render: (row: TableData) => {
+        return (
+          <span>
+            {row.shippingStatus && (
+              <ElTag type="primary">
+                {getDeliveryStatusName(row.shippingStatus)}
+              </ElTag>
+            )}
+          </span>
+        )
+      },
     },
     {
       label: '备货员',
@@ -340,13 +380,13 @@ const tableColumns = computed(() => {
     {
       label: '最后交货日期',
       prop: 'lastDeliveryTime',
-      width: 130,
+      width: 160,
       align: 'center',
     },
     {
       label: '订单完成日期',
       prop: 'completeTime',
-      width: 130,
+      width: 160,
       align: 'center',
     },
     {
@@ -354,6 +394,18 @@ const tableColumns = computed(() => {
       prop: 'delayDays',
       width: 100,
       align: 'center',
+      render: (row: TableData) => {
+        if (!row.expectDeliveryTime) return <span>-</span>
+        const delayDays = dayjs()
+          .startOf('day')
+          .diff(dayjs(row.expectDeliveryTime).startOf('day'), 'day')
+        if (delayDays > 0) {
+          return (
+            <span style="color: #f56c6c; font-weight: bold;">{delayDays}</span>
+          )
+        }
+        return <span>-</span>
+      },
     },
     {
       label: '制单人',
@@ -448,11 +500,7 @@ const warehouseList = ref<WarehouseListData[]>([])
 const supplierList = ref<SupplierItem[]>([])
 const stockKeeperList = ref<userData[]>([])
 const currencyList = ref<CurrencyCodeData[]>([])
-const deliveryStatusList = ref([
-  { label: '待发货', value: 'pending' },
-  { label: '部分发货', value: 'partial' },
-  { label: '全部发货', value: 'completed' },
-])
+
 const selection = ref<TableData[]>([])
 const rangeTime = ref<string[]>([])
 const [searchForm, resetSearchForm] = useValue<SearchForm>({} as SearchForm)
@@ -512,6 +560,12 @@ const nodeClick = (data: TreeData) => {
   status.value = data.code
   search()
 }
+const getDeliveryStatusName = (shippingStatus: number) => {
+  if (!shippingStatus) return ''
+  return deliveryStatusList.value.find(
+    (item) => item.value === Number(shippingStatus),
+  )?.label
+}
 
 const {
   currentPage,
@@ -625,7 +679,50 @@ const handleSubmitAudit = async () => {
     console.error(e)
   }
 }
-
+const handleDeleteOrder = async () => {
+  if (selection.value.length !== 1) {
+    return ElMessage.warning('请选择一条数据')
+  }
+  try {
+    await ElMessageBox.confirm('确定要删除选中的数据吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+  } catch {
+    return
+  }
+  try {
+    const res = await deleteStockingOrderApi(selection.value[0].id)
+    if (res.code !== 200) return
+    ElMessage.success('删除成功')
+    onRefresh()
+  } catch (e) {
+    console.error(e)
+  }
+}
+const handleCancelOrder = async () => {
+  if (selection.value.length !== 1) {
+    return ElMessage.warning('请选择一条数据')
+  }
+  try {
+    await ElMessageBox.confirm('确定要取消选中的数据吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+  } catch {
+    return
+  }
+  try {
+    const res = await cancelStockingOrderApi(selection.value[0].id)
+    if (res.code !== 200) return
+    ElMessage.success('取消成功')
+    onRefresh()
+  } catch (e) {
+    console.error(e)
+  }
+}
 const onRefresh = () => {
   search()
   loadTreeData()

src/views/warehouse/stockingApplicationOrder/StockingApplyOrderDetailTabs.vue

@@ -54,30 +54,37 @@ const relatedDocumentsColumns = computed(() => {
   return [
     {
       label: '关联单据',
-      width: 120,
-      prop: 'documentNo',
+      prop: 'inNo',
+      align: 'center',
     },
     {
       label: '关联单号',
+      prop: 'sourceOn',
+      align: 'center',
     },
     {
       label: '制单人',
       width: 120,
-      prop: 'createUserName',
+      prop: 'checkerName',
+      align: 'center',
     },
     {
       label: '制单时间',
       width: 160,
+      prop: 'createTime',
+      align: 'center',
     },
     {
       label: 'SKU个数',
       width: 120,
       align: 'right',
+      prop: 'skuAmount',
     },
     {
       label: '入库数量',
       width: 120,
       align: 'right',
+      prop: 'total',
     },
   ]
 })
@@ -144,7 +151,7 @@ const stockProductsColumns = computed(() => {
       label: '币种',
       prop: 'currencyCode',
       width: 100,
-      align: 'right',
+      align: 'center',
     },
     {
       label: '入库单价',

src/views/warehouse/stockingApplicationOrder/SubmitWarehousingDialog.vue

@@ -100,7 +100,7 @@
     <template #footer>
       <div class="dialog-footer">
         <ElButton @click="handleCancel">取消</ElButton>
-        <ElButton type="primary" :loading="submitLoading" @click="handleSubmit">
+        <ElButton type="primary" @click="handleSubmit">
           入库
         </ElButton>
       </div>
@@ -133,7 +133,6 @@ const emit = defineEmits<{
 }>()
 
 const visible = ref(false)
-const submitLoading = ref(false)
 const formRef = ref<FormInstance>()
 const userList = ref<userData[]>([])
 const locationList = ref<LocationDataBySkuData[]>([])
@@ -344,7 +343,11 @@ const handleSubmit = async () => {
   const checkerName = userList.value.find(
     (item) => item.id === formData.value.checkerUserId,
   )?.account
-  submitLoading.value = true
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
   try {
     const res = await submitWarehousingApi({ ...formData.value, checkerName })
     if (res.code === 200) {
@@ -355,7 +358,7 @@ const handleSubmit = async () => {
   } catch (e) {
     console.error(e)
   } finally {
-    submitLoading.value = false
+    loading.close()
   }
 }
 defineExpose({ open })