调整入库单和入库商品

This commit is contained in:
lewis 2025-03-10 17:54:30 +08:00
parent 4d7b392b9c
commit d393500ca8
11 changed files with 1485 additions and 958 deletions

View File

@ -1,26 +1,26 @@
import request from '@/utils/request' import request from '@/utils/request'
// 仓库信息列表 // 仓库信息列表
export function apiPsiWarehouseLists(params: any) { export function apiWarehouseLists(params: any) {
return request.get({ url: '/warehouse/warehouse/lists', params }, { urlPrefix: 'psi' }) return request.get({ url: '/warehouse/warehouse/lists', params }, { urlPrefix: 'psi' })
} }
// 添加仓库信息 // 添加仓库信息
export function apiPsiWarehouseAdd(params: any) { export function apiWarehouseAdd(params: any) {
return request.post({ url: '/warehouse/warehouse/add', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouse/warehouse/add', params }, { urlPrefix: 'psi' })
} }
// 编辑仓库信息 // 编辑仓库信息
export function apiPsiWarehouseEdit(params: any) { export function apiWarehouseEdit(params: any) {
return request.post({ url: '/warehouse/warehouse/edit', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouse/warehouse/edit', params }, { urlPrefix: 'psi' })
} }
// 删除仓库信息 // 删除仓库信息
export function apiPsiWarehouseDelete(params: any) { export function apiWarehouseDelete(params: any) {
return request.post({ url: '/warehouse/warehouse/delete', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouse/warehouse/delete', params }, { urlPrefix: 'psi' })
} }
// 仓库信息详情 // 仓库信息详情
export function apiPsiWarehouseDetail(params: any) { export function apiWarehouseDetail(params: any) {
return request.get({ url: '/warehouse/warehouse/detail', params }, { urlPrefix: 'psi' }) return request.get({ url: '/warehouse/warehouse/detail', params }, { urlPrefix: 'psi' })
} }

View File

@ -1,26 +1,42 @@
import request from '@/utils/request' import request from '@/utils/request'
// 入库订单列表 // 入库订单列表
export function apiPsiWarehouseOrderLists(params: any) { export function apiWarehouseOrderLists(params: any) {
return request.get({ url: '/warehouseorder/lists', params }, { urlPrefix: 'psi' }) return request.get({ url: '/warehouseorder/lists', params }, { urlPrefix: 'psi' })
} }
// 添加入库订单 // 添加入库订单
export function apiPsiWarehouseOrderAdd(params: any) { export function apiWarehouseOrderAdd(params: any) {
return request.post({ url: '/warehouseorder/add', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouseorder/add', params }, { urlPrefix: 'psi' })
} }
// 编辑入库订单 // 编辑入库订单
export function apiPsiWarehouseOrderEdit(params: any) { export function apiWarehouseOrderEdit(params: any) {
return request.post({ url: '/warehouseorder/edit', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouseorder/edit', params }, { urlPrefix: 'psi' })
} }
// 删除入库订单 // 删除入库订单
export function apiPsiWarehouseOrderDelete(params: any) { export function apiWarehouseOrderDelete(params: any) {
return request.post({ url: '/warehouseorder/delete', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouseorder/delete', params }, { urlPrefix: 'psi' })
} }
// 入库订单详情 // 入库订单详情
export function apiPsiWarehouseOrderDetail(params: any) { export function apiWarehouseOrderDetail(params: any) {
return request.get({ url: '/warehouseorder/detail', params }, { urlPrefix: 'psi' }) return request.get({ url: '/warehouseorder/detail', params }, { urlPrefix: 'psi' })
} }
// 修改入库单回款金额
export function apiWarehouseOrderUpdateAmount(params: any) {
return request.post({ url: '/warehouseorder/updateAmount', params }, { urlPrefix: 'psi' })
}
// 导出商品仓储入库订单
export function apiWarehouseOrderRentryExport(params: any) {
return request.post({ url: '/warehouse_order/warehouseorder/rentry_export', params })
}
// 导出商品仓储出库订单
export function apiWarehouseOrderExport(params: any) {
return request.post({ url: '/warehouse_order/warehouseorder/export', params })
}
// 导出商品标签
export function apiWarehouseOrderExportTags(params: any) {
return request.post({ url: '/warehouse_order/warehouseorder/export_tags', params })
}

View File

@ -1,26 +1,26 @@
import request from '@/utils/request' import request from '@/utils/request'
// 仓库商品入库信息列表 // 仓库商品入库信息列表
export function apiPsiWarehouseProductLists(params: any) { export function apiWarehouseProductLists(params: any) {
return request.get({ url: '/warehouseproduct/lists', params }, { urlPrefix: 'psi' }) return request.get({ url: '/warehouseproduct/lists', params }, { urlPrefix: 'psi' })
} }
// 添加仓库商品入库信息 // 添加仓库商品入库信息
export function apiPsiWarehouseProductAdd(params: any) { export function apiWarehouseProductAdd(params: any) {
return request.post({ url: '/warehouseproduct/add', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouseproduct/add', params }, { urlPrefix: 'psi' })
} }
// 编辑仓库商品入库信息 // 编辑仓库商品入库信息
export function apiPsiWarehouseProductEdit(params: any) { export function apiWarehouseProductEdit(params: any) {
return request.post({ url: '/warehouseproduct/edit', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouseproduct/edit', params }, { urlPrefix: 'psi' })
} }
// 删除仓库商品入库信息 // 删除仓库商品入库信息
export function apiPsiWarehouseProductDelete(params: any) { export function apiWarehouseProductDelete(params: any) {
return request.post({ url: '/warehouseproduct/delete', params }, { urlPrefix: 'psi' }) return request.post({ url: '/warehouseproduct/delete', params }, { urlPrefix: 'psi' })
} }
// 仓库商品入库信息详情 // 仓库商品入库信息详情
export function apiPsiWarehouseProductDetail(params: any) { export function apiWarehouseProductDetail(params: any) {
return request.get({ url: '/warehouseproduct/detail', params }, { urlPrefix: 'psi' }) return request.get({ url: '/warehouseproduct/detail', params }, { urlPrefix: 'psi' })
} }

15
src/utils/enums.ts Normal file
View File

@ -0,0 +1,15 @@
const enums = {
orderType: [
{label: '铺货订单', value: 1},
{label: '摊贩订单', value: 2},
{label: '一条龙订单', value: 3},
{label: '线上订单', value: 4},
{label: '仓库补货', value: 5},
{label: '往期补单-出库', value: 6},
{label: '采购订单', value: 7},
{label: '其他订单', value: 8},
{label: '往期补单-入库', value: 9},
],
}
export default enums

View File

@ -1,153 +1,403 @@
<template> <template>
<div class="edit-popup"> <el-drawer v-model="showDialog" title="订单详情" :size="1200">
<popup <div class="flex items-center justify-between m-4">
ref="popupRef" <div class="flex flex-col">
title="详情" <div style="color: gray">仓库</div>
:async="true" <div style="color: black">{{ formData.warehouse_name }}</div>
width="550px"
:cancelButtonText="false"
:confirmButtonText="false"
>
<el-form ref="formRef" :model="formData" label-width="90px">
<el-form-item label="仓库" prop="warehouse_id">
<el-input v-model="formData.warehouse_id" clearable placeholder="请输入仓库" :readonly="true"/>
</el-form-item>
<el-form-item label="供应商" prop="supplier_id">
<el-input v-model="formData.supplier_id" clearable placeholder="请输入供应商" :readonly="true"/>
</el-form-item>
<el-form-item label="门店" prop="store_id">
<el-input v-model="formData.store_id" clearable placeholder="请输入门店" :readonly="true"/>
</el-form-item>
<el-form-item label="订单id" prop="oid">
<el-input v-model="formData.oid" clearable placeholder="请输入订单id" :readonly="true"/>
</el-form-item>
<el-form-item label="订单类型" prop="order_type">
<el-select class="flex-1" v-model="formData.order_type" clearable placeholder="请选择订单类型" :disabled="true">
<el-option
v-for="(item, index) in dictData.product_type"
:key="index"
:label="item.name"
:value="parseInt(item.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="单号" prop="code">
<el-input v-model="formData.code" clearable placeholder="请输入单号" :readonly="true"/>
</el-form-item>
<el-form-item label="填写人员" prop="admin_id">
<el-input v-model="formData.admin_id" clearable placeholder="请输入填写人员" :readonly="true"/>
</el-form-item>
<el-form-item label="批次" prop="batch">
<el-input v-model="formData.batch" clearable placeholder="请输入批次" :readonly="true"/>
</el-form-item>
<el-form-item label="备注" prop="mark">
<el-input v-model="formData.mark" clearable placeholder="请输入备注" :readonly="true"/>
</el-form-item>
<el-form-item label="数量" prop="nums">
<el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="true"/>
</el-form-item>
<el-form-item label="供货价" prop="purchase">
<el-input v-model="formData.purchase" clearable placeholder="请输入供货价" :readonly="true"/>
</el-form-item>
<el-form-item label="总价格" prop="total_price">
<el-input v-model="formData.total_price" clearable placeholder="请输入总价格" :readonly="true"/>
</el-form-item>
<el-form-item label="已结金额" prop="completed_amount">
<el-input v-model="formData.completed_amount" clearable placeholder="请输入已结金额" :readonly="true"/>
</el-form-item>
<el-form-item label="未结金额" prop="outstanding_amount">
<el-input v-model="formData.outstanding_amount" clearable placeholder="请输入未结金额" :readonly="true"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select class="flex-1" v-model="formData.status" clearable placeholder="请选择状态" :disabled="true">
<el-option
v-for="(item, index) in dictData.warehouse_produc_pm"
:key="index"
:label="item.name"
:value="parseInt(item.value)"
/>
</el-select>
</el-form-item>
</el-form>
</popup>
</div> </div>
<div class="flex flex-col" v-if="formData.financial_pm == 1">
<div style="color: gray">供应商</div>
<div style="color: black">{{ formData.supplier_name }}</div>
</div>
<div class="flex flex-col" v-else>
<div style="color: gray">门店</div>
<div style="color: black">{{ formData.system_store }}</div>
</div>
<div class="flex flex-col">
<div style="color: gray">单号</div>
<div style="color: black">{{ formData.code }}</div>
</div>
</div>
<div class="flex items-center justify-between m-4">
<div class="flex flex-col">
<div style="color: gray">总价</div>
<div style="color: black">{{ formData.total_price }}</div>
</div>
<div class="flex flex-col flex-2">
<div style="color: gray">时间</div>
<div style="color: black">{{ formData.create_time }}</div>
</div>
<el-button @click="xlsx(formData.id, 1)"> 打印采购单 </el-button>
<el-button @click="xlsx(formData.id, 2)"> 打印供货单 </el-button>
<el-button @click="xlsx(formData.id, 3)"> 打印商户/会员单 </el-button>
<el-button @click="xlsx(formData.id, 4)"> 打印零售单 </el-button>
<el-button @click="xlsx2(formData.id)"> 打印商品标签 </el-button>
</div>
<el-button type="primary" @click="dialogShop = true" v-if="formData.financial_pm == 1">
入库
</el-button>
<el-button type="primary" @click="dialogShop = true" v-else> 出库 </el-button>
<el-tabs v-model="activeName" class="demo-tabs mt-3" type="border-card">
<el-tab-pane label="明细" name="second">
<div>
<div>
<el-table :data="pager.lists" v-loading="pager.loading">
<el-table-column label="商品信息" prop="store_name" show-overflow-tooltip>
<template #default="{ row }">
<div class="flex items-center">
<el-image :src="row.image" class="w-16 h-16 mr-2"
:preview-teleported="true"></el-image>
<div>{{ row.store_name }}</div>
</div>
</template>
</el-table-column>
<el-table-column label="数量" prop="nums" show-overflow-tooltip />
<el-table-column label="采购价" prop="purchase" show-overflow-tooltip />
<el-table-column label="零售价" prop="price" show-overflow-tooltip />
<el-table-column label="合计" prop="total_price" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['warehouse_product.warehouse_product/edit']" type="primary"
link @click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['warehouse_product.warehouse_product/delete']" type="danger"
link @click="handleDeletes(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end" v-if="pager.lists.length < pager.count">
<pagination v-model="pager" @change="getLists" />
</div>
</div>
</el-tab-pane>
</el-tabs>
</el-drawer>
<el-dialog v-model="dialogShop" title="追加商品" width="1500">
<el-form ref="formRef" :model="updateInfo" label-width="90px">
<div class="mb-2">
<el-button type="primary" @click="showProduct = true">添加商品</el-button>
</div>
<el-table :data="productList">
<el-table-column label="商品ID" prop="id" show-overflow-tooltip v-if="formData.financial_pm == 1" />
<el-table-column label="商品ID" prop="product_id" show-overflow-tooltip v-else />
<el-table-column label="商品图片" prop="image" min-width="80">
<template #default="{ row }">
<el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
</template>
</el-table-column>
<el-table-column label="商品名称" prop="store_name" min-width="160" show-overflow-tooltip />
<el-table-column label="分类" prop="cate_name" min-width="80" show-overflow-tooltip />
<el-table-column label="单位" prop="unit_name" min-width="60" show-overflow-tooltip />
<template v-if="formData.financial_pm == 1">
<el-table-column label="数量" width="100">
<template #default="{ row }">
<el-input v-model="row.num" @change="handleChange(row)" />
</template>
</el-table-column>
<el-table-column label="价格" width="100">
<template #default="{ row }">
<el-input v-model="row.purchases" @change="handleChange(row)" />
</template>
</el-table-column>
<el-table-column label="总价" width="100">
<template #default="{ row }">
<el-input v-model="row.total_price" />
</template>
</el-table-column>
<el-table-column label="供应商" width="140">
<template #default="{ row }">
<el-select v-model="row.supplier_id" filterable remote reserve-keyword
placeholder="输入供应商名称搜索" remote-show-suffix :remote-method="remoteMethodSupplier"
:loading="supplierLoading" style="width: 120px">
<el-option v-for="item in supplierList" :key="item.id" :label="item.mer_name"
:value="item.id" />
</el-select>
</template>
</el-table-column>
<el-table-column label="付款方式" min-width="180">
<template #default="{ row }">
<el-radio-group v-model="row.pay_type">
<el-radio :label="1" :value="1">赊账</el-radio>
<el-radio :label="2" :value="2">现金</el-radio>
</el-radio-group>
</template>
</el-table-column>
</template>
<template v-else>
<el-table-column label="商品价格" prop="price" min-width="100" show-overflow-tooltip />
<el-table-column label="库存" prop="stock" min-width="100" show-overflow-tooltip />
<el-table-column label="分配库存" min-width="150">
<template #default="{ row }">
<el-input v-model="row.num" />
</template>
</el-table-column>
</template>
<el-table-column label="生产日期" prop="manufacture" width="160">
<template #default="{ row }">
<el-date-picker v-model="row.manufacture" type="date" clearable value-format="YYYY-MM-DD"
placeholder="请输入生产日期" />
</template>
</el-table-column>
<el-table-column label="保质期" prop="expiration_date" width="160">
<template #default="{ row }">
<el-date-picker v-model="row.expiration_date" type="date" clearable value-format="YYYY-MM-DD"
placeholder="请输入保质期" />
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button type="danger" link @click="handleDeleteProdut(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogShop = false">取消</el-button>
<el-button type="primary" @click="goodsOfferUpdate"> 确认 </el-button>
</div>
</template>
</el-dialog>
<el-dialog v-model="showProduct" title="选择商品" width="70%">
<product-pop @onBindStore="onBindProduct" :warehouse_id="warehouse_id"
:is_warehouse="is_warehouse"></product-pop>
</el-dialog>
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
</template> </template>
<script lang="ts" setup name="psiWarehouseOrderDETAILS"> <script lang="ts" setup name="storeOrderDETAILS">
import type { FormInstance } from 'element-plus' import { ElMessage, type FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue' import Popup from '@/components/popup/index.vue'
import { apiPsiWarehouseOrderAdd, apiPsiWarehouseOrderEdit, apiPsiWarehouseOrderDetail } from '@/api/psi/warehouse_order' import { apiWarehouseProductLists, apiWarehouseProductDelete } from '@/api/psi/warehouse_product'
import { timeFormat } from '@/utils/util' import {
import type { PropType } from 'vue' apiWarehouseOrderRentryExport,
defineProps({ apiWarehouseOrderExport,
apiWarehouseOrderEdit,
apiWarehouseOrderExportTags
} from '@/api/psi/warehouse_order'
import type { PropType } from 'vue'
import { usePaging } from '@/hooks/usePaging'
import { useRoute } from 'vue-router'
import feedback from '@/utils/feedback'
import EditPopup from './editProduct.vue'
import { apiSupplierLists } from '@/api/psi/supplier'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
const route = useRoute()
defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
default: () => ({}) default: () => ({})
} }
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
//
const formData = reactive({
id: '',
warehouse_id: '',
supplier_id: '',
store_id: '',
oid: '',
order_type: '',
code: '',
admin_id: '',
batch: '',
mark: '',
nums: '',
purchase: '',
total_price: '',
completed_amount: '',
outstanding_amount: '',
status: '',
})
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiPsiWarehouseOrderDetail({
id: row.id
}) })
setFormData(data)
}
// const emit = defineEmits(['success', 'close'])
const open = () => { const showDialog = ref(false)
popupRef.value?.open() const dialogShop = ref(false)
} const activeName = ref('second')
const warehouse_id = ref(0)
const is_warehouse = ref(0)
const financial_pm = ref(0)
//
const formData = ref({
id: '',
code: '',
total_price: '',
supplier_name: '',
warehouse_name: '',
system_store: '',
pay_type: '',
supplier_id: '',
financial_pm: '',
manufacture: '',
expiration_date: ''
})
const updateInfo = ref({})
const goodsOfferUpdate = () => {
const product_arr = productList.value.map((item : any) => {
if (financial_pm.value == 1) {
return {
id: item.id,
supplier_id: item.supplier_id || 0,
pay_type: item.pay_type || 0,
nums: item.num || 0,
purchase: item.purchases || 0,
prices: item.purchase || 0,
total_price: item.total_price || 0,
manufacture: item.manufacture,
expiration_date: item.expiration_date
}
} else {
return {
id: item.product_id,
nums: item.num || 0,
purchase: item.purchases || 0,
prices: item.purchase || 0,
total_price: item.total_price || 0,
manufacture: item.manufacture,
expiration_date: item.expiration_date
}
}
})
apiWarehouseOrderEdit({
id: queryParams.oid,
product_arr: product_arr
}).then((res) => {
dialogShop.value = false
getLists()
})
}
const queryParams = reactive({
oid: '',
pay_type: ''
})
//
const setFormData = async (data : Record<any, any>) => {
formData.value = { ...data }
}
// const getDetail = async (row : Record<string, any>) => {
const handleClose = () => { formData.value = { ...row }
emit('close') queryParams.oid = row.id
} warehouse_id.value = row.warehouse_id
if (row.financial_pm == 0) {
is_warehouse.value = 1
} else {
financial_pm.value = 1
}
productList.value = []
// setFormData(data)
getLists()
}
const xlsx = (id, type) => {
if (formData.value.financial_pm == 1) {
apiWarehouseOrderRentryExport({
id: id
}).then((res) => {
window.open(res.url, '_blank')
ElMessage.success('导出成功')
})
} else {
apiWarehouseOrderExport({
id: id,
type: type
}).then((res) => {
window.open(res.url, '_blank')
ElMessage.success('导出成功')
})
}
}
const showProduct = ref(false) //
//
const productList = ref([])
//
const handleDeleteProdut = (id : number) => {
productList.value = productList.value.filter((item : any) => item.id !== id)
}
//
const onBindProduct = (e : any[]) => {
e.forEach((item : any) => {
if (!productList.value.find((t : any) => t.id == item.id)) {
item.manufacture = ''
item.expiration_date = ''
productList.value.push(item)
}
})
showProduct.value = false
}
function handleChange(row) {
row.total_price = row.num * row.purchases
}
const isSubmit = ref(true)
const handleStock = () => {
// const counts = storeList.value.length
defineExpose({ const product_arr = productList.value.map((item : any) => {
return {
id: item.product_id,
stock: item.new_stock || 0,
stocks: item.stock || 0
}
})
if (product_arr.length > 0) {
try {
product_arr.forEach((item) => {
const stock = item.stock * 1
if (stock > item.stocks) {
isSubmit.value = false
throw new Error('超出仓库库存,请重新设置')
}
})
} catch (e) {
ElMessage.error('超出仓库库存,请重新设置')
return
}
}
isSubmit.value = true
}
//
const handleEdit = async (data : any) => {
console.log(data)
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDeletes = async (id : number | any[]) => {
await feedback.confirm('确定要删除?')
await apiWarehouseProductDelete({ id })
getLists()
}
const supplierLoading = ref(false)
const supplierList = ref([])
const remoteMethodSupplier = (e = '') => {
supplierLoading.value = true
apiSupplierLists({ mer_name: e })
.then((res) => {
supplierList.value = res.lists
setTimeout(() => {
supplierLoading.value = false
}, 300)
})
.catch((err) => {
setTimeout(() => {
supplierLoading.value = false
}, 300)
})
}
//
const open = () => {
showDialog.value = true
}
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiWarehouseProductLists,
params: queryParams
})
const xlsx2 = (id) => {
apiWarehouseOrderExportTags({
id: id
}).then((res) => {
window.open(res.url, '_blank')
ElMessage.success('导出成功')
})
}
defineExpose({
open, open,
setFormData, setFormData,
getDetail getDetail
}) })
</script> </script>

View File

@ -1,72 +1,16 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
ref="popupRef" @close="handleClose">
:title="popupTitle" <el-form ref="formRef" :model="formData" label-width="90px">
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="仓库" prop="warehouse_id">
<el-input v-model="formData.warehouse_id" clearable placeholder="请输入仓库" :readonly="false"/>
</el-form-item>
<el-form-item label="供应商" prop="supplier_id">
<el-input v-model="formData.supplier_id" clearable placeholder="请输入供应商" :readonly="false"/>
</el-form-item>
<el-form-item label="门店" prop="store_id">
<el-input v-model="formData.store_id" clearable placeholder="请输入门店" :readonly="false"/>
</el-form-item>
<el-form-item label="订单id" prop="oid">
<el-input v-model="formData.oid" clearable placeholder="请输入订单id" :readonly="false"/>
</el-form-item>
<el-form-item label="订单类型" prop="order_type">
<el-select class="flex-1" v-model="formData.order_type" clearable placeholder="请选择订单类型" :disabled="false">
<el-option
v-for="(item, index) in dictData.product_type"
:key="index"
:label="item.name"
:value="parseInt(item.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="单号" prop="code">
<el-input v-model="formData.code" clearable placeholder="请输入单号" :readonly="false"/>
</el-form-item>
<el-form-item label="填写人员" prop="admin_id">
<el-input v-model="formData.admin_id" clearable placeholder="请输入填写人员" :readonly="false"/>
</el-form-item>
<el-form-item label="批次" prop="batch">
<el-input v-model="formData.batch" clearable placeholder="请输入批次" :readonly="false"/>
</el-form-item>
<el-form-item label="备注" prop="mark">
<el-input v-model="formData.mark" clearable placeholder="请输入备注" :readonly="false"/>
</el-form-item>
<el-form-item label="数量" prop="nums">
<el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="false"/>
</el-form-item>
<el-form-item label="供货价" prop="purchase">
<el-input v-model="formData.purchase" clearable placeholder="请输入供货价" :readonly="false"/>
</el-form-item>
<el-form-item label="总价格" prop="total_price">
<el-input v-model="formData.total_price" clearable placeholder="请输入总价格" :readonly="false"/>
</el-form-item>
<el-form-item label="已结金额" prop="completed_amount"> <el-form-item label="已结金额" prop="completed_amount">
<el-input v-model="formData.completed_amount" clearable placeholder="请输入已结金额" :readonly="false"/> <el-input v-model="formData.completed_amount" clearable placeholder="请输入总价格" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="未结金额" prop="outstanding_amount"> <el-form-item label="未结金额" prop="outstanding_amount">
<el-input v-model="formData.outstanding_amount" clearable placeholder="请输入未结金额" :readonly="false"/> <el-input v-model="formData.outstanding_amount" clearable placeholder="请输入未结金额" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="总价格" prop="total_price">
<el-select class="flex-1" v-model="formData.status" clearable placeholder="请选择状态" :disabled="false"> <el-input v-model="formData.total_price" clearable placeholder="请输入总价格" :readonly="false" />
<el-option
v-for="(item, index) in dictData.warehouse_produc_pm"
:key="index"
:label="item.name"
:value="parseInt(item.value)"
/>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
</popup> </popup>
@ -74,116 +18,76 @@
</template> </template>
<script lang="ts" setup name="psiWarehouseOrderEdit"> <script lang="ts" setup name="psiWarehouseOrderEdit">
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue' import Popup from '@/components/popup/index.vue'
import { apiPsiWarehouseOrderAdd, apiPsiWarehouseOrderEdit, apiPsiWarehouseOrderDetail } from '@/api/psi/warehouse_order' import { apiWarehouseOrderUpdateAmount, apiWarehouseOrderEdit, apiWarehouseOrderDetail } from '@/api/psi/warehouse_order'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue' import type { PropType } from 'vue'
defineProps({ defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
default: () => ({}) default: () => ({})
} }
}) })
const emit = defineEmits(['success', 'close']) const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add') const mode = ref('add')
// //
const popupTitle = computed(() => { const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑入库订单' : '新增入库订单' return mode.value == 'edit' ? '编辑入库订单' : '新增入库订单'
}) })
// //
const formData = reactive({ const formData = reactive({
id: '', id: '',
warehouse_id: '',
supplier_id: '',
store_id: '',
oid: '',
order_type: '',
code: '',
admin_id: '',
batch: '',
mark: '',
nums: '',
purchase: '',
total_price: '', total_price: '',
completed_amount: '',
outstanding_amount: '', outstanding_amount: '',
status: '', completed_amount: ''
}) })
//
// const setFormData = async (data : Record<any, any>) => {
const formRules = reactive<any>({
batch: [{
required: true,
message: '请输入批次',
trigger: ['blur']
}],
total_price: [{
required: true,
message: '请输入总价格',
trigger: ['blur']
}],
status: [{
required: true,
message: '请选择状态',
trigger: ['blur']
}],
})
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) { for (const key in formData) {
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
//@ts-ignore //@ts-ignore
formData[key] = data[key] formData[key] = data[key]
} }
} }
}
const getDetail = async (row : Record<string, any>) => {
} const data = await apiWarehouseOrderDetail({
const getDetail = async (row: Record<string, any>) => {
const data = await apiPsiWarehouseOrderDetail({
id: row.id id: row.id
}) })
setFormData(data) setFormData(data)
} }
//
// const handleSubmit = async () => {
const handleSubmit = async () => {
await formRef.value?.validate() await formRef.value?.validate()
const data = { ...formData, } const data = { ...formData, }
mode.value == 'edit' await apiWarehouseOrderUpdateAmount(data)
? await apiPsiWarehouseOrderEdit(data)
: await apiPsiWarehouseOrderAdd(data)
popupRef.value?.close() popupRef.value?.close()
emit('success') emit('success')
} }
// //
const open = (type = 'add') => { const open = (type = 'add') => {
mode.value = type mode.value = type
popupRef.value?.open() popupRef.value?.open()
} }
// //
const handleClose = () => { const handleClose = () => {
emit('close') emit('close')
} }
defineExpose({
defineExpose({
open, open,
setFormData, setFormData,
getDetail getDetail
}) })
</script> </script>

