调拨订单备注
This commit is contained in:
parent
ac6841985e
commit
bf6d965210
@ -1,168 +1,175 @@
|
||||
<template>
|
||||
<el-drawer v-model="showDialog" title="订单详情" :size="1000">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>订单编号：{{ formData.order_id }}</div>
|
||||
<div>创建时间</div>
|
||||
<div>{{ formData.create_time }}</div>
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<div>转出方：{{ formData.one_name }}</div>
|
||||
<div>方式:{{ formData.type_name }}</div>
|
||||
<div>转入方：{{ formData.two_name }}</div>
|
||||
</div>
|
||||
<el-drawer v-model="showDialog" title="订单详情" :size="1000">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>订单编号：{{ formData.order_id }}</div>
|
||||
<div>创建时间</div>
|
||||
<div>{{ formData.create_time }}</div>
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<div>转出方：{{ formData.one_name }}</div>
|
||||
<div>方式:{{ formData.type_name }}</div>
|
||||
<div>转入方：{{ formData.two_name }}</div>
|
||||
</div>
|
||||
|
||||
<el-button type="primary" @click="dialogShop = true">
|
||||
追加
|
||||
</el-button>
|
||||
<el-table :data="formData.product_list">
|
||||
<el-table-column label="商品" prop="store_name" show-overflow-tooltip />
|
||||
<el-table-column label="数量" prop="nums" show-overflow-tooltip />
|
||||
</el-table>
|
||||
</el-drawer>
|
||||
<el-button type="primary" @click="dialogShop = true">
|
||||
追加
|
||||
</el-button>
|
||||
<el-table :data="formData.product_list">
|
||||
<el-table-column label="商品" prop="store_name" show-overflow-tooltip />
|
||||
<el-table-column label="数量" prop="nums" show-overflow-tooltip />
|
||||
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
|
||||
</el-table>
|
||||
</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="resetProductModalKey()">添加商品</el-button>
|
||||
</div>
|
||||
<el-table :data="productList">
|
||||
<el-table-column label="商品ID" prop="product_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="160" show-overflow-tooltip />
|
||||
<el-table-column label="单位" prop="unit_name" min-width="60" show-overflow-tooltip />
|
||||
<el-table-column label="数量" width="100">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.num" />
|
||||
</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="handleSubmit"> 确认 </el-button>
|
||||
</div>
|
||||
</template>
|
||||
</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>
|
||||
<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="resetProductModalKey()">添加商品</el-button>
|
||||
</div>
|
||||
<el-table :data="productList">
|
||||
<el-table-column label="商品ID" prop="product_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="160" show-overflow-tooltip />
|
||||
<el-table-column label="单位" prop="unit_name" min-width="60" show-overflow-tooltip />
|
||||
<el-table-column label="数量" width="100">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.num" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" width="100">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.remark" />
|
||||
</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="handleSubmit"> 确认 </el-button>
|
||||
</div>
|
||||
</template>
|
||||
</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>
|
||||
|
||||
<script lang="ts" setup name="storeOrderDETAILS">
|
||||
import Popup from '@/components/popup/index.vue'
|
||||
import { apiInventoryTransferOrderDetail } from '@/api/inventory_transfer_order'
|
||||
import { apiInventoryTransferAdd } from '@/api/inventory_transfer'
|
||||
import type { PropType } from 'vue'
|
||||
import orderInfo from './components/orderInfo.vue'
|
||||
import Popup from '@/components/popup/index.vue'
|
||||
import { apiInventoryTransferOrderDetail } from '@/api/inventory_transfer_order'
|
||||
import { apiInventoryTransferAdd } from '@/api/inventory_transfer'
|
||||
import type { PropType } from 'vue'
|
||||
import orderInfo from './components/orderInfo.vue'
|
||||
|
||||
const emit = defineEmits(['success', 'close'])
|
||||
const showDialog = ref(false)
|
||||
const productRef = ref(false)
|
||||
const activeName = ref('first')
|
||||
const warehouse_id = ref(0)
|
||||
const is_warehouse = ref(0)
|
||||
const store_id = ref(0) // 门店id
|
||||
const is_branch = ref(0) // 是否门店
|
||||
const dialogShop = ref(false)
|
||||
const showProduct = ref(false) // 选择商品列表是否显示
|
||||
const productList = ref([])
|
||||
const productModalKey = ref(0)
|
||||
const resetProductModalKey = () => {
|
||||
productModalKey.value++
|
||||
showProduct.value = true
|
||||
}
|
||||
const emit = defineEmits(['success', 'close'])
|
||||
const showDialog = ref(false)
|
||||
const productRef = ref(false)
|
||||
const activeName = ref('first')
|
||||
const warehouse_id = ref(0)
|
||||
const is_warehouse = ref(0)
|
||||
const store_id = ref(0) // 门店id
|
||||
const is_branch = ref(0) // 是否门店
|
||||
const dialogShop = ref(false)
|
||||
const showProduct = ref(false) // 选择商品列表是否显示
|
||||
const productList = ref([])
|
||||
const productModalKey = ref(0)
|
||||
const resetProductModalKey = () => {
|
||||
productModalKey.value++
|
||||
showProduct.value = true
|
||||
}
|
||||
|
||||
// 删除已有商品
|
||||
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
|
||||
}
|
||||
// 删除已有商品
|
||||
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
|
||||
}
|
||||
|
||||
const updateInfo = ref({})
|
||||
const handleSubmit = () => {
|
||||
const product_arr = productList.value.map((item : any) => {
|
||||
return {
|
||||
id: item.product_id,
|
||||
nums: item.num || 0,
|
||||
}
|
||||
})
|
||||
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 updateInfo = ref({})
|
||||
const handleSubmit = () => {
|
||||
const product_arr = productList.value.map((item: any) => {
|
||||
return {
|
||||
id: item.product_id,
|
||||
nums: item.num || 0,
|
||||
remark: item.remark || '',
|
||||
|
||||
// 表单数据
|
||||
const formData = ref({
|
||||
id: '',
|
||||
order_id: '',
|
||||
create_time: '',
|
||||
one_name: '',
|
||||
type_name: '',
|
||||
two_name: '',
|
||||
product_list: []
|
||||
})
|
||||
}
|
||||
})
|
||||
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 setFormData = async (data : Record<any, any>) => {
|
||||
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)
|
||||
}
|
||||
// 表单数据
|
||||
const formData = ref({
|
||||
id: '',
|
||||
order_id: '',
|
||||
create_time: '',
|
||||
one_name: '',
|
||||
type_name: '',
|
||||
two_name: '',
|
||||
product_list: []
|
||||
})
|
||||
|
||||
//打开弹窗
|
||||
const open = () => {
|
||||
showDialog.value = true
|
||||
}
|
||||
// 获取详情
|
||||
const setFormData = async (data: Record<any, any>) => {
|
||||
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,
|
||||
setFormData,
|
||||
getDetail
|
||||
})
|
||||
//打开弹窗
|
||||
const open = () => {
|
||||
showDialog.value = true
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
open,
|
||||
setFormData,
|
||||
getDetail
|
||||
})
|
||||
</script>
|
||||
@ -1,13 +1,6 @@
|
||||
<template>
|
||||
<div class="edit-popup">
|
||||
<popup
|
||||
ref="popupRef"
|
||||
:title="popupTitle"
|
||||
:async="true"
|
||||
width="900px"
|
||||
@confirm="handleSubmit"
|
||||
@close="handleClose"
|
||||
>
|
||||
<popup ref="popupRef" :title="popupTitle" :async="true" width="900px" @confirm="handleSubmit" @close="handleClose">
|
||||
<div>
|
||||
<el-form ref="formRef" :model="formData" label-width="90px">
|
||||
<el-form-item label="转出类型">
|
||||
@ -17,45 +10,18 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<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="请选择转出方"
|
||||
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 v-model="formData.one_id" filterable remote reserve-keyword 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-form-item>
|
||||
<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="请选择转出方"
|
||||
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 v-model="formData.one_id" filterable remote 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-form-item>
|
||||
<el-form-item label="转入类型">
|
||||
@ -65,43 +31,18 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="转入门店" prop="two_id" v-if="formData.two_type == 1">
|
||||
<el-select
|
||||
v-model="formData.two_id"
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
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 v-model="formData.two_id" filterable remote reserve-keyword 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-form-item>
|
||||
<el-form-item label="转入仓库" prop="two_id" v-if="formData.two_type == 2">
|
||||
<el-select
|
||||
v-model="formData.two_id"
|
||||
filterable
|
||||
remote
|
||||
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 v-model="formData.two_id" filterable remote 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-form-item>
|
||||
<el-form-item label="备注" prop="mark">
|
||||
@ -116,45 +57,31 @@
|
||||
<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
|
||||
>
|
||||
<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"
|
||||
/>
|
||||
<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="商品名称" 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">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.nums" />
|
||||
</template>
|
||||
</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">
|
||||
<template #default="{ row }">
|
||||
<el-button
|
||||
type="danger"
|
||||
link
|
||||
@click="handleDeleteProdut(row.id)"
|
||||
>
|
||||
<el-button type="danger" link @click="handleDeleteProdut(row.id)">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
@ -165,14 +92,8 @@
|
||||
</el-form>
|
||||
</div>
|
||||
<el-dialog v-model="showProduct" title="选择商品" width="70%">
|
||||
<product-pop
|
||||
@onBindStore="onBindProduct"
|
||||
:is_branch="1"
|
||||
:store_id="store_id"
|
||||
:warehouse_id="warehouse_id"
|
||||
:is_warehouse="is_warehouse"
|
||||
:key="productModalKey"
|
||||
></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>
|
||||
</popup>
|
||||
</div>
|
||||
@ -292,6 +213,7 @@ const handleSubmit = async () => {
|
||||
return {
|
||||
product_id: item.product_id,
|
||||
nums: item.nums,
|
||||
remark: item.remark,
|
||||
purchase: item.purchases || 0,
|
||||
total_price: item.total_price || 0,
|
||||
manufacture: item.manufacture,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user