diff --git a/src/components/storePop/index.vue b/src/components/storePop/index.vue index 39c554c1..097c08fd 100644 --- a/src/components/storePop/index.vue +++ b/src/components/storePop/index.vue @@ -23,8 +23,14 @@
- - + + @@ -59,13 +65,20 @@ import { apiSystemStoreLists, apiSystemStoreDelete } from '@/api/system_store' import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import { ElMessage } from 'element-plus' - +const props = defineProps<{ + is_selection: string +}>() // 查询条件 const queryParams = reactive({ name: '', phone: '' }) - +const selection = ref('selection') +const highlight_current_row = ref(false) +if (props.is_selection == 0) { + selection.value = '' + highlight_current_row.value = true +} // 选中数据 const selectData = ref([]) @@ -84,8 +97,11 @@ const { pager, getLists, resetParams, resetPage } = usePaging({ }) getLists() - const emits = defineEmits(['onBindStore']) + +const handleCurrentChange = (val: any) => { + emits('onBindStore', val) +} // 绑定用户 const bindStore = () => { const list = pager.lists.filter((item) => selectData.value.includes(item.id)) diff --git a/src/views/warehouse/import.vue b/src/views/warehouse/import.vue index b4cacf5f..b36dc1f0 100644 --- a/src/views/warehouse/import.vue +++ b/src/views/warehouse/import.vue @@ -160,7 +160,7 @@
- + { } // 选择门店 const onBindStore = (e: any[]) => { - e.forEach((item: any) => { - if (!storeList.value.find((t: any) => t.id == item.id)) { - storeList.value.push(item) - } - }) + storeList.value = [] + storeList.value.push(e) handleStock() showStore.value = false } diff --git a/src/views/warehouse_order/details.vue b/src/views/warehouse_order/details.vue index 4dcbd496..aa305360 100644 --- a/src/views/warehouse_order/details.vue +++ b/src/views/warehouse_order/details.vue @@ -29,7 +29,7 @@ 打印 - +
@@ -57,6 +57,18 @@ prop="total_price" show-overflow-tooltip /> + + +
@@ -65,17 +77,38 @@
+ + + + + + + + +