From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +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/components/orderDetl/edit.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderDetl/edit.vue b/zy-asrs-admin/src/components/orderDetl/edit.vue
index 8d53cc7..2b23c19 100644
--- a/zy-asrs-admin/src/components/orderDetl/edit.vue
+++ b/zy-asrs-admin/src/components/orderDetl/edit.vue
@@ -13,6 +13,10 @@
const TABLE_KEY = 'table-locDetl';
+const props = defineProps({
+ ioModel: null
+})
+
let tableData = ref([]);
let deleteDetlId = ref([]);
let orderId = ref(null);
@@ -39,7 +43,7 @@
{
title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
- width: 140,
+ width: 200,
ellipsis: true,
},
{
@@ -156,6 +160,7 @@
const matChecked = ref([]);
const matQueryList = ref(null);
const matFetching = ref(false);
+const searchText = ref('')
const matSelectList = ref([]);
const addDetl = () => {
openAddDetl.value = true;
@@ -193,6 +198,7 @@
}
const handleSearch = debounce(val => {
+ searchText.value = val
matQuery(val);
}, 600)
@@ -221,9 +227,14 @@
}
matQuery(null);
+
function matQuery(condition) {
matFetching.value = true;
- post('/api/mat/page', {
+ let url = '/api/mat/page'
+ if (props.ioModel == 2) {
+ url = '/api/locs/mats/page'
+ }
+ post(url, {
current: 1,
pageSize: 10,
condition: condition
@@ -334,10 +345,10 @@
<a-modal v-model:open="openAddDetl" :title="formatMessage('component.orderDetl.edit.addDetl', '娣诲姞鏄庣粏')"
@ok="handleAddDetlOk" @cancel="handleAddDetlCancel">
- <a-select v-model:value="matChecked" :options="matQueryList" mode="multiple"
+ <a-select v-model:value="matChecked" :options="matQueryList" mode="multiple" :searchValue="searchText"
:placeholder="formatMessage('component.orderDetl.edit.selectMat', '璇烽�夋嫨鐗╂枡')" @search="handleSearch"
- :filter-option="false" :not-found-content="matFetching ? undefined : null" @select="handleSelect"
- @deselect="handleDeselect"></a-select>
+ :filter-option="false" :not-found-content="matFetching ? undefined : null" @select="handleSelect" allowClear
+ @deselect="handleDeselect" ></a-select>
</a-modal>
</div>
</template>
--
Gitblit v1.9.1