feat(inventory_transfer): 添加订单号和日期筛选功能

- 在库存调拨页面添加订单号输入框和日期范围选择器
- 实现根据订单号和日期筛选调拨记录的功能
- 优化表格列，添加订单号列
- 修复.env.development文件中的API地址

.env.development

@@ -6,6 +6,6 @@ VITE_NOW_TYPE = 'dist'
 # VITE_APP_BASE_URL='http://192.168.1.10:8546'
 # VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
 # VITE_APP_BASE_URL='https://multi-store.lihaink.cn'
-VITE_APP_BASE_URL='http://192.168.1.22:8545'
+VITE_APP_BASE_URL='http://192.168.1.102:8545'
 # VITE_APP_BASE_URL='https://ceshi-multi-store.lihaink.cn'
 

src/views/inventory_transfer/index.vue

@@ -10,9 +10,34 @@
                         placeholder="请输入商品"
                     />
                 </el-form-item>
+                <el-form-item label="订单号" prop="order_id">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.order_id"
+                        clearable
+                        placeholder="请输入单号"
+                    />
+                </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
+                        @change="changeStartEndTime"
+                    />
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
+                    <export-data
+                        class="ml-2.5"
+                        :fetch-fun="apiInventoryTransferLists"
+                        :params="queryParams"
+                        :page-size="pager.size"
+                    />
                 </el-form-item>
             </el-form>
         </el-card>
@@ -26,6 +51,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column label="id" prop="id" show-overflow-tooltip />
+                    <el-table-column label="订单号" prop="order_id" show-overflow-tooltip />
                     <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
                     <el-table-column label="数量" prop="nums" show-overflow-tooltip />
                     <el-table-column label="转出方" prop="one_name" show-overflow-tooltip />
@@ -76,6 +102,7 @@ import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 // import EditPopup from './edit.vue'
 import EditPopup from './warehousing.vue'
+import moment from 'moment'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
@@ -83,9 +110,23 @@ const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    store_name: ''
+    store_name: '',
+    start_time: '',
+    end_time: '',
+    order_id: '',
+    timeScope: []
 })
 
+const changeStartEndTime = () => {
+    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 = ''
+    }
+    getLists()
+}
 // 选中数据
 const selectData = ref<any[]>([])
 
@@ -125,5 +166,7 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
-getLists()
+onMounted(() => {
+    getLists()
+})
 </script>

src/views/order/beforehand_order/add.vue

@@ -74,7 +74,7 @@
                                 v-model="formData.store_id"
                                 placeholder="请选择门店"
                                 size="large"
-								@change="resetUserId"
+                                @change="resetUserId"
                             >
                                 <el-option
                                     v-for="item in storeList"
@@ -89,14 +89,28 @@
                 <el-row>
                     <el-col :span="6">
                         <el-form-item label="是否赊账" prop="is_arrears">
-							<el-switch v-model="formData.is_arrears" :active-value="2" :inactive-value="1" active-text="是"
+                            <el-switch
-							    inactive-text="否" inline-prompt />
+                                v-model="formData.is_arrears"
+                                :active-value="2"
+                                :inactive-value="1"
+                                active-text="是"
+                                inactive-text="否"
+                                inline-prompt
+                            />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6" v-if="formData.order_type == 7">
                         <el-form-item label="采购人员" prop="buyer_id" style="width: 300px">
-                            <el-select v-model="formData.buyer_id" placeholder="请选择采购人员" size="large">
+                            <el-select
-                                <el-option v-for="item in delivery_list" :label="item.nickname" :value="item.uid" />
+                                v-model="formData.buyer_id"
+                                placeholder="请选择采购人员"
+                                size="large"
+                            >
+                                <el-option
+                                    v-for="item in delivery_list"
+                                    :label="item.nickname"
+                                    :value="item.uid"
+                                />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -398,7 +412,7 @@ const formData = reactive({
     warehouse_id: '',
     is_buyer: -1,
     buyer_id: '',
-	is_arrears: 1,
+    is_arrears: 1,
     supplier_id: '',
     code: '',
     total_price: 0,
@@ -423,7 +437,11 @@ const formData = reactive({
     address: ''
 })
 const enterProduct = async (e: any) => {
-    const data = await apiStoreProductDetail({ id: e.id, user_id: formData.uid, store_id: formData.store_id })
+    const data = await apiStoreProductDetail({
+        id: e.id,
+        user_id: formData.uid,
+        store_id: formData.store_id
+    })
     setData(e, data)
 }
 
@@ -483,9 +501,9 @@ function handleOrderType(row) {
     } else {
         formData.is_buyer = -1
     }
-	if (formData.order_type == 7 && delivery_list.value.length == 0) {
+    if (formData.order_type == 7 && delivery_list.value.length == 0) {
-		getDeliveryList()
+        getDeliveryList()
-	}
+    }
 }
 const router = useRouter()
 // 提交按钮
@@ -534,11 +552,11 @@ const dialogProductData = ref()
 const enterStoreName = (e: any) => {
     apiStoreProductLists({
         store_name: e.store_name,
-        product_type: [0, 6],
+        product_type: [0, 6, 7],
         is_warehouse: 1,
         order_type: formData.order_type,
         user_id: formData.uid,
-		store_id: formData.store_id
+        store_id: formData.store_id
         // is_show: 1
     }).then((res) => {
         if (res.count == 1) {