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

feat(报表): 添加分条线统计组件并扩展合同字段

Browse Source 
添加分条线专用的统计组件SplitSummary，用于展示分条处理的产出与消耗对比数据
在多个报表模板中集成该组件并添加钢卷高亮功能
扩展CrmOrder相关类的合同信息字段
This commit is contained in:
砂糖
2026-04-13 16:23:40 +08:00
parent 5ee730bffa
commit 37dc213605
11 changed files with 582 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
klp-ui/src/views/wms/report/template/comprehensive.vue
View File

@@ -100,14 +100,17 @@
}}</el-descriptions-item>
</el-descriptions>
<!-- 分条信息统计 -->
<split-summary :origin-outputlist="list" :origin-loss-list="lossList" :common-coil-ids="commonCoilIds"></split-summary>
<el-descriptions title="明细信息" :column="3" border>
</el-descriptions>
<el-tabs v-model="activeTab">
<el-tab-pane label="产出钢卷" name="output">
<coil-table :columns="outputColumns" :data="list"></coil-table>
<coil-table :columns="outputColumns" :data="list" :highlight-config="{ rows: commonCoilIds }"></coil-table>
</el-tab-pane>
<el-tab-pane label="投入钢卷" name="loss">
<coil-table :columns="lossColumns" :data="lossList"></coil-table>
<coil-table :columns="lossColumns" :data="lossList" :highlight-config="{ rows: commonCoilIds }"></coil-table>
</el-tab-pane>
</el-tabs>
@@ -135,6 +138,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import { calcSummary, calcAbSummary, calcMSummary } from "@/views/wms/report/js/calc";
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue";
import { saveReportFile } from "@/views/wms/report/js/reportFile";
export default {
@@ -148,6 +152,7 @@ export default {
WarehouseSelect,
ColumnsSetting,
CoilTable,
SplitSummary,
},
props: {
actionTypes: {
@@ -279,7 +284,28 @@ export default {
},
mSummary() {
return calcMSummary(this.list, this.lossList)
}
},
// 找出list和lossList中id相同的卷
commonCoilIds() {
if (this.productionLine !== '分条线') {
return []
}
// 获取list中的coilId集合
const outputCoilIds = new Set(this.list.map(item => item.coilId))
// 获取lossList中的coilId集合
const lossCoilIds = new Set(this.lossList.map(item => item.coilId))
// 找出两个集合中相同的coilId
const commonIds = []
outputCoilIds.forEach(id => {
if (lossCoilIds.has(id)) {
commonIds.push(id)
}
})
return commonIds
},
},
methods: {
// 加载列设置

5
klp-ui/src/views/wms/report/template/day.vue
View File

@@ -97,6 +97,9 @@
}}</el-descriptions-item>
</el-descriptions>
<!-- 分条信息统计 -->
<split-summary :origin-outputlist="list" :origin-loss-list="lossList" :common-coil-ids="commonCoilIds"></split-summary>
<el-descriptions title="明细信息" :column="3" border>
</el-descriptions>
<el-tabs v-model="activeTab">
@@ -128,6 +131,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import { calcSummary, calcAbSummary, calcMSummary } from "@/views/wms/report/js/calc";
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue";
import { fetchLossList, fetchOutputList } from "@/views/wms/report/js/fetch";
import { saveReportFile } from "@/views/wms/report/js/reportFile";
@@ -143,6 +147,7 @@ export default {
WarehouseSelect,
ColumnsSetting,
CoilTable,
SplitSummary,
},
props: {
actionTypes: {

32
klp-ui/src/views/wms/report/template/month.vue
View File

@@ -97,14 +97,17 @@
}}</el-descriptions-item>
</el-descriptions>
<!-- 分条信息统计 -->
<split-summary :origin-outputlist="list" :origin-loss-list="lossList" :common-coil-ids="commonCoilIds"></split-summary>
<el-descriptions title="明细信息" :column="3" border>
</el-descriptions>
<el-tabs v-model="activeTab">
<el-tab-pane label="产出钢卷" name="output">
<coil-table :columns="outputColumns" :data="list"></coil-table>
<coil-table :columns="outputColumns" :data="list" :highlight-config="{ rows: commonCoilIds }"></coil-table>
</el-tab-pane>
<el-tab-pane label="投入钢卷" name="loss">
<coil-table :columns="lossColumns" :data="lossList"></coil-table>
<coil-table :columns="lossColumns" :data="lossList" :highlight-config="{ rows: commonCoilIds }"></coil-table>
</el-tab-pane>
</el-tabs>
@@ -132,6 +135,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import { calcSummary, calcAbSummary, calcMSummary } from "@/views/wms/report/js/calc";
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue";
import { fetchLossList, fetchOutputList } from "@/views/wms/report/js/fetch";
import { saveReportFile } from "@/views/wms/report/js/reportFile";
@@ -146,6 +150,7 @@ export default {
WarehouseSelect,
ColumnsSetting,
CoilTable,
SplitSummary,
},
props: {
actionTypes: {
@@ -276,7 +281,28 @@ export default {
},
mSummary() {
return calcMSummary(this.list, this.lossList)
}
},
// 找出list和lossList中id相同的卷
commonCoilIds() {
if (this.productionLine !== '分条线') {
return []
}
// 获取list中的coilId集合
const outputCoilIds = new Set(this.list.map(item => item.coilId))
// 获取lossList中的coilId集合
const lossCoilIds = new Set(this.lossList.map(item => item.coilId))
// 找出两个集合中相同的coilId
const commonIds = []
outputCoilIds.forEach(id => {
if (lossCoilIds.has(id)) {
commonIds.push(id)
}
})
return commonIds
},
},
methods: {
// 加载列设置

32
klp-ui/src/views/wms/report/template/team.vue
View File

@@ -106,6 +106,9 @@
}}</el-descriptions-item>
</el-descriptions>
<!-- 分条信息统计 -->
<split-summary :origin-outputlist="list" :origin-loss-list="lossList" :common-coil-ids="commonCoilIds"></split-summary>
<el-descriptions title="班组统计信息" :column="3" border>
</el-descriptions>
<el-table :data="teamSummary" border>
@@ -118,10 +121,10 @@
</el-descriptions>
<el-tabs v-model="activeTab">
<el-tab-pane label="产出钢卷" name="output">
<coil-table :columns="outputColumns" :data="list"></coil-table>
<coil-table :columns="outputColumns" :data="list" :highlight-config="{ rows: commonCoilIds }"></coil-table>
</el-tab-pane>
<el-tab-pane label="投入钢卷" name="loss">
<coil-table :columns="lossColumns" :data="lossList"></coil-table>
<coil-table :columns="lossColumns" :data="lossList" :highlight-config="{ rows: commonCoilIds }"></coil-table>
</el-tab-pane>
</el-tabs>
@@ -145,6 +148,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import { calcSummary, calcAbSummary, calcTeamSummary, calcMSummary } from "@/views/wms/report/js/calc";
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue";
import { fetchLossList, fetchOutputList } from "@/views/wms/report/js/fetch";
import { saveReportFile } from "@/views/wms/report/js/reportFile";
@@ -159,6 +163,7 @@ export default {
WarehouseSelect,
ColumnsSetting,
CoilTable,
SplitSummary,
},
props: {
actionTypes: {
@@ -273,7 +278,28 @@ export default {
outWeight: formatWeight(outData.weight)
};
});
}
},
// 找出list和lossList中id相同的卷
commonCoilIds() {
if (this.productionLine !== '分条线') {
return [];
}
// 获取list中的coilId集合
const outputCoilIds = new Set(this.list.map(item => item.coilId));
// 获取lossList中的coilId集合
const lossCoilIds = new Set(this.lossList.map(item => item.coilId));
// 找出两个集合中相同的coilId
const commonIds = [];
outputCoilIds.forEach(id => {
if (lossCoilIds.has(id)) {
commonIds.push(id);
}
});
return commonIds;
},
},
methods: {
// 加载列设置

36
klp-ui/src/views/wms/report/template/year.vue
View File

@@ -96,14 +96,17 @@
}}</el-descriptions-item>
</el-descriptions>
<!-- 分条信息统计 -->
<split-summary :origin-outputlist="list" :origin-loss-list="lossList" :common-coil-ids="commonCoilIds"></split-summary>
<el-descriptions title="明细信息" :column="3" border>
</el-descriptions>
<el-tabs v-model="activeTab">
<el-tab-pane label="产出钢卷" name="output">
<coil-table :columns="outputColumns" :data="list"></coil-table>
<coil-table :columns="outputColumns" :data="list" :highlight-config="{ rows: commonCoilIds }"></coil-table>
</el-tab-pane>
<el-tab-pane label="投入钢卷" name="loss">
<coil-table :columns="lossColumns" :data="lossList"></coil-table>
<coil-table :columns="lossColumns" :data="lossList" :highlight-config="{ rows: commonCoilIds }"></coil-table>
</el-tab-pane>
</el-tabs>
@@ -118,10 +121,6 @@
</template>
<script>
import { listCoilWithIds } from "@/api/wms/coil";
import {
listPendingAction,
} from '@/api/wms/pendingAction';
import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
@@ -131,6 +130,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import { calcSummary, calcAbSummary, calcMSummary } from "@/views/wms/report/js/calc";
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
import SplitSummary from "@/views/wms/report/components/summary/splitSummary.vue";
import { fetchLossList, fetchOutputList } from "@/views/wms/report/js/fetch";
import { saveReportFile } from "@/views/wms/report/js/reportFile";
@@ -145,6 +145,7 @@ export default {
WarehouseSelect,
ColumnsSetting,
CoilTable,
SplitSummary,
},
props: {
actionTypes: {
@@ -254,7 +255,28 @@ export default {
},
mSummary() {
return calcMSummary(this.list, this.lossList)
}
},
// 找出list和lossList中id相同的卷
commonCoilIds() {
if (this.productionLine !== '分条线') {
return []
}
// 获取list中的coilId集合
const outputCoilIds = new Set(this.list.map(item => item.coilId))
// 获取lossList中的coilId集合
const lossCoilIds = new Set(this.lossList.map(item => item.coilId))
// 找出两个集合中相同的coilId
const commonIds = []
outputCoilIds.forEach(id => {
if (lossCoilIds.has(id)) {
commonIds.push(id)
}
})
return commonIds
},
},
methods: {
// 加载列设置