View File

@ -0,0 +1,163 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="商品名称" prop="store_name">
<el-input v-model="formData.store_name" disabled />
</el-form-item>
<el-form-item label="供应商">
<el-select v-model="formData.supplier_id" filterable remote reserve-keyword placeholder="输入供应商名称搜索"
remote-show-suffix :remote-method="remoteMethodSupplier" :loading="supplierLoading"
style="width: 240px">
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="数量" prop="nums">
<el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="false"
@change="handleChange()" />
</el-form-item>
<el-form-item label="采购价" prop="purchase">
<el-input v-model="formData.purchase" clearable placeholder="请输入采购价" :readonly="false"
@change="handleChange()" />
</el-form-item>
<el-form-item label="总价格" prop="total_price">
<el-input v-model="formData.total_price" clearable placeholder="请输入总价格" :readonly="false" />
</el-form-item>
<el-form-item label="生产日期" prop="manufacture">
<el-date-picker v-model="formData.manufacture" type="date" clearable value-format="YYYY-MM-DD"
placeholder="请输入生产日期" />
</el-form-item>
<el-form-item label="保质期" prop="expiration_date">
<el-date-picker v-model="formData.expiration_date" type="date" clearable value-format="YYYY-MM-DD"
placeholder="请输入保质期" />
</el-form-item>
<el-form-item label="付款方式" prop="pay_type">
<el-radio-group v-model="formData.pay_type">
<el-radio :label="1" :value="1">赊账</el-radio>
<el-radio :label="2" :value="2">现金</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="warehouseOrderEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiWarehouseOrderDetail } from '@/api/psi/warehouse_order'
import { apiWarehouseProductEdit } from '@/api/psi/warehouse_product'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
import { apiSupplierLists } from '@/api/psi/supplier'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑商品' : '新增商品仓储订单'
})
//
const formData = reactive({
id: '',
oid: '',
supplier_id: '',
store_name: '',
total_price: '',
nums: '',
pay_type: '',
purchase: '',
price: '',
manufacture: '',
expiration_date: ''
})
//
const formRules = reactive<any>({
warehouse_id: [
{
required: true,
message: '请输入仓库',
trigger: ['blur']
}
],
total_price: [
{
required: true,
message: '请输入总价格',
trigger: ['blur']
}
]
})
function handleChange() {
if (formData.nums > 0 && formData.purchase > 0) {
formData.total_price = (parseFloat(formData.purchase) * parseFloat(formData.nums)).toFixed(
2
)
}
}
//
const setFormData = async (data : Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
remoteMethodSupplier()
}
const supplierLoading = ref(false)
const supplierList = ref([])
const remoteMethodSupplier = (e = '') => {
supplierLoading.value = true
apiSupplierLists({ mer_name: e })
.then((res) => {
supplierList.value = res.lists
setTimeout(() => {
supplierLoading.value = false
}, 300)
})
.catch((err) => {
setTimeout(() => {
supplierLoading.value = false
}, 300)
})
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData }
await apiWarehouseProductEdit(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData
})
</script>

