修改入库、出库页面列表字段顺序

This commit is contained in:
zx
2026-03-12 14:42:58 +08:00
parent adaa774236
commit 2e569a8165
2 changed files with 177 additions and 622 deletions

View File

@@ -50,8 +50,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" ref="billTableRef" :data="billList" highlight-current-row @row-click="(row) => tableInfoRowClick(row, billTableRef)" :row-class-name="tableBillRowClassName" @row-dblclick="billClick" <el-table v-loading="loading" ref="billTableRef" :data="billList" highlight-current-row
@selection-change="billSelectionChange"> @row-click="(row) => tableInfoRowClick(row, billTableRef)" :row-class-name="tableBillRowClassName"
@row-dblclick="billClick" @selection-change="billSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="单据号" align="center" prop="billNo" width="180" /> <el-table-column label="单据号" align="center" prop="billNo" width="180" />
<el-table-column label="库存状态" align="center"> <el-table-column label="库存状态" align="center">
@@ -64,7 +65,7 @@
<dict-tag :options="dictTagData()" :value="scope.row.bizType" /> <dict-tag :options="dictTagData()" :value="scope.row.bizType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="理货员" align="center" prop="operatorName" width="100" />
<el-table-column label="入库类型" align="center" prop="operationTypeName" width="120" /> <el-table-column label="入库类型" align="center" prop="operationTypeName" width="120" />
<el-table-column label="物资类型" align="center" prop="wlTypeName" width="100" /> <el-table-column label="物资类型" align="center" prop="wlTypeName" width="100" />
<el-table-column label="入库时间" align="center" prop="operationTime" width="170"> <el-table-column label="入库时间" align="center" prop="operationTime" width="170">
@@ -74,6 +75,7 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="理货员" align="center" prop="operatorName" width="100" />
<el-table-column label="操作" align="center" fixed="right" width="260"> <el-table-column label="操作" align="center" fixed="right" width="260">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="picDetailFun(scope.row.billNo, 0, 1)">入库图片</el-button> <el-button link type="primary" @click="picDetailFun(scope.row.billNo, 0, 1)">入库图片</el-button>
@@ -128,7 +130,8 @@
<el-button type="primary" plain icon="Delete" @click="handleOneClickStockDel">一键删除</el-button> <el-button type="primary" plain icon="Delete" @click="handleOneClickStockDel">一键删除</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="detailLoading" ref="infoTableRef" highlight-current-row @row-click="(row) => tableInfoRowClick(row, infoTableRef)" show-overflow-tooltip border :data="stockList" <el-table v-loading="detailLoading" ref="infoTableRef" highlight-current-row
@row-click="(row) => tableInfoRowClick(row, infoTableRef)" show-overflow-tooltip border :data="stockList"
@selection-change="printSelectionChange"> @selection-change="printSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="70" /> <el-table-column label="序号" align="center" type="index" width="70" />
@@ -310,14 +313,20 @@
<div class="addBox"> <div class="addBox">
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<div class="addData" @click="addData"> <div class="addData" @click="addData">
<el-icon style="margin-right: 10px;" size="20"><FolderAdd /></el-icon> <el-icon style="margin-right: 10px;" size="20">
<FolderAdd />
</el-icon>
添加至入库 添加至入库
</div> </div>
<div @click="viewData" style="color: #000;text-decoration: underline;margin-left: 5px;">[已添加{{ outTempData.length }}条库存]</div> <div @click="viewData" style="color: #000;text-decoration: underline;margin-left: 5px;">[已添加{{
outTempData.length }}条库存]</div>
<!-- <div @click="viewData" style="color: red;text-decoration: underline;font-weight: bold;">[凭证重复入库或项目已关闭,请点击查看!]</div> --> <!-- <div @click="viewData" style="color: red;text-decoration: underline;font-weight: bold;">[凭证重复入库或项目已关闭,请点击查看!]</div> -->
</div> </div>
<div v-show="outTempData.length > 0 && planList.length === outTempData.length" @click="deleteData" style="display: flex;align-items: center;color: var(--el-color-primary);"> <div v-show="outTempData.length > 0 && planList.length === outTempData.length" @click="deleteData"
<el-icon><delete /></el-icon> style="display: flex;align-items: center;color: var(--el-color-primary);">
<el-icon>
<delete />
</el-icon>
<span>删除</span> <span>删除</span>
</div> </div>
</div> </div>
@@ -923,7 +932,7 @@ function addData() {
// // 2. 生成唯一标识组合键 // // 2. 生成唯一标识组合键
// const uniqueKey = `${item.id}_${item.pcode}_${realQty}`; // const uniqueKey = `${item.id}_${item.pcode}_${realQty}`;
// // 3. 检查组合键是否已存在 // // 3. 检查组合键是否已存在
// if (uniqueKeys.has(uniqueKey)) { // if (uniqueKeys.has(uniqueKey)) {
// // 存在重复拼接sapNo去重避免重复拼接 // // 存在重复拼接sapNo去重避免重复拼接
@@ -984,13 +993,13 @@ const deleteData = () => {
const uniqueIds = checkPlanList.value.map(item => item.uniqueId); const uniqueIds = checkPlanList.value.map(item => item.uniqueId);
console.log(uniqueIds) console.log(uniqueIds)
planList.value = planList.value.filter(item => { planList.value = planList.value.filter(item => {
// 无id的元素默认保留如果想删除无id的可改为 item?.id && !arr2Ids.has(item.id) // 无id的元素默认保留如果想删除无id的可改为 item?.id && !arr2Ids.has(item.id)
return !uniqueIds.includes(item?.uniqueId); return !uniqueIds.includes(item?.uniqueId);
}); });
outTempData.value = planList.value outTempData.value = planList.value
}); });
} }
//新增入库 多选框选中数据 //新增入库 多选框选中数据
function handleSelectionChange(selection, $event) { function handleSelectionChange(selection, $event) {
@@ -1580,7 +1589,7 @@ function handleDispatch() {
return; return;
} }
let isDiaodu = checkStockList.value.some((item) => item.execStatus == 0); let isDiaodu = checkStockList.value.some((item) => item.execStatus == 0);
if(isDiaodu){ if (isDiaodu) {
proxy.$modal.msgWarning("预入库数据不能生成调度任务"); proxy.$modal.msgWarning("预入库数据不能生成调度任务");
return; return;
} }
@@ -1594,17 +1603,17 @@ function submitDispatch() {
return; return;
} }
let data; let data;
data = checkStockList.value.map((item) => ({ data = checkStockList.value.map((item) => ({
sourceName: "V01-010101", sourceName: "V01-010101",
targetName: item.pcode, targetName: item.pcode,
taskTypeName: "上架", taskTypeName: "上架",
taskType: 0, taskType: 0,
mid: item.wlNo, mid: item.wlNo,
num: 1, num: 1,
dispatchMode: resource.value, dispatchMode: resource.value,
})); }));
// if (billStatus.value == "rk") { // if (billStatus.value == "rk") {
// data = checkStockList.value.map((item) => ({ // data = checkStockList.value.map((item) => ({
// sourceName: "V01-010101", // sourceName: "V01-010101",
@@ -1858,7 +1867,6 @@ function isAudit() {
isAudit(); isAudit();
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.printMeBox { .printMeBox {
div { div {
line-height: 30px; line-height: 30px;
@@ -1926,12 +1934,13 @@ isAudit();
} }
.addBox{ .addBox {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 10px; margin-bottom: 10px;
cursor: pointer; cursor: pointer;
.addData { .addData {
display: flex; display: flex;
align-items: center; align-items: center;

File diff suppressed because it is too large Load Diff