修改库房管理-》采购管理-》采购入库:仓库字段值为中心耗材库在采购管理未显示的问题,修改了采购入库仓库字段值的布局样式,修改了在批量保存入库业务中添加申请人等核心数据数据,

修改了获取入库数据的查询SQL语句。
This commit is contained in:
wangjian963
2026-01-22 19:38:58 +08:00
parent d0c6f57f6b
commit 035738f990
4 changed files with 54 additions and 17 deletions

View File

@@ -24,9 +24,9 @@
</el-row>
<el-row :gutter="10" class="mb8" v-else>
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="submitAudit"
>提交审核</el-button
>
<el-button type="primary" plain icon="Plus" @click="submitAudit">
提交审核
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="EditPen" @click="handleTotalAmount">
@@ -35,7 +35,8 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleSave"
>批量保存</el-button
>批量保存
</el-button
>
</el-col>
</el-row>
@@ -271,11 +272,11 @@
>
<div class="select_wrapper_div">
<el-select
v-if="viewStatus !== 'view'"
v-model="scope.row.purposeLocationId"
placeholder="请选择仓库"
:class="{ 'error-border': scope.row.error }"
clearable
:disabled="viewStatus == 'view'"
>
<el-option
v-for="(item, index) in locationList"
@@ -285,8 +286,19 @@
@click="handleLocationClick(item, scope.row, scope.$index)"
/>
</el-select>
<!-- 非编辑状态下显示为只读输入框 -->
<el-input
v-else
:model-value="getLocationNameById(scope.row.purposeLocationId)"
readonly
disabled
:placeholder="'-'"
class="readonly-input" style="pointer-events: none;"
/>
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column
@@ -724,7 +736,27 @@ const {
"specialty_code",
"purchase_type"
);
//
// // 监听locationList变化重新处理已存在的数据
// watch(locationList, (newList) => {
// if (newList && newList.length > 0) {
// // 可以触发表格重新渲染或更新相关数据
// }
// }, { immediate: true });
const getLocationNameById = (id) => {
// 检查locationList是否已加载
if (!locationList.value || !Array.isArray(locationList.value) || locationList.value.length === 0) {
return '仓库列表未加载';
}
// 使用严格相等比较,处理类型转换
const location = locationList.value.find(item => {
return item.id == id; // 使用 == 而不是 === 以处理字符串和数字之间的比较
});
return location ? location.name : '仓库不存在';
};
const viewStatus = ref("");
const startTimeOld = ref("");
const endTimeOld = ref("");

View File

@@ -205,9 +205,9 @@
>
<template #default="scope">
<!-- v-hasPermi="['system:user:edit']" -->
<el-button link type="primary" icon="View" @click.stop="handleUpdate(scope.row, 'view')"
>详情</el-button
>
<el-button link type="primary" icon="View" @click.stop="handleUpdate(scope.row, 'view')">
详情
</el-button>
<el-button
link
type="primary"
@@ -588,6 +588,7 @@ function handleUpdate(row, view) {
// 采购入库
editRow.value = row;
getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
console.log('返回的数据,response:', response.data)
currentData.value = response.data;
// nextTick(() => {
// proxy.$refs['inventoryReceiptRef'].edit();
@@ -604,7 +605,6 @@ function handleUpdate(row, view) {
path: 'purchaseDocument',
});
}
getList();
});
}