调拨订单添加追加和导出

src/api/inventory_transfer_order.ts

@@ -29,3 +29,8 @@ export function apiInventoryTransferOrderDetail(params: any) {
 export function apiInventoryTransferOrderAudit(params: any) {
     return request.post({ url: '/inventory_transfer_order/inventorytransferorder/audit', params })
 }
+
+// 商品调拨订单导出
+export function apiInventoryTransferOrderExport(params: any) {
+    return request.get({ url: '/inventory_transfer_order/inventorytransferorder/export', params })
+}

src/views/inventory_transfer_order/details.vue

@@ -1,67 +1,167 @@
 <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>
+		<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-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-tabs v-model="activeName" class="demo-tabs" type="border-card" @tab-click="handleClick">
-            <el-tab-pane label="订单信息" name="first">
-                <orderInfo :datas="formData" ref="productRef"></orderInfo>
-            </el-tab-pane>
-        </el-tabs> -->
-        <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>
 </template>
 
 <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 type { PropType } from 'vue'
+	import { apiInventoryTransferAdd } from '@/api/inventory_transfer'
-import orderInfo from './components/orderInfo.vue'
+	import type { PropType } from '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 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 formData = ref({
+	const handleDeleteProdut = (id : number) => {
-    id: ''
+		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 setFormData = async (data: Record<any, any>) => {
+	const handleSubmit = () => {
-    formData.value = { ...data }
+		const product_arr = productList.value.map((item : any) => {
-}
+			return {
-const handleClick = (tab: any) => {
+				id: item.id,
-    productRef.value?.getList({ oid: formData.value.id })
+				nums: item.num || 0,
-}
+			}
-const getDetail = async (row: Record<string, any>) => {
+		})
-    formData.value.id = row.id
+		let data = {
-    const data = await apiInventoryTransferOrderDetail({
+			oid: formData.value.id,
-        id: row.id
+			product_arr: product_arr
-    })
+		}
-    setFormData(data)
+		apiInventoryTransferAdd(data).then((res) => {
-}
+			dialogShop.value = false
+			getDetail({id: formData.value.id})
+		})
+	}
 
-//打开弹窗
+	// 表单数据
-const open = () => {
+	const formData = ref({
-    showDialog.value = true
+		id: '',
-}
+		order_id: '',
+		create_time: '',
+		one_name: '',
+		type_name: '',
+		two_name: '',
+		product_list: []
+	})
 
-defineExpose({
+	// 获取详情
-    open,
+	const setFormData = async (data : Record<any, any>) => {
-    setFormData,
+		formData.value = { ...data }
-    getDetail
+	}
-})
+	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 open = () => {
+		showDialog.value = true
+	}
+
+	defineExpose({
+		open,
+		setFormData,
+		getDetail
+	})
 </script>

src/views/inventory_transfer_order/index.vue

@@ -21,7 +21,6 @@
 			</el-button>
 			<div class="mt-4">
 				<el-table :data="pager.lists" @selection-change="handleSelectionChange">
-					<el-table-column type="selection" width="55" />
 					<el-table-column label="订单" prop="order_id" show-overflow-tooltip />
 					<el-table-column label="转出方" prop="one_name" show-overflow-tooltip />
 					<el-table-column label="方式" prop="type_name" show-overflow-tooltip />
@@ -33,6 +32,7 @@
 					<el-table-column label="操作" width="160" fixed="right">
 						<template #default="{ row }">
 							<el-button type="primary" link @click="handleDetai(row)">详情</el-button>
+							<el-button type="primary" link @click="exportXsl(row)">导出</el-button>
 							<el-button v-if="row.status == 0" v-perms="[
                                     'inventory_transfer_order.inventory_transfer_order/audit'
                                 ]" type="warning" link @click="handleAudit(row.id)">
@@ -60,10 +60,12 @@
 <script lang="ts" setup name="inventoryTransferOrderLists">
 	import { usePaging } from '@/hooks/usePaging'
 	import { useDictData } from '@/hooks/useDictOptions'
+	import { ElMessage } from 'element-plus'
 	import {
 		apiInventoryTransferOrderLists,
 		apiInventoryTransferOrderAudit,
-		apiInventoryTransferOrderDelete
+		apiInventoryTransferOrderDelete,
+		apiInventoryTransferOrderExport
 	} from '@/api/inventory_transfer_order'
 	import { timeFormat } from '@/utils/util'
 	import feedback from '@/utils/feedback'
@@ -132,6 +134,15 @@
 		getLists()
 	}
 
+	const exportXsl = (row) => {
+		apiInventoryTransferOrderExport({
+			id: row.id
+		}).then((res) => {
+			window.open(res.url, '_blank')
+			ElMessage.success('导出成功')
+		})
+	}
+
 	onMounted(() => {
 		if (route.query.id) {
 			queryParams.id = route.query.id