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/orderDetl/edit.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderDetl/edit.vue b/zy-asrs-admin/src/components/orderDetl/edit.vue
index 5439b8a..ec756a4 100644
--- a/zy-asrs-admin/src/components/orderDetl/edit.vue
+++ b/zy-asrs-admin/src/components/orderDetl/edit.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
+import { debounce } from 'lodash-es';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -35,13 +36,13 @@
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.maktx', '鐗╂枡鍚�'),
+ title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: 'maktx',
width: 140,
ellipsis: true,
@@ -127,6 +128,7 @@
const openAddDetl = ref(false);
const matChecked = ref([]);
const matQueryList = ref(null);
+const matFetching = ref(false);
const matSelectList = ref([]);
const addDetl = () => {
openAddDetl.value = true;
@@ -163,9 +165,9 @@
matChecked.value = [];
}
-const handleSearch = val => {
+const handleSearch = debounce(val => {
matQuery(val);
-}
+}, 600)
const handleSelect = (value, option) => {
let flag = true;
@@ -193,9 +195,10 @@
matQuery(null);
function matQuery(condition) {
+ matFetching.value = true;
post('/api/mat/page', {
current: 1,
- pageSize: 100,
+ pageSize: 10,
condition: condition
}).then((resp) => {
let result = resp.data;
@@ -203,11 +206,12 @@
result.data.records.forEach((item) => {
tmp.push({
value: item.matnr,
- label: item.matnr,
+ label: item.matnr + '_' + item.maktx,
data: item
})
})
matQueryList.value = tmp;
+ matFetching.value = false;
})
}
@@ -233,7 +237,7 @@
}
watch(orderId, (newVal, oldVal) => {
- if(newVal == undefined || newVal == null) {
+ if (newVal == undefined || newVal == null) {
tableData.value = [];
return;
}
@@ -261,7 +265,7 @@
})
tableData.value = tmp;
})
-
+
})
defineExpose({
@@ -305,7 +309,8 @@
@ok="handleAddDetlOk" @cancel="handleAddDetlCancel">
<a-select v-model:value="matChecked" :options="matQueryList" mode="multiple"
:placeholder="formatMessage('component.orderDetl.edit.selectMat', '璇烽�夋嫨鐗╂枡')" @search="handleSearch"
- @select="handleSelect" @deselect="handleDeselect"></a-select>
+ :filter-option="false" :not-found-content="matFetching ? undefined : null" @select="handleSelect"
+ @deselect="handleDeselect"></a-select>
</a-modal>
</div>
</template>
--
Gitblit v1.9.1