DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-04-08 13:56:05 +08:00
parent f92d5c16e0 9bd63d90fc
commit 9adbc1ea0c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-ui/src/components/KLPService/ProductSelect/index.vue
View File

@@ -275,7 +275,7 @@ export default {
// 选中项不在列表则追加，保证选中高亮 // 选中项不在列表则追加，保证选中高亮
if (this.selectedId && !this.productList.some(item => item.productId === this.selectedId)) { if (this.selectedId && !this.productList.some(item => item.productId === this.selectedId)) {
const res = await getProduct(this.selectedId); const res = await getProduct(this.selectedId);
res.code === 200 && this.productList.push(res.data); res.code === 200 && res.data && this.productList.push(res.data);
} }
} }
} catch (error) { } catch (error) {

2
klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
View File

@@ -360,7 +360,7 @@ export default {
// 选中的项不在列表中则追加进去，保证选中高亮 // 选中的项不在列表中则追加进去，保证选中高亮
if (this.selectedId && !this.rawMaterialList.some(item => item.rawMaterialId === this.selectedId)) { if (this.selectedId && !this.rawMaterialList.some(item => item.rawMaterialId === this.selectedId)) {
const res = await getRawMaterial(this.selectedId); const res = await getRawMaterial(this.selectedId);
res.code === 200 && this.rawMaterialList.push(res.data); res.code === 200 && res.data && this.rawMaterialList.push(res.data);
} }
} }
} catch (error) { } catch (error) {

2
klp-ui/src/views/wms/delivery/components/planList.vue
View File

@@ -17,7 +17,7 @@
:props="planTreeProps" :props="planTreeProps"
@node-click="handlePlanSelect" @node-click="handlePlanSelect"
default-expand-all default-expand-all
style="margin-top: 10px; height: 800px; overflow: auto;" style="margin-top: 10px; height: calc(100vh - 220px); overflow: auto;"
> >
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<span <span

2
klp-ui/src/views/wms/delivery/waybill/index.vue
View File

@@ -26,7 +26,7 @@
<el-empty description="请先选择发货计划" /> <el-empty description="请先选择发货计划" />
</div> </div>
<div v-else> <div v-else>
<el-form style="position: sticky; left: 0; top: 0;" :model="queryParams" ref="queryForm" size="small" <el-form style="position: sticky; left: 0; top: 0; padding: 10px;" :model="queryParams" ref="queryForm" size="small"
:inline="true" v-show="showSearch" label-width="68px"> :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="发货单名称" prop="waybillName"> <el-form-item label="发货单名称" prop="waybillName">
<el-input v-model="queryParams.waybillName" placeholder="请输入发货单名称" clearable <el-input v-model="queryParams.waybillName" placeholder="请输入发货单名称" clearable