feat(wms): 新增带改判记录的钢卷列表接口及展示

feat(crm): 在订单异议页面添加异议内容和处理结果的HTML展示

feat(erp): 新增ERP仪表盘页面并优化采购订单表单

refactor(wms): 移除钢卷列表中的冗余代码并添加改判原因列
This commit is contained in:
2026-05-09 14:08:11 +08:00
parent e42afdaf20
commit d09079f4c1
6 changed files with 1005 additions and 1114 deletions

View File

@@ -185,28 +185,8 @@
</el-select>
</template>
</el-table-column>
<!-- <el-table-column label="关联信息" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.parentCoilNos && scope.row.hasMergeSplit === 1 && scope.row.dataType === 1">
<el-tag type="warning" size="mini">来自母卷{{ scope.row.parentCoilNos }}</el-tag>
</span>
<span v-else-if="scope.row.parentCoilNos && scope.row.dataType === 0">
<el-tag type="info" size="mini">分为子卷{{ scope.row.parentCoilNos }}</el-tag>
</span>
<span v-else-if="scope.row.parentCoilNos && scope.row.hasMergeSplit === 2">
<el-tag type="success" size="mini">合并自{{ scope.row.parentCoilNos }}</el-tag>
</span>
<span v-else></span>
</template>
</el-table-column> -->
<el-table-column v-if="showGrade" label="质量状态" align="center" prop="qualityStatus">
<!-- <template slot-scope="scope">
<el-select v-model="scope.row.qualityStatus" placeholder="请选择质量状态" @change="handleGradeChange(scope.row)">
<el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :value="item.value"
:label="item.label" />
</el-select>
</template> -->
</el-table-column>
<el-table-column label="逻辑库位" align="center" prop="warehouseId" v-if="editWarehouse">
<template slot-scope="scope">
@@ -215,6 +195,8 @@
</template>
</el-table-column>
<el-table-column v-if="hasTransferType" label="实际库区" align="center" prop="actualWarehouseName" />
<el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
@@ -229,6 +211,7 @@
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column v-if="hasTransferType" label="调拨类型" align="center" prop="transferType" />
<el-table-column v-if="hasTransferType" label="改判原因" align="center" prop="rejudgeInfo.rejudgeReason" />
<el-table-column label="钢卷去向" align="center" prop="nextWarehouseId" v-if="editNext" width="150">
<template slot-scope="scope">
@@ -639,7 +622,8 @@ import {
cancelExportCoil,
checkCoilNo,
returnCoil,
getCoilStatisticsList
getCoilStatisticsList,
listWithAdjustRecordCoil
} from "@/api/wms/coil";
import { listBoundCoil } from "@/api/wms/deliveryWaybillDetail";
import { addPendingAction } from "@/api/wms/pendingAction";
@@ -1339,6 +1323,19 @@ export default {
})
return;
}
if (this.hasTransferType) {
listWithAdjustRecordCoil(query).then(response => {
this.materialCoilList = response.rows
this.total = response.total;
this.loading = false;
});
getCoilStatisticsList(statisticQuery).then(res => {
this.statistics = res.data || [];
})
return;
}
listMaterialCoil(query).then(response => {
this.materialCoilList = response.rows
this.total = response.total;
@@ -1744,6 +1741,7 @@ export default {
},
handleExportAll() {
const { orderBy, ...query } = this.queryParams;
query.selectType = query.itemType;
this.download('wms/materialCoil/export', query, `materialCoil_${new Date().getTime()}.xlsx`)
},
handleExportAllProps() {