修改库存调拨商品列表，预订单添加同步价格

src/api/beforehand_order_cart_info.ts

@@ -58,3 +58,8 @@ export function apiBeforehandOrderCartInfoFix(params: any) {
         params
     })
 }
+
+// 同步商品价格
+export function apiBeforehandOrderCartInfoSyncPrice(params: any) {
+    return request.get({ url: '/beforehand_order_cart_info/beforehandordercartinfo/syncPrice', params })
+}

src/views/inventory_transfer/warehousing.vue

@@ -13,7 +13,7 @@
 					<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"
-							style="width: 300px">
+							@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>
@@ -21,7 +21,7 @@
 					<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"
-							style="width: 300px">
+							@change="changeWarehouse" style="width: 300px">
 							<el-option v-for="item in warehouseList" :key="item.id" :label="item.name"
 								:value="item.id" />
 						</el-select>
@@ -81,7 +81,8 @@
 				</el-form>
 			</div>
 			<el-dialog v-model="showProduct" title="选择商品" width="70%">
-				<product-pop @onBindStore="onBindProduct"></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>
@@ -106,6 +107,8 @@
 	const popupRef = shallowRef<InstanceType<typeof Popup>>()
 	const mode = ref('add')
 	const store_id = ref(0) // 门店id
+	const warehouse_id = ref(0) //仓库id
+	const is_warehouse = ref(0) //是否仓库
 
 	// 表单数据
 	const formData = reactive({
@@ -146,6 +149,17 @@
 		showProduct.value = false
 	}
 
+	const changeStore = (e : any) => {
+		store_id.value = e
+		resetUserId()
+	}
+
+	const changeWarehouse = (e : any) => {
+		warehouse_id.value = e
+		is_warehouse.value = 1
+		resetUserId()
+	}
+
 	const storeloading = ref(false)
 	const storeList = ref([])
 	const remoteMethodStore = (e = '') => {
@@ -217,6 +231,11 @@
 		setFormData(data)
 	}
 
+	const productModalKey = ref(0)
+	const resetUserId = () => {
+		productModalKey.value++
+	}
+
 	defineExpose({
 		open,
 		setFormData,

src/views/order/beforehand_order/component/orderCartInfo.vue

@@ -12,6 +12,7 @@
             <el-form-item>
                 <!-- <el-button type="primary" @click="fixAcceptNum">修复分拣数量</el-button> -->
                 <el-button type="primary" @click="resetPage">查询</el-button>
+				<el-button type="primary" @click="syncPrice">同步价格</el-button>
                 <export-data
                     class="ml-2.5"
                     :fetch-fun="apiBeforehandOrderCartInfoLists"
@@ -194,7 +195,8 @@ import {
     apiBeforehandOrderCartInfoLists,
     apiBeforehandOrderCartInfoDelete,
     apiBeforehandOrderCartInfoProcurementStatus,
-    apiBeforehandOrderCartInfoFix
+    apiBeforehandOrderCartInfoFix,
+    apiBeforehandOrderCartInfoSyncPrice
 } from '@/api/beforehand_order_cart_info'
 import { apiDeliveryServiceLists } from '@/api/delivery_service'
 import feedback from '@/utils/feedback'
@@ -323,6 +325,13 @@ const fixAcceptNum = () => {
     })
 }
 
+const syncPrice = async() => {
+	await apiBeforehandOrderCartInfoSyncPrice({
+        bhoid: formData.value.id
+    })
+	getLists()
+}
+
 onMounted(() => {
     queryParams.bhoid = route.query.id
     formData.value.id = route.query.id

src/views/order/store_order/index.vue

@@ -88,7 +88,13 @@
                         placeholder="请选择订单类型"
                         @change="resetPage"
                     >
+                        <el-option label="普通订单" value="1" />
                         <el-option label="批发订单" value="4" />
+                        <el-option label="铺货订单" value="11" />
+                        <el-option label="摊贩订单" value="12" />
+                        <el-option label="一条龙订单" value="13" />
+                        <el-option label="仓库补货" value="15" />
+                        <el-option label="其他订单" value="17" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>

src/views/warehouse/product_import.vue

@@ -3,25 +3,12 @@
 		<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]" @keydown.enter="resetPage" v-model="queryParams.store_name" clearable
-                        class="w-[280px]"
+						placeholder="请输入商品名称" />
-                        @keydown.enter="resetPage"
-                        v-model="queryParams.store_name"
-                        clearable
-                        placeholder="请输入商品名称"
-                    />
 				</el-form-item>
 				<el-form-item label="商品分类" prop="store_name">
-                    <el-cascader
+					<el-cascader class="w-[280px]" v-model="queryParams.class_all" filterable clearable
-                        class="w-[280px]"
+						:before-filter="beforeFilter" :props="props" placeholder="请选择商品分类" @change="resetPage" />
-                        v-model="queryParams.class_all"
-                        filterable
-                        clearable
-                        :before-filter="beforeFilter"
-                        :props="props"
-                        placeholder="请选择商品分类"
-                        @change="resetPage"
-                    />
 				</el-form-item>
 				<!-- <el-form-item label="商品条码" prop="bar_code">
                     <el-input
@@ -32,43 +19,27 @@
                     />
                 </el-form-item> -->
 				<el-form-item label="排序" prop="order_by">
-                    <el-select
+					<el-select v-model="queryParams.order_by" placeholder="请选择排序" style="width: 240px"
-                        v-model="queryParams.order_by"
+						@change="resetPage">
-                        placeholder="请选择排序"
+						<el-option v-for="item in [
-                        style="width: 240px"
-                        @change="resetPage"
-                    >
-                        <el-option
-                            v-for="item in [
                                 { id: 'asc', name: '升序' },
                                 { id: 'desc', 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>
 					<el-button type="primary" @click="resetPage">查询</el-button>
 					<el-button @click="resetParams">重置</el-button>
-                    <export-data
+					<export-data class="ml-2.5" :fetch-fun="apiWarehouseProductStoregeLists" :params="queryParams"
-                        class="ml-2.5"
+						:page-size="pager.size" />
-                        :fetch-fun="apiWarehouseProductStoregeLists"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
 				</el-form-item>
 			</el-form>
 		</el-card>
 		<el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <router-link
+			<router-link :to="{
-                :to="{
                     path: 'import',
                     query: { warehouse_id: queryParams.warehouse_id }
-                }"
+                }" class="ml-4">
-                class="ml-4"
-            >
 				<el-button type="primary"> 出库 </el-button>
 			</router-link>
 			<div class="mt-4">
@@ -77,82 +48,24 @@
 					<el-table-column label="id" prop="id" show-overflow-tooltip />
 					<el-table-column label="商品图片" prop="image" min-width="80">
 						<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
+					<el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
-                        label="商品名称"
+					<el-table-column label="分类" prop="cate_name" min-width="120" show-overflow-tooltip />
-                        prop="store_name"
+					<el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
-                        min-width="200"
+					<el-table-column label="供货价" prop="purchase" min-width="100" show-overflow-tooltip />
-                        show-overflow-tooltip
+					<el-table-column label="商户价" prop="cost" min-width="120" show-overflow-tooltip />
-                    />
+					<el-table-column label="终端零售价" prop="price" min-width="120" show-overflow-tooltip />
-                    <el-table-column
+					<el-table-column label="规格" prop="store_info" min-width="100" show-overflow-tooltip />
-                        label="分类"
+					<el-table-column label="毛利率" prop="rose" min-width="100" show-overflow-tooltip />
-                        prop="cate_name"
+					<el-table-column label="库存" prop="nums" min-width="100" show-overflow-tooltip />
-                        min-width="120"
+					<el-table-column label="价值" prop="total_price" min-width="200" show-overflow-tooltip />
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="单位"
-                        prop="unit_name"
-                        min-width="80"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="供货价"
-                        prop="purchase"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="商户价"
-                        prop="cost"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="终端零售价"
-                        prop="price"
-                        min-width="120"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="规格"
-                        prop="store_info"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="毛利率"
-                        prop="rose"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="库存"
-                        prop="nums"
-                        min-width="100"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="价值"
-                        prop="total_price"
-                        min-width="200"
-                        show-overflow-tooltip
-                    />
 					<el-table-column label="操作" width="120" fixed="right">
 						<template #default="{ row }">
-                            <el-button
+							<el-button link @click="resetProductStoregeClick(row)" v-perms="[
-                                link
-                                @click="resetProductStoregeClick(row)"
-                                v-perms="[
                                     'warehouse_product_storege.warehouse_product_storege/edit'
-                                ]"
+                                ]">
-                            >
 								重置数量
 							</el-button>
 						</template>
@@ -171,12 +84,10 @@
 				<el-input v-model="formData.store_name" clearable :readonly="false" disabled />
 			</el-form-item>
 			<el-form-item label="数量" prop="nums">
-                <el-input
+				<el-input v-model="formData.nums" clearable :readonly="false" placeholder="请输入数量" />
-                    v-model="formData.nums"
+			</el-form-item>
-                    clearable
+			<el-form-item label="备注" prop="remark">
-                    :readonly="false"
+				<el-input v-model="formData.remark" clearable :readonly="false" placeholder="请输入数量" />
-                    placeholder="请输入数量"
-                />
 			</el-form-item>
 		</el-form>
 		<template #footer>
@@ -207,7 +118,8 @@ const resetProductStoregeShow = ref(false)
 	const formData = ref({
 		id: '',
 		store_name: '',
-    nums: ''
+		nums: '',
+		remark: ''
 	})
 	// 查询条件
 	const queryParams = reactive({