From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-admin/src/components/orderLog/index.vue | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderLog/index.vue b/zy-asrs-admin/src/components/orderLog/index.vue
index 5290ed4..6664ec4 100644
--- a/zy-asrs-admin/src/components/orderLog/index.vue
+++ b/zy-asrs-admin/src/components/orderLog/index.vue
@@ -1,7 +1,7 @@
<script setup>
import { getCurrentInstance, ref, computed, reactive, defineProps } from 'vue';
import { useRouter } from "vue-router";
-import { get, post, postBlob } from '@/utils/request.js'
+import { get, post, postBlob, postForm } from '@/utils/request.js'
import { message, Modal } from 'ant-design-vue';
import { logout } from '@/config.js';
import EditView from './edit.vue'
@@ -20,6 +20,11 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
+const searchParam = ref({
+ orderNo: null,
+ orderType: null,
+ orderSettle: null,
+})
const editChild = ref(null)
const showOrderDetlChild = ref(null)
@@ -139,6 +144,7 @@
current: currentPage,
pageSize: pageSize,
condition: searchInput.value,
+ _param: searchParam.value,
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
@@ -216,6 +222,25 @@
getPage()
}
+const orderTypeQueryList = ref(null);
+orderTypeQuery();
+function orderTypeQuery() {
+ postForm('/api/orderType/query', {
+ type: 1
+ }).then(resp => {
+ let result = resp.data;
+ orderTypeQueryList.value = result.data;
+ })
+}
+const orderSettleQueryList = ref(null);
+orderSettleQuery();
+function orderSettleQuery() {
+ postForm('/api/orderSettle/query', {}).then(resp => {
+ let result = resp.data;
+ orderSettleQueryList.value = result.data;
+ })
+}
+
</script>
<script>
@@ -228,8 +253,23 @@
<div>
<EditView ref="editChild" @tableReload="handleTableReload" :ioModel="ioModel == 'in' ? 1 : 2" />
<div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ <div>
+ <a-input v-model:value="searchParam.orderNo" :placeholder="formatMessage('page.order.orderNo.input', '璇疯緭鍏ヨ鍗曠紪鍙�')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-select v-model:value="searchParam.orderSettle"
+ :placeholder="formatMessage('page.order.orderSettle.select', '璇烽�夋嫨鍗曟嵁鐘舵��')"
+ style="width: 140px;margin-right: 10px;" show-search allowClear :options="orderSettleQueryList"
+ optionFilterProp="label" optionLabelProp="label">
+ </a-select>
+ <a-select v-model:value="searchParam.orderType"
+ :placeholder="formatMessage('page.order.orderType.select', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
+ style="width: 140px;margin-right: 10px;" show-search allowClear :options="orderTypeQueryList"
+ optionFilterProp="label" optionLabelProp="label">
+ </a-select>
+
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ </div>
<div class="table-header-right">
<!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button> -->
<a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
--
Gitblit v1.9.1