View File

@ -1,50 +1,32 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form <el-form class="mb-[-16px]" :model="queryParams" inline>
class="mb-[-16px]" <el-form-item class="w-[220px]" label="仓库" prop="warehouse_id">
:model="queryParams" <el-select v-model="queryParams.warehouse_id" filterable clearable placeholder="请选择仓库"
inline style="width: 240px">
> <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
<el-form-item label="仓库" prop="warehouse_id"> </el-select>
<el-input class="w-[280px]" v-model="queryParams.warehouse_id" clearable placeholder="请输入仓库" />
</el-form-item> </el-form-item>
<el-form-item label="门店" prop="store_id"> <el-form-item class="w-[220px]" label="门店" prop="store_id">
<el-input class="w-[280px]" v-model="queryParams.store_id" clearable placeholder="请输入门店" /> <el-select v-model="queryParams.store_id" filterable clearable placeholder="请选择门店"
style="width: 240px">
<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单id" prop="oid"> <el-form-item label="订单id" prop="oid">
<el-input class="w-[280px]" v-model="queryParams.oid" clearable placeholder="请输入订单id" /> <el-input class="w-[280px]" v-model="queryParams.oid" clearable placeholder="请输入订单id" />
</el-form-item> </el-form-item>
<el-form-item label="订单类型" prop="order_type"> <el-form-item label="订单类型" prop="order_type" class="w-[220px]">
<el-select <el-select v-model="queryParams.order_type" clearable placeholder="请选择订单类型">
v-model="queryParams.order_type" clearable placeholder="请选择订单类型">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option <el-option v-for="(item, index) in enums.orderType" :key="index" :label="item.label"
v-for="(item, index) in dictData.product_type" :value="item.value" />
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="单号" prop="code"> <el-form-item label="单号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入单号" /> <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入单号" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status" clearable placeholder="请选择状态">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in dictData.warehouse_produc_pm"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="create_time">
<el-input class="w-[280px]" v-model="queryParams.create_time" clearable placeholder="请输入" />
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button> <el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button> <el-button @click="resetParams">重置</el-button>
@ -52,60 +34,32 @@
</el-form> </el-form>
</el-card> </el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['psi_warehouse_order/add']" type="primary" @click="handleAdd"> <router-link v-perms="['warehousing']" :to="{
<template #icon> path: 'warehousing'
<icon name="el-icon-Plus" /> }" class="ml-4">
</template> <el-button type="primary"> 入库 </el-button>
新增 </router-link>
</el-button>
<el-button
v-perms="['psi_warehouse_order/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="ID" prop="id" show-overflow-tooltip /> <el-table-column label="ID" prop="id" show-overflow-tooltip />
<el-table-column label="仓库" prop="warehouse_id" show-overflow-tooltip /> <el-table-column label="仓库" prop="warehouse_name" show-overflow-tooltip />
<el-table-column label="供应商" prop="supplier_id" show-overflow-tooltip /> <el-table-column label="订单类型" prop="order_type_name" />
<el-table-column label="门店" prop="store_id" show-overflow-tooltip /> <el-table-column label="单号" prop="code" show-overflow-tooltip min-width="100" />
<el-table-column label="订单id" prop="oid" show-overflow-tooltip />
<el-table-column label="订单类型" prop="order_type">
<template #default="{ row }">
<dict-value :options="dictData.product_type" :value="row.order_type" />
</template>
</el-table-column>
<el-table-column label="单号" prop="code" show-overflow-tooltip />
<el-table-column label="备注" prop="mark" show-overflow-tooltip />
<el-table-column label="数量" prop="nums" show-overflow-tooltip />
<el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
<el-table-column label="总价格" prop="total_price" show-overflow-tooltip /> <el-table-column label="总价格" prop="total_price" show-overflow-tooltip />
<el-table-column label="已结金额" prop="completed_amount" show-overflow-tooltip /> <el-table-column label="已结" prop="completed_amount" show-overflow-tooltip />
<el-table-column label="未结金额" prop="outstanding_amount" show-overflow-tooltip /> <el-table-column label="未结" prop="outstanding_amount" show-overflow-tooltip />
<el-table-column label="状态" prop="status"> <el-table-column label="操作时间" prop="create_time" show-overflow-tooltip min-width="90" />
<template #default="{ row }"> <el-table-column label="备注" prop="mark" show-overflow-tooltip />
<dict-value :options="dictData.warehouse_produc_pm" :value="row.status" />
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button type="primary" link @click="handleDetai(row)">详情</el-button>
v-perms="['psi_warehouse_order/edit']" <el-button v-perms="['psi/warehouse_order/edit']" type="primary" link
type="primary" @click="handleEdit(row)">
link
@click="handleEdit(row)"
>
编辑 编辑
</el-button> </el-button>
<el-button <el-button v-perms="['psi/warehouse_order/delete']" type="danger" link
v-perms="['psi_warehouse_order/delete']" @click="handleDelete(row.id)">
type="danger"
link
@click="handleDelete(row.id)"
>
删除 删除
</el-button> </el-button>
</template> </template>
@ -117,24 +71,32 @@
</div> </div>
</el-card> </el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<details-popup v-if="showDetails" ref="detailsRef" @success="getLists" @close="showDetails = false"
:dictData="dictData" />
</div> </div>
</template> </template>
<script lang="ts" setup name="psiWarehouseOrderLists"> <script lang="ts" setup name="psiWarehouseOrderLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiPsiWarehouseOrderLists, apiPsiWarehouseOrderDelete } from '@/api/psi/warehouse_order' import { apiWarehouseOrderLists, apiWarehouseOrderDelete } from '@/api/psi/warehouse_order'
import { timeFormat } from '@/utils/util' import { apiWarehouseLists } from '@/api/psi/warehouse'
import feedback from '@/utils/feedback' import { apiSystemStoreLists } from '@/api/system_store'
import EditPopup from './edit.vue' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import DetailsPopup from './details.vue'
import enums from '@/utils/enums'
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// //
const showEdit = ref(false) const showEdit = ref(false)
const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
const showDetails = ref(false)
// //
const queryParams = reactive({ const queryParams = reactive({
warehouse_id: '', warehouse_id: '',
store_id: '', store_id: '',
oid: '', oid: '',
@ -142,47 +104,69 @@ const queryParams = reactive({
code: '', code: '',
status: '', status: '',
create_time: '', create_time: '',
}) })
// //
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])
// //
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val : any[]) => {
selectData.value = val.map(({ id }) => id) selectData.value = val.map(({ id }) => id)
} }
// //
const { dictData } = useDictData('product_type,warehouse_produc_pm') const { dictData } = useDictData('product_type,warehouse_produc_pm')
// //
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiPsiWarehouseOrderLists, fetchFun: apiWarehouseOrderLists,
params: queryParams params: queryParams
}) })
// const warehouseList = ref([])
const handleAdd = async () => { const getWarehouseList = () => {
apiWarehouseLists({}).then(res => {
warehouseList.value = res.lists
})
}
const storeList = ref([])
const getStoreList = () => {
apiSystemStoreLists({}).then(res => {
storeList.value = res.lists
})
}
const handleDetai = async (data : any) => {
showDetails.value = true
await nextTick()
detailsRef.value?.open()
detailsRef.value?.getDetail(data)
}
//
const handleAdd = async () => {
showEdit.value = true showEdit.value = true
await nextTick() await nextTick()
editRef.value?.open('add') editRef.value?.open('add')
} }
// //
const handleEdit = async (data: any) => { const handleEdit = async (data : any) => {
showEdit.value = true showEdit.value = true
await nextTick() await nextTick()
editRef.value?.open('edit') editRef.value?.open('edit')
editRef.value?.setFormData(data) editRef.value?.setFormData(data)
} }
// //
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id : number | any[]) => {
await feedback.confirm('确定要删除?') await feedback.confirm('确定要删除?')
await apiPsiWarehouseOrderDelete({ id }) await apiWarehouseOrderDelete({ id })
getLists() getLists()
} }
getLists() getWarehouseList()
getStoreList()
getLists()
</script> </script>

