From 3ccc06489f1c17d6f1fe4d9555a8fc54a75c036c Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Wed, 12 Mar 2025 11:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/psi/outbound_order.ts             |  8 +--
 src/api/psi/warehouse_order.ts            | 12 +---
 src/views/psi/outbound_order/details.vue  |  2 +-
 src/views/psi/warehouse_order/details.vue | 77 ++++++-----------------
 4 files changed, 24 insertions(+), 75 deletions(-)

diff --git a/src/api/psi/outbound_order.ts b/src/api/psi/outbound_order.ts
index 193bbfe1d..da0edb22c 100644
--- a/src/api/psi/outbound_order.ts
+++ b/src/api/psi/outbound_order.ts
@@ -29,15 +29,11 @@ export function apiOutboundOrderDetail(params: any) {
 export function apiOutboundOrderUpdateAmount(params: any) {
     return request.post({ url: '/outboundorder/updateAmount', params }, { urlPrefix: 'psi' })
 }
-// 导出商品仓储入库订单
-export function apiOutboundOrderRentryExport(params: any) {
-    return request.post({ url: '/outboundorder/rentry_export', params })
-}
 // 导出商品仓储出库订单
 export function apiOutboundOrderExport(params: any) {
-    return request.post({ url: '/outboundorder/export', params })
+    return request.post({ url: '/outboundorder/export', params }, { urlPrefix: 'psi' })
 }
 // 导出商品标签
 export function apiOutboundOrderExportTags(params: any) {
-    return request.post({ url: '/outboundorder/export_tags', params })
+    return request.post({ url: '/outboundorder/export_tags', params }, { urlPrefix: 'psi' })
 }
diff --git a/src/api/psi/warehouse_order.ts b/src/api/psi/warehouse_order.ts
index 945fb735a..53a15bc10 100644
--- a/src/api/psi/warehouse_order.ts
+++ b/src/api/psi/warehouse_order.ts
@@ -29,14 +29,6 @@ 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 })
-}
+    return request.post({ url: '/warehouseorder/export', params }, { urlPrefix: 'psi' })
+}
\ No newline at end of file
diff --git a/src/views/psi/outbound_order/details.vue b/src/views/psi/outbound_order/details.vue
index f2e30094a..2e6b52a1d 100644
--- a/src/views/psi/outbound_order/details.vue
+++ b/src/views/psi/outbound_order/details.vue
@@ -313,7 +313,7 @@
 		params: queryParams
 	})
 	const xlsx2 = (id) => {
-		apiWarehouseOrderExportTags({
+		apiOutboundOrderExportTags({
 			id: id
 		}).then((res) => {
 			window.open(res.url, '_blank')
diff --git a/src/views/psi/warehouse_order/details.vue b/src/views/psi/warehouse_order/details.vue
index 0f61803c1..36d1fd116 100644
--- a/src/views/psi/warehouse_order/details.vue
+++ b/src/views/psi/warehouse_order/details.vue
@@ -5,14 +5,10 @@
 				<div style="color: gray">仓库：</div>
 				<div style="color: black">{{ formData.warehouse_name }}</div>
 			</div>
-			<div class="flex flex-col" v-if="formData.financial_pm == 1">
+			<div class="flex flex-col">
 				<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>
@@ -31,12 +27,10 @@
 			<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 type="primary" @click="dialogShop = true">
 			入库
 		</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">
@@ -83,8 +77,7 @@
 				<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="商品ID" prop="id" show-overflow-tooltip />
 
 				<el-table-column label="商品图片" prop="image" min-width="80">
 					<template #default="{ row }">
@@ -178,7 +171,6 @@
 	import Popup from '@/components/popup/index.vue'
 	import { apiWarehouseProductLists, apiWarehouseProductDelete } from '@/api/psi/warehouse_product'
 	import {
-		apiWarehouseOrderRentryExport,
 		apiWarehouseOrderExport,
 		apiWarehouseOrderEdit,
 		apiWarehouseOrderExportTags
@@ -227,28 +219,16 @@
 	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
-				}
+			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
 			}
 		})
 		apiWarehouseOrderEdit({
@@ -282,22 +262,12 @@
 		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('导出成功')
-			})
-		}
+		apiWarehouseOrderExport({
+			id: id
+		}).then((res) => {
+			window.open(res.url, '_blank')
+			ElMessage.success('导出成功')
+		})
 	}
 	const showProduct = ref(false) // 选择商品列表是否显示
 	// 商品列表
@@ -323,7 +293,6 @@
 	const isSubmit = ref(true)
 
 	const handleStock = () => {
-		// const counts = storeList.value.length
 		const product_arr = productList.value.map((item : any) => {
 			return {
 				id: item.product_id,
@@ -387,14 +356,6 @@
 		fetchFun: apiWarehouseProductLists,
 		params: queryParams
 	})
-	const xlsx2 = (id) => {
-		apiWarehouseOrderExportTags({
-			id: id
-		}).then((res) => {
-			window.open(res.url, '_blank')
-			ElMessage.success('导出成功')
-		})
-	}
 	defineExpose({
 		open,
 		setFormData,