李红攀:V2.6.975,添加采购询比、采购统计
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="yd-page-container">
|
||||
<view class="yd-page-container erp-page">
|
||||
<!-- 顶部导航栏 -->
|
||||
<wd-navbar
|
||||
title="入库单详情"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="yd-page-container">
|
||||
<view class="yd-page-container erp-page">
|
||||
<!-- 顶部导航栏 -->
|
||||
<wd-navbar
|
||||
:title="getTitle"
|
||||
@@ -8,7 +8,7 @@
|
||||
/>
|
||||
|
||||
<!-- 表单区域 -->
|
||||
<view class="pb-180rpx">
|
||||
<view class="erp-form-body">
|
||||
<wd-form ref="formRef" :model="formData" :rules="formRules">
|
||||
<wd-cell-group title="基本信息" border>
|
||||
<wd-cell title="入库单号" :value="formData.no || '保存时自动生成'" />
|
||||
@@ -46,7 +46,7 @@
|
||||
<view
|
||||
v-for="(item, index) in formData.items"
|
||||
:key="index"
|
||||
class="mx-24rpx mb-20rpx rounded-12rpx bg-[#f9f9f9] p-24rpx"
|
||||
class="erp-form-item-card erp-form-item-card--padded"
|
||||
>
|
||||
<view class="mb-12rpx flex items-center justify-between">
|
||||
<view class="text-28rpx text-[#333] font-semibold">
|
||||
@@ -143,22 +143,19 @@
|
||||
/>
|
||||
|
||||
<!-- 供应商选择器 -->
|
||||
<wd-picker
|
||||
v-model="supplierPickerVisible"
|
||||
<wd-picker v-model:show="supplierPickerVisible"
|
||||
:columns="supplierColumns"
|
||||
@confirm="onSupplierConfirm"
|
||||
/>
|
||||
|
||||
<!-- 仓库选择器 -->
|
||||
<wd-picker
|
||||
v-model="warehousePickerVisible"
|
||||
<wd-picker v-model:show="warehousePickerVisible"
|
||||
:columns="warehouseColumns"
|
||||
@confirm="onWarehouseConfirm"
|
||||
/>
|
||||
|
||||
<!-- 产品选择器 -->
|
||||
<wd-picker
|
||||
v-model="productPickerVisible"
|
||||
<wd-picker v-model:show="productPickerVisible"
|
||||
:columns="productColumns"
|
||||
@confirm="onProductConfirm"
|
||||
/>
|
||||
@@ -210,7 +207,7 @@ const supplierColumns = computed(() => [
|
||||
])
|
||||
|
||||
// 仓库列表
|
||||
const warehouseList = ref<{ id: number, name: string }[]>([])
|
||||
const warehouseList = ref<{ id?: number, name?: string }[]>([])
|
||||
const warehousePickerVisible = ref(false)
|
||||
const warehouseColumns = computed(() => [
|
||||
warehouseList.value.map(v => ({ value: v.id, label: v.name })),
|
||||
@@ -224,7 +221,7 @@ const productColumns = computed(() => [
|
||||
])
|
||||
|
||||
// 日期选择器
|
||||
const datePickerVisible = ref(false)
|
||||
const datePickerVisible = ref<any>(false)
|
||||
|
||||
// 当前编辑的产品项索引
|
||||
const currentItemIndex = ref(-1)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="yd-page-container">
|
||||
<view class="yd-page-container erp-page">
|
||||
<!-- 顶部导航栏 -->
|
||||
<wd-navbar
|
||||
title="其他入库"
|
||||
@@ -183,7 +183,7 @@ const toast = useToast()
|
||||
const total = ref(0)
|
||||
const list = ref<StockIn[]>([])
|
||||
const loadMoreState = ref<LoadMoreState>('loading')
|
||||
const queryParams = ref<Record<string, any>>({
|
||||
const queryParams = ref<{ pageNo: number; pageSize: number } & Record<string, any>>({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
status: undefined,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="yd-page-container scan-page">
|
||||
<view class="yd-page-container erp-page scan-page">
|
||||
<wd-navbar
|
||||
title="扫码入库"
|
||||
left-arrow
|
||||
@@ -273,7 +273,12 @@ async function handleWarehouseScan(rawValue?: string) {
|
||||
try {
|
||||
try {
|
||||
const warehouse = await getWarehouseByBarCode(code)
|
||||
currentWarehouse.value = warehouse
|
||||
currentWarehouse.value = warehouse?.id
|
||||
? {
|
||||
id: warehouse.id,
|
||||
name: warehouse.name || '-',
|
||||
}
|
||||
: null
|
||||
} catch {
|
||||
setErrorFeedback(`仓库码 ${code} 不存在`)
|
||||
resetToIdle()
|
||||
@@ -558,7 +563,7 @@ function normalizeScanCode(value: string): string {
|
||||
/** 规范化相机扫码结果 */
|
||||
function normalizeScanResult(result: UniApp.ScanCodeSuccessRes): string {
|
||||
if (!result) return ''
|
||||
const value = result.result || result.code || ''
|
||||
const value = result.result || (result as UniApp.ScanCodeSuccessRes & { code?: string }).code || ''
|
||||
return normalizeScanCode(value)
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user