View File

@ -1,125 +1,120 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
ref="popupRef" @close="handleClose">
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="仓库" prop="warehouse_id"> <el-form-item label="仓库" prop="warehouse_id">
<el-input v-model="formData.warehouse_id" clearable placeholder="请输入仓库" :readonly="false"/> <el-input v-model="formData.warehouse_id" clearable placeholder="请输入仓库" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="供应商" prop="supplier_id"> <el-form-item label="供应商" prop="supplier_id">
<el-input v-model="formData.supplier_id" clearable placeholder="请输入供应商" :readonly="false"/> <el-input v-model="formData.supplier_id" clearable placeholder="请输入供应商" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="门店" prop="store_id"> <el-form-item label="门店" prop="store_id">
<el-input v-model="formData.store_id" clearable placeholder="请输入门店" :readonly="false"/> <el-input v-model="formData.store_id" clearable placeholder="请输入门店" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="订单类型" prop="order_type"> <el-form-item label="订单类型" prop="order_type">
<el-input v-model="formData.order_type" clearable placeholder="请输入订单类型" :readonly="false"/> <el-input v-model="formData.order_type" clearable placeholder="请输入订单类型" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="商品" prop="product_id"> <el-form-item label="商品" prop="product_id">
<el-input v-model="formData.product_id" clearable placeholder="请输入商品" :readonly="false"/> <el-input v-model="formData.product_id" clearable placeholder="请输入商品" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="unit"> <el-form-item label="单位" prop="unit">
<el-input v-model="formData.unit" clearable placeholder="请输入单位" :readonly="false"/> <el-input v-model="formData.unit" clearable placeholder="请输入单位" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="入库单ID" prop="oid"> <el-form-item label="入库单ID" prop="oid">
<el-input v-model="formData.oid" clearable placeholder="请输入入库单ID" :readonly="false"/> <el-input v-model="formData.oid" clearable placeholder="请输入入库单ID" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="入库单号" prop="code"> <el-form-item label="入库单号" prop="code">
<el-input v-model="formData.code" clearable placeholder="请输入入库单号" :readonly="false"/> <el-input v-model="formData.code" clearable placeholder="请输入入库单号" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="生产日期" prop="manufacture"> <el-form-item label="生产日期" prop="manufacture">
<el-input v-model="formData.manufacture" clearable placeholder="请输入生产日期" :readonly="false"/> <el-input v-model="formData.manufacture" clearable placeholder="请输入生产日期" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="保质期" prop="expiration_date"> <el-form-item label="保质期" prop="expiration_date">
<el-input v-model="formData.expiration_date" clearable placeholder="请输入保质期" :readonly="false"/> <el-input v-model="formData.expiration_date" clearable placeholder="请输入保质期" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="填写人员" prop="admin_id"> <el-form-item label="填写人员" prop="admin_id">
<el-input v-model="formData.admin_id" clearable placeholder="请输入填写人员" :readonly="false"/> <el-input v-model="formData.admin_id" clearable placeholder="请输入填写人员" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="确认人员" prop="enter_admin_id"> <el-form-item label="确认人员" prop="enter_admin_id">
<el-input v-model="formData.enter_admin_id" clearable placeholder="请输入确认人员" :readonly="false"/> <el-input v-model="formData.enter_admin_id" clearable placeholder="请输入确认人员" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="门店确认人员" prop="staff_id"> <el-form-item label="门店确认人员" prop="staff_id">
<el-input v-model="formData.staff_id" clearable placeholder="请输入门店确认人员" :readonly="false"/> <el-input v-model="formData.staff_id" clearable placeholder="请输入门店确认人员" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="批次" prop="batch"> <el-form-item label="批次" prop="batch">
<el-input v-model="formData.batch" clearable placeholder="请输入批次" :readonly="false"/> <el-input v-model="formData.batch" clearable placeholder="请输入批次" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="数量" prop="nums"> <el-form-item label="数量" prop="nums">
<el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="false"/> <el-input v-model="formData.nums" clearable placeholder="请输入数量" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="退货数量" prop="refund_nums"> <el-form-item label="退货数量" prop="refund_nums">
<el-input v-model="formData.refund_nums" clearable placeholder="请输入退货数量" :readonly="false"/> <el-input v-model="formData.refund_nums" clearable placeholder="请输入退货数量" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="更新前库存" prop="before_nums"> <el-form-item label="更新前库存" prop="before_nums">
<el-input v-model="formData.before_nums" clearable placeholder="请输入更新前库存" :readonly="false"/> <el-input v-model="formData.before_nums" clearable placeholder="请输入更新前库存" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="更新后库存" prop="after_nums"> <el-form-item label="更新后库存" prop="after_nums">
<el-input v-model="formData.after_nums" clearable placeholder="请输入更新后库存" :readonly="false"/> <el-input v-model="formData.after_nums" clearable placeholder="请输入更新后库存" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="mark"> <el-form-item label="备注" prop="mark">
<el-input v-model="formData.mark" clearable placeholder="请输入备注" :readonly="false"/> <el-input v-model="formData.mark" clearable placeholder="请输入备注" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="零售价格" prop="price"> <el-form-item label="零售价格" prop="price">
<el-input v-model="formData.price" clearable placeholder="请输入零售价格" :readonly="false"/> <el-input v-model="formData.price" clearable placeholder="请输入零售价格" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="总价格" prop="total_price"> <el-form-item label="总价格" prop="total_price">
<el-input v-model="formData.total_price" clearable placeholder="请输入总价格" :readonly="false"/> <el-input v-model="formData.total_price" clearable placeholder="请输入总价格" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="供货价" prop="purchase"> <el-form-item label="供货价" prop="purchase">
<el-input v-model="formData.purchase" clearable placeholder="请输入供货价" :readonly="false"/> <el-input v-model="formData.purchase" clearable placeholder="请输入供货价" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="商户价" prop="cost"> <el-form-item label="商户价" prop="cost">
<el-input v-model="formData.cost" clearable placeholder="请输入商户价" :readonly="false"/> <el-input v-model="formData.cost" clearable placeholder="请输入商户价" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="会员价" prop="vip_price"> <el-form-item label="会员价" prop="vip_price">
<el-input v-model="formData.vip_price" clearable placeholder="请输入会员价" :readonly="false"/> <el-input v-model="formData.vip_price" clearable placeholder="请输入会员价" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="是否结清" prop="is_pay"> <el-form-item label="是否结清" prop="is_pay">
<el-input v-model="formData.is_pay" clearable placeholder="请输入是否结清" :readonly="false"/> <el-input v-model="formData.is_pay" clearable placeholder="请输入是否结清" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="支付方式" prop="pay_type"> <el-form-item label="支付方式" prop="pay_type">
<el-input v-model="formData.pay_type" clearable placeholder="请输入支付方式" :readonly="false"/> <el-input v-model="formData.pay_type" clearable placeholder="请输入支付方式" :readonly="false" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-input v-model="formData.status" clearable placeholder="请输入状态" :readonly="false"/> <el-input v-model="formData.status" clearable placeholder="请输入状态" :readonly="false" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</popup> </popup>
</div> </div>
</template> </template>
<script lang="ts" setup name="psiWarehouseProductEdit"> <script lang="ts" setup name="psiWarehouseProductEdit">
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue' import Popup from '@/components/popup/index.vue'
import { apiPsiWarehouseProductAdd, apiPsiWarehouseProductEdit, apiPsiWarehouseProductDetail } from '@/api/psi/warehouse_product' import { apiWarehouseProductAdd, apiWarehouseProductEdit, apiWarehouseProductDetail } from '@/api/psi/warehouse_product'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue' import type { PropType } from 'vue'
defineProps({ defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
default: () => ({}) default: () => ({})
} }
}) })
const emit = defineEmits(['success', 'close']) const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add') const mode = ref('add')
// //
const popupTitle = computed(() => { const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑仓库商品入库信息' : '新增仓库商品入库信息' return mode.value == 'edit' ? '编辑仓库商品入库信息' : '新增仓库商品入库信息'
}) })
// //
const formData = reactive({ const formData = reactive({
id: '', id: '',
warehouse_id: '', warehouse_id: '',
supplier_id: '', supplier_id: '',
@ -148,11 +143,12 @@ const formData = reactive({
is_pay: '', is_pay: '',
pay_type: '', pay_type: '',
status: '', status: '',
})
})
// //
const formRules = reactive<any>({ const formRules = reactive<any>({
product_id: [{ product_id: [{
required: true, required: true,
message: '请输入商品', message: '请输入商品',
@ -183,11 +179,11 @@ const formRules = reactive<any>({
message: '请输入状态', message: '请输入状态',
trigger: ['blur'] trigger: ['blur']
}], }],
}) })
// //
const setFormData = async (data: Record<any, any>) => { const setFormData = async (data : Record<any, any>) => {
for (const key in formData) { for (const key in formData) {
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
//@ts-ignore //@ts-ignore
@ -196,43 +192,43 @@ const setFormData = async (data: Record<any, any>) => {
} }
} }
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row : Record<string, any>) => {
const data = await apiPsiWarehouseProductDetail({ const data = await apiWarehouseProductDetail({
id: row.id id: row.id
}) })
setFormData(data) setFormData(data)
} }
// //
const handleSubmit = async () => { const handleSubmit = async () => {
await formRef.value?.validate() await formRef.value?.validate()
const data = { ...formData, } const data = { ...formData, }
mode.value == 'edit' mode.value == 'edit'
? await apiPsiWarehouseProductEdit(data) ? await apiWarehouseProductEdit(data)
: await apiPsiWarehouseProductAdd(data) : await apiWarehouseProductAdd(data)
popupRef.value?.close() popupRef.value?.close()
emit('success') emit('success')
} }
// //
const open = (type = 'add') => { const open = (type = 'add') => {
mode.value = type mode.value = type
popupRef.value?.open() popupRef.value?.open()
} }
// //
const handleClose = () => { const handleClose = () => {
emit('close') emit('close')
} }
defineExpose({ defineExpose({
open, open,
setFormData, setFormData,
getDetail getDetail
}) })
</script> </script>

View File

@ -1,11 +1,7 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form <el-form class="mb-[-16px]" :model="queryParams" inline>
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="仓库" prop="warehouse_id"> <el-form-item label="仓库" prop="warehouse_id">
<el-input class="w-[280px]" v-model="queryParams.warehouse_id" clearable placeholder="请输入仓库" /> <el-input class="w-[280px]" v-model="queryParams.warehouse_id" clearable placeholder="请输入仓库" />
</el-form-item> </el-form-item>
@ -33,6 +29,7 @@
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" /> <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button> <el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button> <el-button @click="resetParams">重置</el-button>
@ -46,11 +43,8 @@
</template> </template>
新增 新增
</el-button> </el-button>
<el-button <el-button v-perms="['psi_warehouse_product/delete']" :disabled="!selectData.length"
v-perms="['psi_warehouse_product/delete']" @click="handleDelete(selectData)">
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除 删除
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
@ -74,22 +68,15 @@
<el-table-column label="供货价" prop="purchase" show-overflow-tooltip /> <el-table-column label="供货价" prop="purchase" show-overflow-tooltip />
<el-table-column label="支付方式" prop="pay_type" show-overflow-tooltip /> <el-table-column label="支付方式" prop="pay_type" show-overflow-tooltip />
<el-table-column label="状态" prop="status" show-overflow-tooltip /> <el-table-column label="状态" prop="status" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button v-perms="['psi_warehouse_product/edit']" type="primary" link
v-perms="['psi_warehouse_product/edit']" @click="handleEdit(row)">
type="primary"
link
@click="handleEdit(row)"
>
编辑 编辑
</el-button> </el-button>
<el-button <el-button v-perms="['psi_warehouse_product/delete']" type="danger" link
v-perms="['psi_warehouse_product/delete']" @click="handleDelete(row.id)">
type="danger"
link
@click="handleDelete(row.id)"
>
删除 删除
</el-button> </el-button>
</template> </template>
@ -105,20 +92,20 @@
</template> </template>
<script lang="ts" setup name="psiWarehouseProductLists"> <script lang="ts" setup name="psiWarehouseProductLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiPsiWarehouseProductLists, apiPsiWarehouseProductDelete } from '@/api/psi/warehouse_product' import { apiWarehouseProductLists, apiWarehouseProductDelete } from '@/api/psi/warehouse_product'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import EditPopup from './edit.vue' import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// //
const showEdit = ref(false) const showEdit = ref(false)
// //
const queryParams = reactive({ const queryParams = reactive({
warehouse_id: '', warehouse_id: '',
supplier_id: '', supplier_id: '',
store_id: '', store_id: '',
@ -128,47 +115,46 @@ const queryParams = reactive({
code: '', code: '',
pay_type: '', pay_type: '',
status: '', status: '',
}) })
// //
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])
// //
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val : any[]) => {
selectData.value = val.map(({ id }) => id) selectData.value = val.map(({ id }) => id)
} }
// //
const { dictData } = useDictData('product_type') const { dictData } = useDictData('product_type')
// //
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiPsiWarehouseProductLists, fetchFun: apiWarehouseProductLists,
params: queryParams params: queryParams
}) })
// //
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true showEdit.value = true
await nextTick() await nextTick()
editRef.value?.open('add') editRef.value?.open('add')
} }
// //
const handleEdit = async (data: any) => { const handleEdit = async (data : any) => {
showEdit.value = true showEdit.value = true
await nextTick() await nextTick()
editRef.value?.open('edit') editRef.value?.open('edit')
editRef.value?.setFormData(data) editRef.value?.setFormData(data)
} }
// //
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id : number | any[]) => {
await feedback.confirm('确定要删除?') await feedback.confirm('确定要删除?')
await apiPsiWarehouseProductDelete({ id }) await apiWarehouseProductDelete({ id })
getLists() getLists()
} }
getLists() getLists()
</script> </script>

