From c0b871d491731e4b32f3c9249770c1d4aee4f7f5 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 10:47:37 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/views/loc/locDetl/index.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 3cd21c5..713a7b5 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -8,7 +8,6 @@
import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
-
const router = useRouter();
const TABLE_KEY = 'table-locDetl';
@@ -21,9 +20,9 @@
orderNo: null,
batch: null,
tagId: null,
+ orderType: null,
})
const editChild = ref(null)
-
const state = reactive({
selectedRowKeys: [],
loading: false,
@@ -372,6 +371,10 @@
style="width: 140px;margin-right: 10px;" />
<a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.locDetl.batch.input', '璇疯緭鍏ユ壒鍙�')"
style="width: 140px;margin-right: 10px;" />
+ <a-select v-model:value="searchParam.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '浠撳簱绫诲瀷')"
+ :options="[
+ { label: '鍏ㄩ儴', value: null }, { label: '绔嬪簱', value: 1 }, { label: '骞冲簱', value: 2 }]" style="width: 140px;margin-right: 10px;">
+ </a-select>
<a-select v-model:value="searchParam.tagId" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍝佺被')"
:options="[
{ label: '榛樿鍒嗙被', value: 10 }, { label: '鏈烘补', value: 11 }, { label: '鍙橀�熺娌�', value: 17 }, { label: '鐏姳濉�', value: 18 },
--
Gitblit v1.9.1