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

feat(钢卷异常): 重构异常记录功能，增加开始/结束位置字段

Browse Source 
refactor(发货单): 添加发货计划选择功能

feat(报表): 新增合并报表页面，支持投入产出钢卷统计

style: 移除多余的空格和注释代码
This commit is contained in:
砂糖
2026-03-17 14:52:54 +08:00
parent 3c745b8ce4
commit b6387a53d8
10 changed files with 367 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-ui/src/views/wms/coil/abnormal.vue
View File

@@ -14,7 +14,7 @@ export default {
querys: {
dataType: 1,
// 筛选异常数量大于等于1的
minAbnormalCount: 1
// minAbnormalCount: 1
},
labelType: '2',
qrcode: false,

13
klp-ui/src/views/wms/coil/abnormalCoil.vue
View File

@@ -65,7 +65,9 @@
<dict-tag :options="dict.type.coil_abnormal_position" :value="scope.row.position" />
</template>
</el-table-column>
<el-table-column label="长度坐标" align="center" prop="lengthCoord" />
<el-table-column label="开始位置" align="center" prop="startPosition" />
<el-table-column label="结束位置" align="center" prop="endPosition" />
<el-table-column label="缺陷长度" align="center" prop="length" />
<el-table-column label="缺陷代码" align="center" prop="defectCode">
<template slot-scope="scope">
<dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />
@@ -120,7 +122,10 @@
</el-radio-group>
</el-form-item>
<el-form-item label="长度坐标" prop="lengthCoord">
<el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" />
<!-- <el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" /> -->
<el-input v-model="form.startPosition" placeholder="请输入开始位置" />
<el-input v-model="form.endPosition" placeholder="请输入结束位置" />
<!-- <el-input v-model="form.length" placeholder="请输入缺陷长度" /> -->
</el-form-item>
<el-form-item label="缺陷代码" prop="defectCode">
<el-radio-group v-model="form.defectCode">
@@ -339,7 +344,7 @@ export default {
if (valid) {
this.buttonLoading = true;
if (this.form.abnormalId != null) {
updateCoilAbnormal(this.form).then(response => {
updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@@ -347,7 +352,7 @@ export default {
this.buttonLoading = false;
});
} else {
addCoilAbnormal(this.form).then(response => {
addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();

18
klp-ui/src/views/wms/coil/abnormalDetail.vue
View File

@@ -58,7 +58,9 @@
<dict-tag :options="dict.type.coil_abnormal_position" :value="scope.row.position" />
</template>
</el-table-column>
<el-table-column label="长度坐标" align="center" prop="lengthCoord" />
<el-table-column label="开始位置" align="center" prop="startPosition" />
<el-table-column label="结束位置" align="center" prop="endPosition" />
<el-table-column label="缺陷长度" align="center" prop="length" />
<el-table-column label="缺陷代码" align="center" prop="defectCode">
<template slot-scope="scope">
<dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />
@@ -106,9 +108,15 @@
dict.label }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="长度坐标" prop="lengthCoord">
<el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" />
<el-form-item label="开始位置" prop="startPosition">
<el-input v-model="form.startPosition" prop="startPosition" />
</el-form-item>
<el-form-item label="结束位置" prop="endPosition">
<el-input v-model="form.endPosition" prop="endPosition" />
</el-form-item>
<!-- <el-form-item label="缺陷长度" prop="length">
<el-input v-model="form.length" placeholder="请输入缺陷长度" />
</el-form-item> -->
<el-form-item label="缺陷代码" prop="defectCode">
<el-radio-group v-model="form.defectCode">
<el-radio-button v-for="dict in dict.type.coil_abnormal_code" :key="dict.value" :label="dict.value">{{
@@ -293,7 +301,7 @@ export default {
if (valid) {
this.buttonLoading = true;
if (this.form.abnormalId != null) {
updateCoilAbnormal(this.form).then(response => {
updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@@ -301,7 +309,7 @@ export default {
this.buttonLoading = false;
});
} else {
addCoilAbnormal(this.form).then(response => {
addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();

15
klp-ui/src/views/wms/coil/panels/abnormal.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="app-container">
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="位置" prop="position">
<el-select v-model="queryParams.position" placeholder="请选择位置" clearable>
@@ -32,7 +32,9 @@
<dict-tag :options="dict.type.coil_abnormal_position" :value="scope.row.position" />
</template>
</el-table-column>
<el-table-column label="长度坐标" align="center" prop="lengthCoord" />
<el-table-column label="开始位置" align="center" prop="startPosition" />
<el-table-column label="结束位置" align="center" prop="endPosition" />
<el-table-column label="缺陷长度" align="center" prop="length" />
<el-table-column label="缺陷代码" align="center" prop="defectCode">
<template slot-scope="scope">
<dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />
@@ -64,7 +66,10 @@
</el-radio-group>
</el-form-item>
<el-form-item label="长度坐标" prop="lengthCoord">
<el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" />
<!-- <el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" /> -->
<el-input v-model="form.startPosition" placeholder="请输入开始位置" />
<el-input v-model="form.endPosition" placeholder="请输入结束位置" />
<!-- <el-input v-model="form.length" placeholder="请输入缺陷长度" /> -->
</el-form-item>
<el-form-item label="缺陷代码" prop="defectCode">
<el-radio-group v-model="form.defectCode">
@@ -228,7 +233,7 @@ export default {
if (valid) {
this.buttonLoading = true;
if (this.form.abnormalId != null) {
updateCoilAbnormal(this.form).then(response => {
updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@@ -236,7 +241,7 @@ export default {
this.buttonLoading = false;
});
} else {
addCoilAbnormal(this.form).then(response => {
addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();

10
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -251,8 +251,8 @@
@click="handleReturnCoil(scope.row)">
退货钢卷
</el-button>
<el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload"
@click="handleAbnormal(scope.row)">查看异常</el-button>
<!-- <el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload"
@click="handleAbnormal(scope.row)">查看异常</el-button> -->
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
v-if="showControl">修正</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-time" @click="handleLog(scope.row)"
@@ -396,9 +396,9 @@
</div>
</el-dialog>
<el-dialog title="异常信息" :visible.sync="abnormalOpen" width="90%" append-to-body>
<abnormal-list :coil-id="currentCoilId"></abnormal-list>
</el-dialog>
<!-- <el-dialog title="异常信息" :visible.sync="abnormalOpen" width="90%" append-to-body> -->
<abnormal-list v-if="showAbnormal && currentCoilId" :coil-id="currentCoilId"></abnormal-list>
<!-- </el-dialog> -->
<!-- 吞吐记录 -->
<!-- <el-dialog v-if="showWareLog" title="吞吐记录" :visible.sync="logOpen" width="90%" append-to-body> -->

17
klp-ui/src/views/wms/coil/panels/do.vue
View File

@@ -446,7 +446,11 @@
</el-radio-group>
</el-form-item>
<el-form-item label="长度坐标" prop="lengthCoord">
<el-input v-model="exceptionForm.lengthCoord" placeholder="请输入长度坐标" />
<div style="display: flex; gap: 10px;">
<el-input v-model="exceptionForm.startPosition" placeholder="请输入开始位置" />
-
<el-input v-model="exceptionForm.endPosition" placeholder="请输入结束位置" />
</div>
</el-form-item>
<el-form-item label="缺陷代码" prop="defectCode">
<el-radio-group v-model="exceptionForm.defectCode">
@@ -557,6 +561,8 @@ export default {
coilId: null,
position: null,
lengthCoord: null,
startPosition: 0,
endPosition: 0,
defectCode: null,
degree: null,
remark: null
@@ -975,7 +981,10 @@ export default {
this.exceptionDialogVisible = true
},
confirmException() {
addCoilAbnormal(this.exceptionForm).then(response => {
addCoilAbnormal({
...this.exceptionForm,
length: this.exceptionForm.endPosition - this.exceptionForm.startPosition,
}).then(response => {
this.$message.success('异常记录添加成功')
this.cancelException();
// 重置表单
@@ -1033,7 +1042,9 @@ export default {
this.exceptionForm = {
coilId: null,
position: null,
lengthCoord: null,
lengthCoord: 0,
startPosition: 0,
endPosition: 0,
defectCode: null,
degree: null,
remark: null