View File

@ -0,0 +1,213 @@
<template>
<el-card>
<div class="mb-4 text-lg font-bold">商品入库操作</div>
<div>
<el-form ref="formRef" :model="formData" label-width="90px">
<el-form-item label="仓库" prop="uid">
<el-select v-model="formData.warehouse_id" style="width: 240px">
<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="供应商" prop="supplier_id">
<el-select v-model="formData.supplier_id" filterable remote reserve-keyword placeholder="输入供应商名称搜索"
remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading"
style="width: 240px">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="总价" prop="total_price">
<el-input v-model="formData.total_price" clearable placeholder="请输入总价" :readonly="false"
style="width: 240px" />
</el-form-item>
<el-form-item label="已结金额" prop="completed_amount">
<el-input v-model="formData.completed_amount" clearable placeholder="请输入已结金额" :readonly="false"
style="width: 240px" />
</el-form-item>
<el-form-item label="未结金额" prop="outstanding_amount">
<el-input v-model="formData.outstanding_amount" clearable placeholder="请输入未接金额" :readonly="false"
style="width: 240px" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="formData.remark" type="input" rows="4" />
</el-form-item>
<el-form-item label="商品" prop="store_id">
<div class="flex-1 w-full">
<div class="mb-2">
<el-button type="primary" @click="showProduct = true">添加商品</el-button>
</div>
<el-table :data="productList">
<el-table-column label="商品ID" prop="id" show-overflow-tooltip />
<el-table-column label="商品图片" prop="image" min-width="80">
<template #default="{ row }">
<el-image style="width: 50px; height: 50px" :src="row.image"
:preview-teleported="true" />
</template>
</el-table-column>
<el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
<el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
<el-table-column label="生产日期" min-width="240">
<template #default="{ row }">
<el-date-picker :readonly="false" class="flex-1 !flex" v-model="row.manufacture"
clearable type="datetime" value-format="YYYY-MM-DD" placeholder="选择生产日期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="保质期" min-width="240">
<template #default="{ row }">
<el-date-picker :readonly="false" class="flex-1 !flex" v-model="row.expiration_date"
clearable type="datetime" value-format="YYYY-MM-DD" placeholder="选择保质期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="数量" min-width="150">
<template #default="{ row }">
<el-input v-model="row.nums" @change="handleChange(row)" />
</template>
</el-table-column>
<el-table-column label="价格" min-width="150">
<template #default="{ row }">
<el-input v-model="row.purchases" @change="handleChange(row)" />
</template>
</el-table-column>
<el-table-column label="总价" min-width="150">
<template #default="{ row }">
<el-input v-model="row.total_price" />
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button type="danger" link @click="handleDeleteProdut(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-form-item>
<el-form-item label="">
<el-button @click="handleSubmit" type="primary" class="w-40">提交</el-button>
</el-form-item>
</el-form>
</div>
<el-dialog v-model="showProduct" title="选择商品" width="70%">
<product-pop @onBindStore="onBindProduct"></product-pop>
</el-dialog>
</el-card>
</template>
<script lang="ts" setup name="storeProductEdit">
import { ElMessage, type FormInstance } from 'element-plus'
import useMultipleTabs from '@/hooks/useMultipleTabs'
import { apiStoreProductImport } from '@/api/store_product'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
import { onMounted } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { apiWarehouseOrderAdd } from '@/api/psi/warehouse_order'
import { apiWarehouseLists } from '@/api/psi/warehouse'
import { apiSupplierLists } from '@/api/psi/supplier'
const route = useRoute()
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const { removeTab } = useMultipleTabs()
const warehouseList = ref([])
//
const formData = reactive({
total_price: '',
warehouse_id: '',
supplier_id: '',
code: '',
total_price: 0,
remark: '',
outstanding_amount: 0,
completed_amount: 0
})
const warehouse = () => {
apiWarehouseLists({}).then((res) => {
warehouseList.value = res.lists
})
}
const showProduct = ref(false) //
//
const productList = ref([])
//
const handleDeleteProdut = (id : number) => {
productList.value = productList.value.filter((item : any) => item.id !== id)
}
//
const onBindProduct = (e : any[]) => {
e.forEach((item : any) => {
if (!productList.value.find((t : any) => t.id == item.id)) {
productList.value.push(item)
}
})
showProduct.value = false
}
const userloading = ref(false)
const userList = ref([])
const remoteMethodUser = (e = '') => {
userloading.value = true
apiSupplierLists({ mer_name: e })
.then((res) => {
userList.value = res.lists
setTimeout(() => {
userloading.value = false
}, 300)
})
.catch((err) => {
setTimeout(() => {
userloading.value = false
}, 300)
})
}
function handleChange(row) {
row.total_price = row.nums * row.purchases
if (row.total_price > 0) {
formData.total_price = parseFloat(formData.total_price) + parseFloat(row.total_price)
}
}
const router = useRouter()
//
const handleSubmit = async () => {
const product_arr = productList.value.map((item : any) => {
return {
product_id: item.id,
nums: item.nums,
purchase: item.purchases || 0,
total_price: item.total_price || 0,
manufacture: item.manufacture,
expiration_date: item.expiration_date
}
})
apiWarehouseOrderAdd({
product_arr,
...formData
}).then((res) => {
// removeTab()
// if (res.code == 1) {
// ElMessage.success(res.msg)
setTimeout(() => {
router.push({
path: '/warehouse/warehouse_order'
})
}, 2000)
// } else {
// ElMessage.error(res.msg)
// }
})
}
warehouse()
</script>