门店入库记录添加退库操作，采购单添加追加商品，调整商品改价列表

src/api/store_product_price.ts

@@ -28,3 +28,7 @@ export function apiStoreProductPriceEnterPrice(params: any) {
 export function apiStoreProductPriceDetail(params: any) {
     return request.get({ url: '/store_product_price/storeproductprice/detail', params })
 }
+
+export function apiStoreProductPriceExport(params: any) {
+    return request.post({ url: '/store_product_price/storeproductprice/export', params })
+}

src/api/system_store_storage.ts

@@ -29,3 +29,7 @@ export function apiSystemStoreStorageDetail(params: any) {
 export function apiSystemStoreStorageBatchConfirm(params: any) {
     return request.post({ url: '/system_store_storage/systemstorestorage/batchConfirm', params })
 }
+
+export function apiSystemStoreStorageRollback(params: any) {
+    return request.post({ url: '/system_store_storage/systemstorestorage/rollback', params })
+}

src/views/order/beforehand_order/details.vue

@@ -129,7 +129,7 @@
                 打印无价格出库单
             </el-button>
         </div>
-        <el-button type="primary" @click="dialogShop = true" v-if="formData.order_type != 7">
+        <el-button type="primary" @click="dialogShop = true">
             追加
         </el-button>
         <el-button
@@ -496,6 +496,7 @@ const appendAdd = () => {
         return {
             id: item.id,
             nums: item.num || 0,
+            unit: item.unit || 0,
             purchase: item.price || 0,
             prices: item.purchase || 0,
             total_price: item.total_price || 0,
@@ -509,6 +510,9 @@ const appendAdd = () => {
     }).then((res) => {
         dialogShop.value = false
     })
+	if (formData.value.order_type == 7) {
+		goodsOfferRef.value?.getList(formData.value.id)
+	}
 }
 const queryParams = reactive({
     bhoid: route.query.id,

src/views/store/system_store_storage/index.vue

@@ -3,55 +3,27 @@
 		<el-card class="!border-none mb-4" shadow="never">
 			<el-form class="mb-[-16px]" :model="queryParams" inline>
 				<el-form-item label="门店" prop="store_id">
-                    <el-select
+					<el-select v-model="queryParams.store_id" filterable remote reserve-keyword placeholder="输入门店名称搜索"
-                        v-model="queryParams.store_id"
+						remote-show-suffix :remote-method="remoteMethod" :loading="storeloading" style="width: 240px"
-                        filterable
+						@change="resetPage">
-                        remote
+						<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id" />
-                        reserve-keyword
-                        placeholder="输入门店名称搜索"
-                        remote-show-suffix
-                        :remote-method="remoteMethod"
-                        :loading="storeloading"
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in storeList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
 					</el-select>
 				</el-form-item>
 				<el-form-item label="商品名称" prop="product_name">
-                    <el-input
+					<el-input class="w-[280px]" v-model="queryParams.product_name" @keydown.enter="resetPage" clearable
-                        class="w-[280px]"
+						placeholder="请输入商品名称" />
-                        v-model="queryParams.product_name"
-                        @keydown.enter="resetPage"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
 				</el-form-item>
 				<!-- <el-form-item label="门店确认人员" prop="staff_name">
                     <el-input class="w-[280px]" v-model="queryParams.staff_name" @keydown.enter="resetPage" clearable placeholder="请输入门店确认人员" />
                 </el-form-item> -->
 				<el-form-item label="状态" prop="status">
-                    <el-select
+					<el-select v-model="queryParams.status" placeholder="输入门店名称搜索" style="width: 240px"
-                        v-model="queryParams.status"
+						@change="resetPage">
-                        placeholder="输入门店名称搜索"
+						<el-option v-for="item in [
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in [
                                 { id: 1, name: '已入库' },
                                 { id: 0, name: '待确认' },
                                 { id: -1, name: '库存不足' }
-                            ]"
+                            ]" :key="item.id" :label="item.name" :value="item.id" />
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
 					</el-select>
 				</el-form-item>
 				<el-form-item>
@@ -82,6 +54,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column label="数量" prop="nums" show-overflow-tooltip />
+					<el-table-column label="退库数量" prop="refund_nums" show-overflow-tooltip />
 					<el-table-column label="状态" prop="status">
 						<template #default="{ row }">
 							<el-tag type="success" v-if="row.status === 1">已入库</el-tag>
@@ -93,23 +66,13 @@
 					<el-table-column label="创建时间" prop="create_time" />
 					<el-table-column label="操作" width="120" fixed="right">
 						<template #default="{ row }">
-                            <el-button
+							<el-button v-if="row.status == 0"
-                                v-if="row.status == 0"
+								v-perms="['system_store_storage.system_store_storage/edit']" type="success" link
-                                v-perms="['system_store_storage.system_store_storage/edit']"
+								@click="handleEdit(row)">
-                                type="success"
-                                link
-                                @click="handleEdit(row)"
-                            >
 								确认入库
 							</el-button>
-							<el-button
+							<el-button v-if="row.status == 1 && row.refund_nums < row.nums" type="danger" link @click="showRollback(row)">
-							    v-if="row.status == 1"
+								退库
-							    v-perms="['system_store_storage.system_store_storage/edit']"
-							    type="danger"
-							    link
-							    @click="handleEdit(row)"
-							>
-							    回退
 							</el-button>
 						</template>
 					</el-table-column>
@@ -119,13 +82,7 @@
 				<pagination v-model="pager" @change="getLists" />
 			</div>
 		</el-card>
-        <edit-popup
+		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
 	</div>
 </template>
 
@@ -136,6 +93,7 @@ import {
 		apiSystemStoreStorageLists,
 		apiSystemStoreStorageDelete,
 		apiSystemStoreStorageEdit,
+		apiSystemStoreStorageRollback,
 		apiSystemStoreStorageBatchConfirm
 	} from '@/api/system_store_storage'
 	import { apiSystemStoreLists } from '@/api/system_store'
@@ -143,6 +101,15 @@ import { timeFormat } from '@/utils/util'
 	import feedback from '@/utils/feedback'
 	import EditPopup from './edit.vue'
 	import { size } from 'lodash-es'
+	import { ElMessageBox } from 'element-plus'
+	const showRollback = async (row: any) => {
+		await ElMessageBox.prompt('请输入退库数量', '退库', {
+			confirmButtonText: '确认',
+			cancelButtonText: '取消'
+		}).then(({ value }) => {
+			handleRollback(row.id, value)
+		})
+	}
 
 	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 	// 是否显示编辑框
@@ -192,6 +159,15 @@ const handleEdit = async (data: any) => {
 		})
 	}
 
+	const handleRollback = async (id, number) => {
+		await apiSystemStoreStorageRollback({
+			id: id,
+			num: number
+		}).then((res) => {
+			getLists()
+		})
+	}
+
 	// 删除
 	const handleDelete = async (id : number | any[]) => {
 		await feedback.confirm('确定要删除？')

src/views/store_product_price/index.vue

@@ -3,26 +3,23 @@
 		<el-card class="!border-none mb-4" shadow="never">
 			<el-form class="mb-[-16px]" :model="queryParams" inline>
 				<el-form-item label="商品" prop="store_name">
-                    <el-input
+					<el-input class="w-[280px]" v-model="queryParams.store_name" clearable placeholder="请输入商品" />
-                        class="w-[280px]"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品"
-                    />
 				</el-form-item>
 				<el-form-item label="状态" prop="status">
-                    <el-select
+					<el-select v-model="queryParams.status" placeholder="请选择状态" style="width: 240px">
-                        v-model="queryParams.status"
-                        placeholder="请选择状态"
-                        style="width: 240px"
-                    >
 						<el-option :value="0" label="未设置"></el-option>
 						<el-option :value="1" label="已设置"></el-option>
 					</el-select>
 				</el-form-item>
+				<el-form-item label="日期" prop="timeScope">
+					<el-date-picker v-model="queryParams.timeScope" type="daterange" range-separator="至"
+						start-placeholder="开始日期" end-placeholder="结束日期" unlink-panels :shortcuts="shortcuts"
+						@change="changeStartEndTime" />
+				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="resetPage">查询</el-button>
 					<el-button @click="resetParams">重置</el-button>
+					<el-button @click="xlsx()">导出</el-button>
 				</el-form-item>
 			</el-form>
 		</el-card>
@@ -36,6 +33,7 @@
 							<div>采购源id: {{ row.offer_id }}</div>
 						</template>
 					</el-table-column>
+					<el-table-column label="仓库" prop="warehouse" show-overflow-tooltip />
 					<el-table-column label="商品信息" width="150" show-overflow-tooltip>
 						<template #default="{ row }">
 							<div>商品名称: {{ row.store_name }}</div>
@@ -45,11 +43,7 @@
 					<el-table-column label="规格" prop="store_info" show-overflow-tooltip />
 					<el-table-column label="商品图片" prop="image" width="120">
 						<template #default="{ row }">
-                            <el-image
+							<el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
-                                style="width: 50px; height: 50px"
-                                :src="row.image"
-                                :preview-teleported="true"
-                            />
 						</template>
 					</el-table-column>
 					<el-table-column label="采购价" prop="purchase_price" show-overflow-tooltip />
@@ -72,31 +66,16 @@
 						</template>
 					</el-table-column>
 					<el-table-column label="状态" prop="status_name" show-overflow-tooltip />
-                    <el-table-column
+					<el-table-column label="时间" prop="create_time" show-overflow-tooltip width="180" />
-                        label="时间"
-                        prop="create_time"
-                        show-overflow-tooltip
-                        width="180"
-                    />
 					<el-table-column label="备注" prop="mark" show-overflow-tooltip />
 					<el-table-column label="操作" width="120" fixed="right">
 						<template #default="{ row }">
-                            <el-button
+							<el-button v-perms="['store_product_price.store_product_price/edit']" type="primary" link
-                                v-perms="['store_product_price.store_product_price/edit']"
+								@click="handleEdit(row)" v-if="row.status == 0">
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                                v-if="row.status == 0"
-                            >
 								编辑
 							</el-button>
-                            <el-button
+							<el-button v-perms="['store_product_price.store_product_price/delete']" type="danger" link
-                                v-perms="['store_product_price.store_product_price/delete']"
+								@click="handleEnter(row)" v-if="row.status == 0">
-                                type="danger"
-                                link
-                                @click="handleEnter(row)"
-                                v-if="row.status == 0"
-                            >
 								确认
 							</el-button>
 						</template>
@@ -107,13 +86,7 @@
 				<pagination v-model="pager" @change="getLists" />
 			</div>
 		</el-card>
-        <edit-popup
+		<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
 	</div>
 </template>
 
@@ -123,11 +96,53 @@ import { useDictData } from '@/hooks/useDictOptions'
 	import {
 		apiStoreProductPriceLists,
 		apiStoreProductPriceDelete,
+		apiStoreProductPriceExport,
 		apiStoreProductPriceEnterPrice
 	} from '@/api/store_product_price'
 	import { timeFormat } from '@/utils/util'
 	import feedback from '@/utils/feedback'
 	import EditPopup from './edit.vue'
+	import moment from 'moment'
+
+	const shortcuts = [
+		{
+			text: '近一周',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setDate(start.getDate() - 7)
+				return [start, end]
+			}
+		},
+		{
+			text: '近一月',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setMonth(start.getMonth() - 1)
+				return [start, end]
+			}
+		},
+		{
+			text: '近三月',
+			value: () => {
+				const end = new Date()
+				const start = new Date()
+				start.setMonth(start.getMonth() - 3)
+				return [start, end]
+			}
+		}
+	]
+	const changeStartEndTime = () => {
+		console.log(queryParams.timeScope);
+		if (queryParams.timeScope[0] && queryParams.timeScope[1]) {
+			queryParams.start_time = moment(queryParams.timeScope[0]).format('YYYY-MM-DD') + ' 00:00:00'
+			queryParams.end_time = moment(queryParams.timeScope[1]).format('YYYY-MM-DD') + ' 23:59:59'
+		} else {
+			queryParams.start_time = ''
+			queryParams.end_time = ''
+		}
+	}
 
 	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 	// 是否显示编辑框
@@ -136,6 +151,9 @@ const showEdit = ref(false)
 	// 查询条件
 	const queryParams = reactive({
 		store_name: '',
+		start_time: '',
+		end_time: '',
+		timeScope: [],
 		status: ''
 	})
 
@@ -171,5 +189,12 @@ const handleEnter = async (data: any) => {
 		getLists()
 	}
 
+	const xlsx = () => {
+		apiStoreProductPriceExport(queryParams).then((res) => {
+			window.open(res.url, '_blank')
+			ElMessage.success('导出成功')
+		})
+	}
+
 	getLists()
 </script>

src/views/warehouse_product/index.vue

@@ -53,10 +53,10 @@
                         />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商品" prop="product_id">
+                <el-form-item label="商品" prop="product_name">
                     <el-input
                         class="w-[280px]"
-                        v-model="queryParams.product_id"
+                        v-model="queryParams.product_name"
                         clearable
                         placeholder="请输入商品"
                     />
@@ -218,7 +218,7 @@ const showEdit = ref(false)
 // 查询条件
 const queryParams = reactive({
     warehouse_id: '',
-    product_id: '',
+    product_name: '',
     financial_pm: 1,
     store_id: '',
     bar_code: '',