mkm/moreShopAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调拨订单备注

Browse Source
This commit is contained in:
sjeam 2025-04-09 13:40:16 +08:00
parent ac6841985e
commit bf6d965210
2 changed files with 193 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

313
src/views/inventory_transfer_order/details.vue
View File

@ -1,168 +1,175 @@
<template> <template>
<el-drawer v-model="showDialog" title="订单详情" :size="1000"> <el-drawer v-model="showDialog" title="订单详情" :size="1000">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<div>订单编号：{{ formData.order_id }}</div> <div>订单编号：{{ formData.order_id }}</div>
<div>创建时间</div> <div>创建时间</div>
<div>{{ formData.create_time }}</div> <div>{{ formData.create_time }}</div>
</div> </div>
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<div>转出方：{{ formData.one_name }}</div> <div>转出方：{{ formData.one_name }}</div>
<div>方式:{{ formData.type_name }}</div> <div>方式:{{ formData.type_name }}</div>
<div>转入方：{{ formData.two_name }}</div> <div>转入方：{{ formData.two_name }}</div>
</div> </div>
<el-button type="primary" @click="dialogShop = true"> <el-button type="primary" @click="dialogShop = true">
追加 追加
</el-button> </el-button>
<el-table :data="formData.product_list"> <el-table :data="formData.product_list">
<el-table-column label="商品" prop="store_name" show-overflow-tooltip /> <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
<el-table-column label="数量" prop="nums" show-overflow-tooltip /> <el-table-column label="数量" prop="nums" show-overflow-tooltip />
</el-table> <el-table-column label="备注" prop="remark" show-overflow-tooltip />
</el-drawer> </el-table>
</el-drawer>
<el-dialog v-model="dialogShop" title="追加商品" width="1500"> <el-dialog v-model="dialogShop" title="追加商品" width="1500">
<el-form ref="formRef" :model="updateInfo" label-width="90px"> <el-form ref="formRef" :model="updateInfo" label-width="90px">
<div class="mb-2"> <div class="mb-2">
<el-button type="primary" @click="resetProductModalKey()">添加商品</el-button> <el-button type="primary" @click="resetProductModalKey()">添加商品</el-button>
</div> </div>
<el-table :data="productList"> <el-table :data="productList">
<el-table-column label="商品ID" prop="product_id" show-overflow-tooltip /> <el-table-column label="商品ID" prop="product_id" show-overflow-tooltip />
<el-table-column label="商品图片" prop="image" min-width="80"> <el-table-column label="商品图片" prop="image" min-width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" /> <el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品名称" prop="store_name" min-width="160" show-overflow-tooltip /> <el-table-column label="商品名称" prop="store_name" min-width="160" show-overflow-tooltip />
<el-table-column label="单位" prop="unit_name" min-width="60" show-overflow-tooltip /> <el-table-column label="单位" prop="unit_name" min-width="60" show-overflow-tooltip />
<el-table-column label="数量" width="100"> <el-table-column label="数量" width="100">
<template #default="{ row }"> <template #default="{ row }">
<el-input v-model="row.num" /> <el-input v-model="row.num" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="备注" width="100">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="danger" link @click="handleDeleteProdut(row.id)"> <el-input v-model="row.remark" />
删除 </template>
</el-button> </el-table-column>
</template> <el-table-column label="操作" width="120" fixed="right">
</el-table-column> <template #default="{ row }">
</el-table> <el-button type="danger" link @click="handleDeleteProdut(row.id)">
</el-form> 删除
<template #footer> </el-button>
<div class="dialog-footer"> </template>
<el-button @click="dialogShop = false">取消</el-button> </el-table-column>
<el-button type="primary" @click="handleSubmit"> 确认 </el-button> </el-table>
</div> </el-form>
</template> <template #footer>
</el-dialog> <div class="dialog-footer">
<el-button @click="dialogShop = false">取消</el-button>
<el-dialog v-model="showProduct" title="选择商品" width="70%"> <el-button type="primary" @click="handleSubmit"> 确认 </el-button>
<product-pop @onBindStore="onBindProduct" :is_branch="is_branch" :store_id="store_id" :warehouse_id="warehouse_id" </div>
:is_warehouse="is_warehouse" :key="productModalKey"></product-pop> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="showProduct" title="选择商品" width="70%">
<product-pop @onBindStore="onBindProduct" :is_branch="is_branch" :store_id="store_id" :warehouse_id="warehouse_id"
:is_warehouse="is_warehouse" :key="productModalKey"></product-pop>
</el-dialog>
</template> </template>
<script lang="ts" setup name="storeOrderDETAILS"> <script lang="ts" setup name="storeOrderDETAILS">
import Popup from '@/components/popup/index.vue' import Popup from '@/components/popup/index.vue'
import { apiInventoryTransferOrderDetail } from '@/api/inventory_transfer_order' import { apiInventoryTransferOrderDetail } from '@/api/inventory_transfer_order'
import { apiInventoryTransferAdd } from '@/api/inventory_transfer' import { apiInventoryTransferAdd } from '@/api/inventory_transfer'
import type { PropType } from 'vue' import type { PropType } from 'vue'
import orderInfo from './components/orderInfo.vue' import orderInfo from './components/orderInfo.vue'
const emit = defineEmits(['success', 'close']) const emit = defineEmits(['success', 'close'])
const showDialog = ref(false) const showDialog = ref(false)
const productRef = ref(false) const productRef = ref(false)
const activeName = ref('first') const activeName = ref('first')
const warehouse_id = ref(0) const warehouse_id = ref(0)
const is_warehouse = ref(0) const is_warehouse = ref(0)
const store_id = ref(0) // 门店id const store_id = ref(0) // 门店id
const is_branch = ref(0) // 是否门店 const is_branch = ref(0) // 是否门店
const dialogShop = ref(false) const dialogShop = ref(false)
const showProduct = ref(false) // 选择商品列表是否显示 const showProduct = ref(false) // 选择商品列表是否显示
const productList = ref([]) const productList = ref([])
const productModalKey = ref(0) const productModalKey = ref(0)
const resetProductModalKey = () => { const resetProductModalKey = () => {
productModalKey.value++ productModalKey.value++
showProduct.value = true showProduct.value = true
} }
// 删除已有商品 // 删除已有商品
const handleDeleteProdut = (id : number) => { const handleDeleteProdut = (id: number) => {
productList.value = productList.value.filter((item : any) => item.id !== id) productList.value = productList.value.filter((item: any) => item.id !== id)
} }
const onBindProduct = (e : any[]) => { const onBindProduct = (e: any[]) => {
e.forEach((item : any) => { e.forEach((item: any) => {
if (!productList.value.find((t : any) => t.id == item.id)) { if (!productList.value.find((t: any) => t.id == item.id)) {
item.manufacture = '' item.manufacture = ''
item.expiration_date = '' item.expiration_date = ''
productList.value.push(item) productList.value.push(item)
} }
}) })
showProduct.value = false showProduct.value = false
} }
const updateInfo = ref({}) const updateInfo = ref({})
const handleSubmit = () => { const handleSubmit = () => {
const product_arr = productList.value.map((item : any) => { const product_arr = productList.value.map((item: any) => {
return { return {
id: item.product_id, id: item.product_id,
nums: item.num || 0, nums: item.num || 0,
} remark: item.remark || '',
})
let data = {
oid: formData.value.id,
product_arr: product_arr
}
apiInventoryTransferAdd(data).then((res) => {
dialogShop.value = false
productList.value = []
getDetail({id: formData.value.id})
})
}
// 表单数据 }
const formData = ref({ })
id: '', let data = {
order_id: '', oid: formData.value.id,
create_time: '', product_arr: product_arr
one_name: '', }
type_name: '', apiInventoryTransferAdd(data).then((res) => {
two_name: '', dialogShop.value = false
product_list: [] productList.value = []
}) getDetail({ id: formData.value.id })
})
}
// 获取详情 // 表单数据
const setFormData = async (data : Record<any, any>) => { const formData = ref({
formData.value = { ...data } id: '',
} order_id: '',
const getDetail = async (row : Record<string, any>) => { create_time: '',
formData.value.id = row.id one_name: '',
const data = await apiInventoryTransferOrderDetail({ type_name: '',
id: row.id two_name: '',
}) product_list: []
if (data.one_type == 1) { })
is_branch.value = 1
store_id.value = data.one_id
is_warehouse.value = 0
warehouse_id.value = 0
} else {
is_warehouse.value = 1
warehouse_id.value = data.one_id
is_branch.value = 0
store_id.value = 0
}
setFormData(data)
}
//打开弹窗 // 获取详情
const open = () => { const setFormData = async (data: Record<any, any>) => {
showDialog.value = true formData.value = { ...data }
} }
const getDetail = async (row: Record<string, any>) => {
formData.value.id = row.id
const data = await apiInventoryTransferOrderDetail({
id: row.id
})
if (data.one_type == 1) {
is_branch.value = 1
store_id.value = data.one_id
is_warehouse.value = 0
warehouse_id.value = 0
} else {
is_warehouse.value = 1
warehouse_id.value = data.one_id
is_branch.value = 0
store_id.value = 0
}
setFormData(data)
}
defineExpose({ //打开弹窗
open, const open = () => {
setFormData, showDialog.value = true
getDetail }
})
defineExpose({
open,
setFormData,
getDetail
})
</script> </script>

144
src/views/inventory_transfer_order/edit.vue
View File

@ -1,13 +1,6 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup ref="popupRef" :title="popupTitle" :async="true" width="900px" @confirm="handleSubmit" @close="handleClose">
ref="popupRef"
:title="popupTitle"
:async="true"
width="900px"
@confirm="handleSubmit"
@close="handleClose"
>
<div> <div>
<el-form ref="formRef" :model="formData" label-width="90px"> <el-form ref="formRef" :model="formData" label-width="90px">
<el-form-item label="转出类型"> <el-form-item label="转出类型">
@ -17,45 +10,18 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<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 <el-select v-model="formData.one_id" filterable remote reserve-keyword placeholder="请选择转出方"
v-model="formData.one_id" remote-show-suffix :remote-method="remoteMethodStore" :loading="storeloading"
filterable @change="changeStore" style="width: 300px">
remote <el-option v-for="item in storeList" :key="item.id"
reserve-keyword :label="`${item.name}|${item.phone} (ID:${item.id})`" :value="item.id" />
placeholder="请选择转出方"
remote-show-suffix
:remote-method="remoteMethodStore"
:loading="storeloading"
@change="changeStore"
style="width: 300px"
>
<el-option
v-for="item in storeList"
:key="item.id"
:label="`${item.name}|${item.phone} (ID:${item.id})`"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<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 <el-select v-model="formData.one_id" filterable remote reserve-keyword placeholder="请选择转出方"
v-model="formData.one_id" remote-show-suffix :remote-method="remoteMethodWarehouse" :loading="warehouseloading"
filterable @change="changeWarehouse" style="width: 300px">
remote <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
reserve-keyword
placeholder="请选择转出方"
remote-show-suffix
:remote-method="remoteMethodWarehouse"
:loading="warehouseloading"
@change="changeWarehouse"
style="width: 300px"
>
<el-option
v-for="item in warehouseList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="转入类型"> <el-form-item label="转入类型">
@ -65,43 +31,18 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="转入门店" prop="two_id" v-if="formData.two_type == 1"> <el-form-item label="转入门店" prop="two_id" v-if="formData.two_type == 1">
<el-select <el-select v-model="formData.two_id" filterable remote reserve-keyword placeholder="请选择转入方"
v-model="formData.two_id" remote-show-suffix :remote-method="remoteMethodStore" :loading="storeloading"
filterable style="width: 300px">
remote <el-option v-for="item in storeList" :key="item.id"
reserve-keyword :label="`${item.name}|${item.phone} (ID:${item.id})`" :value="item.id" />
placeholder="请选择转入方"
remote-show-suffix
:remote-method="remoteMethodStore"
:loading="storeloading"
style="width: 300px"
>
<el-option
v-for="item in storeList"
:key="item.id"
:label="`${item.name}|${item.phone} (ID:${item.id})`"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="转入仓库" prop="two_id" v-if="formData.two_type == 2"> <el-form-item label="转入仓库" prop="two_id" v-if="formData.two_type == 2">
<el-select <el-select v-model="formData.two_id" filterable remote reserve-keyword placeholder="请选择转出方"
v-model="formData.two_id" remote-show-suffix :remote-method="remoteMethodWarehouse" :loading="warehouseloading"
filterable style="width: 300px">
remote <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
reserve-keyword
placeholder="请选择转出方"
remote-show-suffix
:remote-method="remoteMethodWarehouse"
:loading="warehouseloading"
style="width: 300px"
>
<el-option
v-for="item in warehouseList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="mark"> <el-form-item label="备注" prop="mark">
@ -116,45 +57,31 @@
<el-form-item label="商品" prop="store_id"> <el-form-item label="商品" prop="store_id">
<div class="flex-1 w-full"> <div class="flex-1 w-full">
<div class="mb-2"> <div class="mb-2">
<el-button type="primary" @click="showProduct = true" <el-button type="primary" @click="showProduct = true">添加商品</el-button>
>添加商品</el-button
>
</div> </div>
<el-table :data="productList"> <el-table :data="productList">
<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="image" min-width="80"> <el-table-column label="商品图片" prop="image" min-width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-image <el-image style="width: 50px; height: 50px" :src="row.image"
style="width: 50px; height: 50px" :preview-teleported="true" />
:src="row.image"
:preview-teleported="true"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
label="商品名称" <el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
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="150"> <el-table-column label="数量" min-width="150">
<template #default="{ row }"> <template #default="{ row }">
<el-input v-model="row.nums" /> <el-input v-model="row.nums" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" min-width="150">
<template #default="{ row }">
<el-input v-model="row.remark" />
</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="danger" link @click="handleDeleteProdut(row.id)">
type="danger"
link
@click="handleDeleteProdut(row.id)"
>
删除 删除
</el-button> </el-button>
</template> </template>
@ -165,14 +92,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 <product-pop @onBindStore="onBindProduct" :is_branch="1" :store_id="store_id" :warehouse_id="warehouse_id"
@onBindStore="onBindProduct" :is_warehouse="is_warehouse" :key="productModalKey"></product-pop>
: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>
@ -292,6 +213,7 @@ const handleSubmit = async () => {
return { return {
product_id: item.product_id, product_id: item.product_id,
nums: item.nums, nums: item.nums,
remark: item.remark,
purchase: item.purchases || 0, purchase: item.purchases || 0,
total_price: item.total_price || 0, total_price: item.total_price || 0,
manufacture: item.manufacture, manufacture: item.manufacture,