修改库存调拨商品列表,预订单添加同步价格

This commit is contained in:
lewis 2025-01-15 15:04:42 +08:00
parent 0412b0bfc3
commit c8e40ce7ec
5 changed files with 249 additions and 298 deletions

View File

@ -58,3 +58,8 @@ export function apiBeforehandOrderCartInfoFix(params: any) {
params params
}) })
} }
// 同步商品价格
export function apiBeforehandOrderCartInfoSyncPrice(params: any) {
return request.get({ url: '/beforehand_order_cart_info/beforehandordercartinfo/syncPrice', params })
}

View File

@ -13,7 +13,7 @@
<el-form-item label="转出门店" prop="one_id" v-if="formData.one_type == 1"> <el-form-item label="转出门店" prop="one_id" v-if="formData.one_type == 1">
<el-select v-model="formData.one_id" filterable remote reserve-keyword placeholder="请选择转出方" <el-select v-model="formData.one_id" filterable remote reserve-keyword placeholder="请选择转出方"
remote-show-suffix :remote-method="remoteMethodStore" :loading="storeloading" remote-show-suffix :remote-method="remoteMethodStore" :loading="storeloading"
style="width: 300px"> @change="changeStore" style="width: 300px">
<el-option v-for="item in storeList" :key="item.id" <el-option v-for="item in storeList" :key="item.id"
:label="`${item.name}|${item.phone} (ID:${item.id})`" :value="item.id" /> :label="`${item.name}|${item.phone} (ID:${item.id})`" :value="item.id" />
</el-select> </el-select>
@ -21,7 +21,7 @@
<el-form-item label="转出仓库" prop="one_id" v-if="formData.one_type == 2"> <el-form-item label="转出仓库" prop="one_id" v-if="formData.one_type == 2">
<el-select v-model="formData.one_id" filterable remote reserve-keyword placeholder="请选择转出方" <el-select v-model="formData.one_id" filterable remote reserve-keyword placeholder="请选择转出方"
remote-show-suffix :remote-method="remoteMethodWarehouse" :loading="warehouseloading" remote-show-suffix :remote-method="remoteMethodWarehouse" :loading="warehouseloading"
style="width: 300px"> @change="changeWarehouse" style="width: 300px">
<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" <el-option v-for="item in warehouseList" :key="item.id" :label="item.name"
:value="item.id" /> :value="item.id" />
</el-select> </el-select>
@ -81,7 +81,8 @@
</el-form> </el-form>
</div> </div>
<el-dialog v-model="showProduct" title="选择商品" width="70%"> <el-dialog v-model="showProduct" title="选择商品" width="70%">
<product-pop @onBindStore="onBindProduct"></product-pop> <product-pop @onBindStore="onBindProduct" :is_branch="1" :store_id="store_id"
:warehouse_id="warehouse_id" :is_warehouse="is_warehouse" :key="productModalKey"></product-pop>
</el-dialog> </el-dialog>
</popup> </popup>
</div> </div>
@ -106,6 +107,8 @@
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add') const mode = ref('add')
const store_id = ref(0) // id const store_id = ref(0) // id
const warehouse_id = ref(0) //id
const is_warehouse = ref(0) //
// //
const formData = reactive({ const formData = reactive({
@ -146,6 +149,17 @@
showProduct.value = false showProduct.value = false
} }
const changeStore = (e : any) => {
store_id.value = e
resetUserId()
}
const changeWarehouse = (e : any) => {
warehouse_id.value = e
is_warehouse.value = 1
resetUserId()
}
const storeloading = ref(false) const storeloading = ref(false)
const storeList = ref([]) const storeList = ref([])
const remoteMethodStore = (e = '') => { const remoteMethodStore = (e = '') => {
@ -191,7 +205,7 @@
expiration_date: item.expiration_date expiration_date: item.expiration_date
} }
}) })
const data = { product_arr,...formData } const data = { product_arr, ...formData }
await formRef.value?.validate() await formRef.value?.validate()
mode.value == 'edit' mode.value == 'edit'
? await apiInventoryTransferEdit(data) ? await apiInventoryTransferEdit(data)
@ -217,6 +231,11 @@
setFormData(data) setFormData(data)
} }
const productModalKey = ref(0)
const resetUserId = () => {
productModalKey.value++
}
defineExpose({ defineExpose({
open, open,
setFormData, setFormData,

View File

@ -12,6 +12,7 @@
<el-form-item> <el-form-item>
<!-- <el-button type="primary" @click="fixAcceptNum">修复分拣数量</el-button> --> <!-- <el-button type="primary" @click="fixAcceptNum">修复分拣数量</el-button> -->
<el-button type="primary" @click="resetPage">查询</el-button> <el-button type="primary" @click="resetPage">查询</el-button>
<el-button type="primary" @click="syncPrice">同步价格</el-button>
<export-data <export-data
class="ml-2.5" class="ml-2.5"
:fetch-fun="apiBeforehandOrderCartInfoLists" :fetch-fun="apiBeforehandOrderCartInfoLists"
@ -194,7 +195,8 @@ import {
apiBeforehandOrderCartInfoLists, apiBeforehandOrderCartInfoLists,
apiBeforehandOrderCartInfoDelete, apiBeforehandOrderCartInfoDelete,
apiBeforehandOrderCartInfoProcurementStatus, apiBeforehandOrderCartInfoProcurementStatus,
apiBeforehandOrderCartInfoFix apiBeforehandOrderCartInfoFix,
apiBeforehandOrderCartInfoSyncPrice
} from '@/api/beforehand_order_cart_info' } from '@/api/beforehand_order_cart_info'
import { apiDeliveryServiceLists } from '@/api/delivery_service' import { apiDeliveryServiceLists } from '@/api/delivery_service'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
@ -323,6 +325,13 @@ const fixAcceptNum = () => {
}) })
} }
const syncPrice = async() => {
await apiBeforehandOrderCartInfoSyncPrice({
bhoid: formData.value.id
})
getLists()
}
onMounted(() => { onMounted(() => {
queryParams.bhoid = route.query.id queryParams.bhoid = route.query.id
formData.value.id = route.query.id formData.value.id = route.query.id

View File

@ -88,7 +88,13 @@
placeholder="请选择订单类型" placeholder="请选择订单类型"
@change="resetPage" @change="resetPage"
> >
<el-option label="普通订单" value="1" />
<el-option label="批发订单" value="4" /> <el-option label="批发订单" value="4" />
<el-option label="铺货订单" value="11" />
<el-option label="摊贩订单" value="12" />
<el-option label="一条龙订单" value="13" />
<el-option label="仓库补货" value="15" />
<el-option label="其他订单" value="17" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

View File

@ -1,29 +1,16 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline> <el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="商品名称" prop="store_name"> <el-form-item label="商品名称" prop="store_name">
<el-input <el-input class="w-[280px]" @keydown.enter="resetPage" v-model="queryParams.store_name" clearable
class="w-[280px]" placeholder="请输入商品名称" />
@keydown.enter="resetPage" </el-form-item>
v-model="queryParams.store_name" <el-form-item label="商品分类" prop="store_name">
clearable <el-cascader class="w-[280px]" v-model="queryParams.class_all" filterable clearable
placeholder="请输入商品名称" :before-filter="beforeFilter" :props="props" placeholder="请选择商品分类" @change="resetPage" />
/> </el-form-item>
</el-form-item> <!-- <el-form-item label="商品条码" prop="bar_code">
<el-form-item label="商品分类" prop="store_name">
<el-cascader
class="w-[280px]"
v-model="queryParams.class_all"
filterable
clearable
:before-filter="beforeFilter"
:props="props"
placeholder="请选择商品分类"
@change="resetPage"
/>
</el-form-item>
<!-- <el-form-item label="商品条码" prop="bar_code">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="queryParams.bar_code" v-model="queryParams.bar_code"
@ -31,284 +18,209 @@
placeholder="请输入商品条码" placeholder="请输入商品条码"
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item label="排序" prop="order_by"> <el-form-item label="排序" prop="order_by">
<el-select <el-select v-model="queryParams.order_by" placeholder="请选择排序" style="width: 240px"
v-model="queryParams.order_by" @change="resetPage">
placeholder="请选择排序" <el-option v-for="item in [
style="width: 240px"
@change="resetPage"
>
<el-option
v-for="item in [
{ id: 'asc', name: '升序' }, { id: 'asc', name: '升序' },
{ id: 'desc', name: '降序' } { id: 'desc', name: '降序' }
]" ]" :key="item.id" :label="item.name" :value="item.id" />
:key="item.id" </el-select>
:label="item.name" </el-form-item>
:value="item.id" <el-form-item>
/> <el-button type="primary" @click="resetPage">查询</el-button>
</el-select> <el-button @click="resetParams">重置</el-button>
</el-form-item> <export-data class="ml-2.5" :fetch-fun="apiWarehouseProductStoregeLists" :params="queryParams"
<el-form-item> :page-size="pager.size" />
<el-button type="primary" @click="resetPage">查询</el-button> </el-form-item>
<el-button @click="resetParams">重置</el-button> </el-form>
<export-data </el-card>
class="ml-2.5" <el-card class="!border-none" v-loading="pager.loading" shadow="never">
:fetch-fun="apiWarehouseProductStoregeLists" <router-link :to="{
:params="queryParams"
:page-size="pager.size"
/>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<router-link
:to="{
path: 'import', path: 'import',
query: { warehouse_id: queryParams.warehouse_id } query: { warehouse_id: queryParams.warehouse_id }
}" }" class="ml-4">
class="ml-4" <el-button type="primary"> 出库 </el-button>
> </router-link>
<el-button type="primary"> 出库 </el-button> <div class="mt-4">
</router-link> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<div class="mt-4"> <el-table-column type="selection" width="55" />
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table-column label="id" prop="id" show-overflow-tooltip />
<el-table-column type="selection" width="55" /> <el-table-column label="商品图片" prop="image" min-width="80">
<el-table-column label="id" prop="id" show-overflow-tooltip /> <template #default="{ row }">
<el-table-column label="商品图片" prop="image" min-width="80"> <el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
<template #default="{ row }"> </template>
<el-image </el-table-column>
style="width: 50px; height: 50px" <el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
:src="row.image" <el-table-column label="分类" prop="cate_name" min-width="120" show-overflow-tooltip />
:preview-teleported="true" <el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
/> <el-table-column label="供货价" prop="purchase" min-width="100" show-overflow-tooltip />
</template> <el-table-column label="商户价" prop="cost" min-width="120" show-overflow-tooltip />
</el-table-column> <el-table-column label="终端零售价" prop="price" min-width="120" show-overflow-tooltip />
<el-table-column <el-table-column label="规格" prop="store_info" min-width="100" show-overflow-tooltip />
label="商品名称" <el-table-column label="毛利率" prop="rose" min-width="100" show-overflow-tooltip />
prop="store_name" <el-table-column label="库存" prop="nums" min-width="100" show-overflow-tooltip />
min-width="200" <el-table-column label="价值" prop="total_price" min-width="200" show-overflow-tooltip />
show-overflow-tooltip <el-table-column label="操作" width="120" fixed="right">
/> <template #default="{ row }">
<el-table-column <el-button link @click="resetProductStoregeClick(row)" v-perms="[
label="分类"
prop="cate_name"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
label="单位"
prop="unit_name"
min-width="80"
show-overflow-tooltip
/>
<el-table-column
label="供货价"
prop="purchase"
min-width="100"
show-overflow-tooltip
/>
<el-table-column
label="商户价"
prop="cost"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
label="终端零售价"
prop="price"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
label="规格"
prop="store_info"
min-width="100"
show-overflow-tooltip
/>
<el-table-column
label="毛利率"
prop="rose"
min-width="100"
show-overflow-tooltip
/>
<el-table-column
label="库存"
prop="nums"
min-width="100"
show-overflow-tooltip
/>
<el-table-column
label="价值"
prop="total_price"
min-width="200"
show-overflow-tooltip
/>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
link
@click="resetProductStoregeClick(row)"
v-perms="[
'warehouse_product_storege.warehouse_product_storege/edit' 'warehouse_product_storege.warehouse_product_storege/edit'
]" ]">
> 重置数量
重置数量 </el-button>
</el-button> </template>
</template> </el-table-column>
</el-table-column> </el-table>
</el-table> </div>
</div> <div class="flex mt-4 justify-end">
<div class="flex mt-4 justify-end"> <pagination v-model="pager" @change="getLists" />
<pagination v-model="pager" @change="getLists" /> </div>
</div> </el-card>
</el-card> <!-- <Details ref="detailsRef"></Details> -->
<!-- <Details ref="detailsRef"></Details> --> </div>
</div> <el-dialog v-model="resetProductStoregeShow" title="重置数量" width="600">
<el-dialog v-model="resetProductStoregeShow" title="重置数量" width="600"> <el-form :model="formData" label-width="90px">
<el-form :model="formData" label-width="90px"> <el-form-item label="商品名称" prop="store_name">
<el-form-item label="商品名称" prop="store_name"> <el-input v-model="formData.store_name" clearable :readonly="false" disabled />
<el-input v-model="formData.store_name" clearable :readonly="false" disabled /> </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 :readonly="false" placeholder="请输入数量" />
<el-input </el-form-item>
v-model="formData.nums" <el-form-item label="备注" prop="remark">
clearable <el-input v-model="formData.remark" clearable :readonly="false" placeholder="请输入数量" />
:readonly="false" </el-form-item>
placeholder="请输入数量" </el-form>
/> <template #footer>
</el-form-item> <div class="dialog-footer">
</el-form> <el-button @click="resetProductStoregeShow = false">取消</el-button>
<template #footer> <el-button type="primary" @click="resetProductStorege"> 确认 </el-button>
<div class="dialog-footer"> </div>
<el-button @click="resetProductStoregeShow = false">取消</el-button> </template>
<el-button type="primary" @click="resetProductStorege"> 确认 </el-button> </el-dialog>
</div>
</template>
</el-dialog>
</template> </template>
<script lang="ts" setup name="storeProductLists"> <script lang="ts" setup name="storeProductLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { import {
apiWarehouseProductStoregeLists, apiWarehouseProductStoregeLists,
apiWarehouseProductStoregeEdit apiWarehouseProductStoregeEdit
} from '@/api/warehouse_product_storege' } from '@/api/warehouse_product_storege'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
// import Details from './details.vue' // import Details from './details.vue'
import { apiStoreCategoryLists } from '@/api/store_category' import { apiStoreCategoryLists } from '@/api/store_category'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
const route = useRoute() const route = useRoute()
const resetProductStoregeShow = ref(false) const resetProductStoregeShow = ref(false)
const formData = ref({ const formData = ref({
id: '', id: '',
store_name: '', store_name: '',
nums: '' nums: '',
}) remark: ''
// })
const queryParams = reactive({ //
store_name: '', const queryParams = reactive({
class_all: '', store_name: '',
warehouse_id: '', class_all: '',
bar_code: '', warehouse_id: '',
order_by: '', bar_code: '',
field: 'nums' order_by: '',
}) field: 'nums'
})
// //
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('') const { dictData } = useDictData('')
// //
let page_no = 1 let page_no = 1
if (route.query.page_no) { if (route.query.page_no) {
page_no = parseInt(route.query.page_no) page_no = parseInt(route.query.page_no)
} }
if (route.query.id) { if (route.query.id) {
queryParams.warehouse_id = parseInt(route.query.id) queryParams.warehouse_id = parseInt(route.query.id)
} }
console.log(route.query.id) console.log(route.query.id)
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
page: page_no, page: page_no,
fetchFun: apiWarehouseProductStoregeLists, fetchFun: apiWarehouseProductStoregeLists,
params: queryParams params: queryParams
}) })
const resetProductStoregeClick = (data: any) => { const resetProductStoregeClick = (data : any) => {
resetProductStoregeShow.value = true resetProductStoregeShow.value = true
formData.value.id = data.id formData.value.id = data.id
formData.value.store_name = data.store_name formData.value.store_name = data.store_name
formData.value.nums = data.nums formData.value.nums = data.nums
} }
const resetProductStorege = (data: any) => { const resetProductStorege = (data : any) => {
resetProductStoregeShow.value = false resetProductStoregeShow.value = false
if (formData.value.id <= 0) { if (formData.value.id <= 0) {
ElMessage.error('id不能为空') ElMessage.error('id不能为空')
return false return false
} }
apiWarehouseProductStoregeEdit(formData.value).then((res) => { apiWarehouseProductStoregeEdit(formData.value).then((res) => {
getLists() getLists()
}) })
} }
let resolves let resolves
let nodes let nodes
const flag = ref(false) const flag = ref(false)
let name let name
const beforeFilter = (value) => { const beforeFilter = (value) => {
name = value name = value
flag.value = true flag.value = true
props.lazyLoad(nodes, resolves) props.lazyLoad(nodes, resolves)
return false return false
} }
const props = { const props = {
value: 'id', value: 'id',
label: 'name', label: 'name',
emitPath: false, emitPath: false,
lazy: true, lazy: true,
lazyLoad(node, resolve) { lazyLoad(node, resolve) {
if (!resolves) resolves = resolve if (!resolves) resolves = resolve
if (!nodes) nodes = node if (!nodes) nodes = node
const pid = node.value || 0 const pid = node.value || 0
let data = {} let data = {}
if (flag.value) { if (flag.value) {
data = { name: name } data = { name: name }
if (!name) { if (!name) {
data = { data = {
pid: pid, pid: pid,
page_size: 10000 page_size: 10000
} }
} }
} else { } else {
data = { data = {
pid: pid, pid: pid,
page_size: 10000 page_size: 10000
} }
} }
apiStoreCategoryLists({ apiStoreCategoryLists({
...data ...data
}).then((res) => { }).then((res) => {
resolve( resolve(
res.lists.map((item: any) => { res.lists.map((item : any) => {
// item.leaf = item.is_children == 0; // item.leaf = item.is_children == 0;
item.leaf = true item.leaf = true
flag.value = false flag.value = false
return item return item
}) })
) )
}) })
} }
} }
onMounted(() => { onMounted(() => {
getLists() getLists()
}) })
</script> </script>