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

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-03-30 13:19:26 +08:00
parent 2dff94c3bd bb9252e3a2
commit d26bdb38ca
21 changed files with 361 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-ui/src/utils/enum.js
View File

@@ -8,7 +8,7 @@ export const MemoInputStorageKey = {
licensePlate: 'licensePlate', // 车牌号
qualityStatus: 'qualityStatus', // 质量状态
trimmingRequirement: 'trimmingRequirement', // 钢卷修剪要求
packingStatus: 'packingStatus', // 打包状态
packingStatus: 'packingStatus', // 原料材质
packagingRequirement: 'packagingRequirement', // 打包要求
coilSpec: 'coilSpec', // 钢卷规格
coatingType: 'coatingType', // 钢卷镀层种类

13
klp-ui/src/views/aps/planSheet/PlanDetailForm.vue
View File

@@ -112,19 +112,26 @@
<el-col :span="12">
<el-form-item label="表面处理" prop="surfaceTreatment">
<el-input v-model="formData.surfaceTreatment" placeholder="请输入表面处理要求" />
<MemoInput storageKey="surfaceTreatmentDesc" v-model="formData.surfaceTreatment" placeholder="请输入表面处理" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="切边要求" prop="widthReq">
<el-input v-model="formData.widthReq" placeholder="请输入切边要求" />
<el-select v-model="formData.widthReq" placeholder="请输入切边要求" style="width: 100%">
<el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="包装要求" prop="productPackaging">
<el-input v-model="formData.productPackaging" placeholder="请输入包装要求" />
<el-select v-model="formData.productPackaging" placeholder="请选择包装要求" style="width: 100%">
<el-option label="裸包" value="裸包" />
<el-option label="普包" value="普包" />
<el-option label="简包" value="简包" />
</el-select>
</el-form-item>
</el-col>

33
klp-ui/src/views/wms/coil/components/AbnormalForm.vue
View File

@@ -5,25 +5,42 @@
</el-form-item>
<el-form-item label="位置" prop="position">
<el-radio-group v-model="formData.position">
<el-radio-button v-for="dict in dict.type.coil_abnormal_position" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio-button>
<el-radio-button v-for="dict in dict.type.coil_abnormal_position" :key="dict.value" :label="dict.value">{{
dict.label }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="开始位置" prop="startPosition">
<el-input v-model="formData.startPosition" type="number" placeholder="请输入开始位置" />
<el-form-item>
<el-alert title="异常位置为内圈算起" type="info" :closable="false" show-icon size="small" />
</el-form-item>
<el-form-item label="结束位置" prop="endPosition">
<el-input v-model="formData.endPosition" type="number" placeholder="请输入结束位置" />
<el-form-item label="异常位置" required>
<div style="display: flex; align-items: center;">
<el-form-item prop="startPosition">
<el-input v-model="formData.startPosition" type="number" placeholder="请输入开始位置" />
</el-form-item>
<el-form-item prop="endPosition">
<el-input v-model="formData.endPosition" type="number" placeholder="请输入结束位置" />
</el-form-item>
</div>
</el-form-item>
<el-form-item label="缺陷代码" prop="defectCode">
<el-radio-group v-model="formData.defectCode">
<el-radio-button v-for="dict in dict.type.coil_abnormal_code" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio-button>
<el-radio-button v-for="dict in dict.type.coil_abnormal_code" :key="dict.value" :label="dict.value">{{
dict.label }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="程度" prop="degree">
<el-radio-group v-model="formData.degree">
<el-radio-button v-for="dict in dict.type.coil_abnormal_degree" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio-button>
<el-radio-button v-for="dict in dict.type.coil_abnormal_degree" :key="dict.value" :label="dict.value">{{
dict.label }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="产线" prop="line">
<el-select v-model="formData.line" placeholder="请选择产线">
<el-option v-for="dict in dict.type.sys_lines" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
@@ -48,7 +65,7 @@ export default {
default: false
}
},
dicts: ['coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree', 'coil_abnormal_level'],
dicts: ['coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree', 'sys_lines'],
data() {
return {
rules: {

203
klp-ui/src/views/wms/coil/components/ExceptionManager.vue Normal file
View File

@@ -0,0 +1,203 @@
<template>
<div class="exception-container" v-loading="abnormalLoading">
<div class="exception-section">
<h4 class="section-title">异常记录</h4>
<el-table :data="abnormalList" style="width: 100%">
<el-table-column label="开始位置" prop="startPosition"></el-table-column>
<el-table-column label="结束位置" prop="endPosition"></el-table-column>
<el-table-column label="长度" prop="length"></el-table-column>
<el-table-column label="缺陷位置" prop="position"></el-table-column>
<el-table-column label="缺陷代码" prop="defectCode">
<template slot-scope="scope">
<dict-tag :dict-type="dict.type.defectCode" :dict-value="scope.row.defectCode" />
</template>
</el-table-column>
<el-table-column label="程度" prop="degree"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" width="120">
<template slot-scope="scope">
<el-button type="danger" plain size="mini" :loading="buttonLoading" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="exception-section">
<h4 class="section-title">新增异常</h4>
<div class="form-container">
<abnormal-form ref="abnormalForm" v-model="exceptionForm" :show-coil-selector="false"></abnormal-form>
<div class="form-actions">
<el-button type="primary" @click="confirmException" :loading="buttonLoading">确认新增</el-button>
<el-button @click="resetExceptionForm" :loading="buttonLoading">重置表单</el-button>
</div>
</div>
</div>
</div>
</template>
<script>
import { addCoilAbnormal, listCoilAbnormal, delCoilAbnormal } from '@/api/wms/coilAbnormal'
import AbnormalForm from './AbnormalForm'
export default {
name: 'ExceptionManager',
components: {
AbnormalForm
},
dicts: ['coil_abnormal_code'],
props: {
coilId: {
type: String,
required: true
}
},
data() {
return {
exceptionForm: {
coilId: this.coilId,
position: null,
lengthCoord: 0,
startPosition: 0,
endPosition: 0,
defectCode: null,
degree: null,
remark: null
},
abnormalList: [],
abnormalLoading: false,
buttonLoading: false,
}
},
watch: {
coilId: {
handler(newVal) {
this.exceptionForm.coilId = newVal
this.loadAbnormalList()
},
immediate: true
}
},
methods: {
confirmException() {
this.$refs.abnormalForm.validate(valid => {
if (valid) {
this.buttonLoading = true
addCoilAbnormal({
...this.exceptionForm,
length: this.exceptionForm.endPosition - this.exceptionForm.startPosition
}).then(response => {
this.$message.success('异常记录添加成功')
this.resetExceptionForm()
this.loadAbnormalList()
}).catch(error => {
console.error('异常记录添加失败:', error)
this.$message.error('异常记录添加失败: ' + (error.message || error))
}).finally(() => {
this.buttonLoading = false
})
}
})
},
resetExceptionForm() {
this.exceptionForm = {
coilId: this.coilId,
position: null,
lengthCoord: 0,
startPosition: 0,
endPosition: 0,
defectCode: null,
degree: null,
remark: null
}
this.$refs.abnormalForm.resetFields()
},
loadAbnormalList() {
if (!this.coilId) {
return
}
this.abnormalLoading = true
listCoilAbnormal({
coilId: this.coilId
}).then(response => {
this.abnormalList = response.rows || []
}).catch(error => {
console.error('查询异常记录失败:', error)
this.$message.error('查询异常记录失败: ' + (error.message || error))
}).finally(() => {
this.abnormalLoading = false
})
},
handleDelete(row) {
this.$modal.confirm('确认删除异常记录吗？', '删除确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.buttonLoading = true
delCoilAbnormal(row.abnormalId).then(response => {
this.$message.success('异常记录删除成功')
this.loadAbnormalList()
}).catch(error => {
console.error('异常记录删除失败:', error)
this.$message.error('异常记录删除失败: ' + (error.message || error))
}).finally(() => {
this.buttonLoading = false
})
})
}
}
}
</script>
<style scoped>
.exception-container {
display: flex;
flex-direction: column;
gap: 20px;
overflow-y: auto;
}
.exception-section {
background-color: #fafafa;
border-radius: 4px;
padding: 16px;
border: 1px solid #e4e7ed;
}
.section-title {
margin: 0 0 16px 0;
font-size: 14px;
font-weight: 600;
color: #303133;
padding-bottom: 8px;
border-bottom: 1px solid #e4e7ed;
}
.exception-section:first-child {
flex: 1;
min-height: 200px;
}
.exception-section:last-child {
flex-shrink: 0;
}
.form-container {
display: flex;
flex-direction: column;
gap: 16px;
}
.form-actions {
display: flex;
justify-content: flex-end;
gap: 10px;
padding: 12px 16px;
background-color: #fafafa;
border-top: 1px solid #e4e7ed;
border-radius: 0 0 4px 4px;
margin-top: -16px;
margin-left: -16px;
margin-right: -16px;
margin-bottom: -16px;
}
</style>

10
klp-ui/src/views/wms/coil/do/correct.vue
View File

@@ -98,7 +98,7 @@
<span class="param-value">{{ item.trimmingRequirement }}</span>
</div>
<div class="param-row" v-if="item.packingStatus">
<span class="param-label">打包状态：</span>
<span class="param-label">原料材质：</span>
<span class="param-value">{{ item.packingStatus }}</span>
</div>
<div class="param-row" v-if="item.packagingRequirement">
@@ -204,11 +204,11 @@
:loading="item.picking" class="action-btn">修正</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(item)"
:loading="item.picking" class="action-btn">删除</el-button>
<el-button type="warning" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
<!-- <el-button type="warning" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
@click="handleAddAbnormal(item)" :loading="item.cancelling" class="action-btn">
异常
<span v-if="item.abnormalCount > 0">({{ item.abnormalCount }})</span>
</el-button>
</el-button> -->
</div>
</div>
</div>
@@ -310,8 +310,8 @@
</el-select>
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>

6
klp-ui/src/views/wms/coil/do/correntAll.vue
View File

@@ -89,7 +89,7 @@
<span class="param-value">{{ item.trimmingRequirement }}</span>
</div>
<div class="param-row" v-if="item.packingStatus">
<span class="param-label">打包状态：</span>
<span class="param-label">原料材质：</span>
<span class="param-value">{{ item.packingStatus }}</span>
</div>
<div class="param-row" v-if="item.packagingRequirement">
@@ -384,8 +384,8 @@
</el-select>
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>

8
klp-ui/src/views/wms/coil/do/packing.vue
View File

@@ -95,8 +95,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入原料材质" :disabled="readonly">
</el-input>
</el-form-item>
</el-col>
@@ -165,8 +165,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="打包状态" prop="packingStatus">
<memo-input v-model="form.packingStatus" placeholder="请输入打包状态" storageKey="packingStatus">
<el-form-item label="原料材质" prop="packingStatus">
<memo-input v-model="form.packingStatus" placeholder="请输入原料材质" storageKey="packingStatus">
</memo-input>
</el-form-item>
</el-col>

4
klp-ui/src/views/wms/coil/do/search.vue
View File

@@ -92,8 +92,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>
</el-col>

4
klp-ui/src/views/wms/coil/do/ship.vue
View File

@@ -88,8 +88,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>
</el-col>

22
klp-ui/src/views/wms/coil/do/warehousing.vue
View File

@@ -76,8 +76,8 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>
</el-col>
@@ -136,11 +136,17 @@
</el-col>
<el-col :span="24">
<el-form-item :label="getItemLabel" prop="itemId" v-if="!form.coilId">
<product-select v-if="form.itemType == 'product'" v-model="form.itemId" clearable />
<raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId" clearable />
<product-select v-if="form.itemType == 'product'" @change="handleProductChange" v-model="form.itemId" clearable />
<raw-material-select v-else-if="form.itemType == 'raw_material'" @change="handleProductChange" v-model="form.itemId" clearable />
<div v-else>请先选择材料类型</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="原料材质" prop="packingStatus" v-if="!form.coilId">
<el-input v-model="form.packingStatus" placeholder="请输入原料材质" />
</el-form-item>
</el-col>
</el-row>
<el-form-item>
@@ -306,8 +312,8 @@
</el-select>
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="editCoil.form.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="editCoil.form.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>
@@ -548,6 +554,10 @@ export default {
},
},
methods: {
handleProductChange(value, obj) {
console.log(value, obj.material)
this.form.packingStatus = obj.material || ''
},
// 处理材料类型变化
handleMaterialTypeChange(value) {
// 清空物品选择

4
klp-ui/src/views/wms/coil/merge.vue
View File

@@ -151,8 +151,8 @@
</div>
<div class="form-row">
<el-form-item label="打包状态" prop="packingStatus" class="form-item-half">
<el-input v-model="targetCoil.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
<el-form-item label="原料材质" prop="packingStatus" class="form-item-half">
<el-input v-model="targetCoil.packingStatus" placeholder="请输入原料材质" :disabled="readonly">
</el-input>
</el-form-item>
<el-form-item label="包装要求" prop="packagingRequirement" class="form-item-half">

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

@@ -355,8 +355,8 @@
</el-select>
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>
@@ -791,7 +791,7 @@ export default {
{ label: '毛重', prop: 'grossWeight' },
{ label: '备注', prop: 'remark' },
{ label: '质量状态', prop: 'qualityStatus' },
{ label: '打包状态', prop: 'packingStatus' },
{ label: '原料材质', prop: 'packingStatus' },
{ label: '切边要求', prop: 'edgeRequirement' },
{ label: '包装要求', prop: 'packagingRequirement' },
{ label: '厂家', prop: 'itemManufacturer' },

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

@@ -84,7 +84,7 @@
<span class="param-value">{{ item.trimmingRequirement }}</span>
</div>
<div class="param-row" v-if="item.packingStatus">
<span class="param-label">打包状态：</span>
<span class="param-label">原料材质：</span>
<span class="param-value">{{ item.packingStatus }}</span>
</div>
<div class="param-row" v-if="item.packagingRequirement">
@@ -410,13 +410,8 @@
</el-col>
</el-row>
<el-dialog title="新增异常" :visible.sync="exceptionDialogVisible" width="600px">
<abnormal-form ref="abnormalForm" v-model="exceptionForm" :show-coil-selector="false"></abnormal-form>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="handleAbnormal">查看异常</el-button>
<el-button type="primary" @click="confirmException">确 定</el-button>
<el-button @click="cancelException">取 消</el-button>
</div>
<el-dialog title="异常管理" :visible.sync="exceptionDialogVisible" fullscreen>
<exception-manager :coilId="currentCoilId"></exception-manager>
</el-dialog>
<!-- 标签预览弹窗 -->
@@ -439,10 +434,9 @@ import { listPendingAction, startProcess, cancelAction, delPendingAction, addPen
import { parseTime } from '@/utils/klp'
import ProductInfo from '@/components/KLPService/Renderer/ProductInfo'
import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo'
import { addCoilAbnormal } from '@/api/wms/coilAbnormal'
import LabelRender from './LabelRender/index.vue'
import StepSplit from './stepSplit.vue'
import AbnormalForm from '../components/AbnormalForm'
import ExceptionManager from '../components/ExceptionManager'
import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint'
export default {
@@ -467,7 +461,7 @@ export default {
RawMaterialInfo,
LabelRender,
StepSplit,
AbnormalForm
ExceptionManager
},
data() {
return {
@@ -503,16 +497,7 @@ export default {
},
buttonLoading: false,
exceptionDialogVisible: false,
exceptionForm: {
coilId: null,
position: null,
lengthCoord: null,
startPosition: 0,
endPosition: 0,
defectCode: null,
degree: null,
remark: null
},
currentCoilId: null,
tagSizeMap: {
'2': {
width: 100,
@@ -930,27 +915,14 @@ export default {
return '—'
},
handleAddAbnormal(row) {
this.exceptionForm.coilId = row.coilId
this.currentCoilId = row.coilId
if (!row.coilId) {
this.$message.error('请先选择钢卷')
return
}
// 显示弹窗
this.exceptionDialogVisible = true
},
confirmException() {
this.$refs["abnormalForm"].validate(valid => {
if (valid) {
addCoilAbnormal({
...this.exceptionForm,
length: this.exceptionForm.endPosition - this.exceptionForm.startPosition,
}).then(response => {
this.$message.success('异常记录添加成功')
this.cancelException();
// 重置表单
this.getMaterialCoil()
}).catch(error => {
console.error('异常记录添加失败:', error)
this.$message.error('异常记录添加失败: ' + (error.message || error))
})
}
});
},
handleAbnormal() {
this.$router.push({
path: '/quality/detail',
@@ -1386,4 +1358,16 @@ export default {
}
}
}
// 对话框底部样式
.dialog-footer {
display: flex;
justify-content: center;
gap: 10px;
padding: 16px;
border-top: 1px solid #e4e7ed;
background-color: #fafafa;
}
</style>

40
klp-ui/src/views/wms/coil/panels/stepSplit.vue
View File

@@ -30,16 +30,28 @@
<el-descriptions-item label="所在库位">{{ coilInfo.warehouseName || '-' }}</el-descriptions-item>
<el-descriptions-item label="材料类型">{{ coilInfo.materialType || '-' }}</el-descriptions-item>
<el-descriptions-item label="净重">{{ coilInfo.netWeight || '-' }} T</el-descriptions-item>
<el-descriptions-item label="物料名称">{{ coilInfo.itemName || '-' }}</el-descriptions-item>
<el-descriptions-item label="规格">{{ coilInfo.specification || '-' }}</el-descriptions-item>
<el-descriptions-item label="材质">{{ coilInfo.material || '-' }}</el-descriptions-item>
<el-descriptions-item label="原料材质">{{ coilInfo.packingStatus || '-' }}</el-descriptions-item>
<el-descriptions-item label="净重">{{ coilInfo.netWeight || '-' }} T</el-descriptions-item>
</el-descriptions>
<!-- 已分条钢卷列表 -->
<el-descriptions :column="1" border title="已分出的钢卷列表"></el-descriptions>
<el-table v-loading="splitListLoading" :data="splitList" @row-click="handleSplitItemClick"
highlight-current-row border stripe>
<el-table-column prop="enterCoilNo" label="入场钢卷号" />
<el-table-column prop="currentCoilNo" label="当前钢卷号" />
<el-table-column prop="materialType" label="材料类型" />
<el-table-column prop="netWeight" label="净重" />
<el-table-column prop="dataType" label="钢卷状态">
<el-table-column label="物料类型">
<template #default="scope">
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
</template>
</el-table-column>
<el-table-column prop="netWeight" label="净重" width="70" />
<el-table-column prop="dataType" label="钢卷状态" width="80">
<template #default="scope">
<div v-if="scope.row.status == 1">
<el-tag type="info">已发货</el-tag>
@@ -56,7 +68,7 @@
</template>
</el-table-column>
<el-table-column label="操作" width="220">
<el-table-column label="操作" width="180">
<template #default="scope">
<div v-if="scope.row.dataType == 1 && scope.row.status == 0">
<el-button @click.stop="handlePrint(scope.row)">打印</el-button>
@@ -126,8 +138,8 @@
<el-option label="毛边料" value="毛边料" />
</el-select>
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="splitForm.packingStatus" placeholder="请输入打包状态" />
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="splitForm.packingStatus" placeholder="请输入原料材质" />
</el-form-item>
<el-form-item label="包装要求" prop="packagingRequirement">
<el-select v-model="splitForm.packagingRequirement" placeholder="请选择包装要求" style="width: 100%">
@@ -225,13 +237,13 @@
<el-descriptions-item label="厂家">{{ selectedSplitItem.manufacturer || '-' }}</el-descriptions-item>
<el-descriptions-item label="镀层质量">{{ selectedSplitItem.zincLayer || '-' }}</el-descriptions-item>
<el-descriptions-item label="表面处理">{{ selectedSplitItem.surfaceTreatmentDesc || '-'
}}</el-descriptions-item>
}}</el-descriptions-item>
<el-descriptions-item label="质量状态">{{ selectedSplitItem.qualityStatus || '-' }}</el-descriptions-item>
<el-descriptions-item label="切边要求">{{ selectedSplitItem.trimmingRequirement || '-'
}}</el-descriptions-item>
<el-descriptions-item label="打包状态">{{ selectedSplitItem.packingStatus || '-' }}</el-descriptions-item>
<el-descriptions-item label="原料材质">{{ selectedSplitItem.packingStatus || '-' }}</el-descriptions-item>
<el-descriptions-item label="包装要求">{{ selectedSplitItem.packagingRequirement || '-'
}}</el-descriptions-item>
<el-descriptions-item label="实测厚度(m)">{{ selectedSplitItem.actualThickness || '-' }}
@@ -246,12 +258,12 @@
<el-descriptions-item label="调制度">{{ selectedSplitItem.temperGrade || '-' }}</el-descriptions-item>
<el-descriptions-item label="镀层种类">{{ selectedSplitItem.coatingType || '-' }}</el-descriptions-item>
<el-descriptions-item label="生产开始时间">{{ selectedSplitItem.productionStartTime || '-'
}}</el-descriptions-item>
}}</el-descriptions-item>
<el-descriptions-item label="生产结束时间">{{ selectedSplitItem.productionEndTime || '-'
}}</el-descriptions-item>
}}</el-descriptions-item>
<el-descriptions-item label="生产耗时">{{ selectedSplitItem.formattedDuration ||
(selectedSplitItem.productionDuration ? selectedSplitItem.productionDuration + ' 分钟' : '-')
}}</el-descriptions-item>
}}</el-descriptions-item>
<el-descriptions-item label="备注" :span="2">{{ selectedSplitItem.remark || '-' }}</el-descriptions-item>
</el-descriptions>
</el-card>
@@ -287,6 +299,8 @@ import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect
import TimeInput from "@/components/TimeInput";
import AbnormalForm from '../components/AbnormalForm';
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
export default {
name: 'StepSplit',
@@ -314,7 +328,9 @@ export default {
WarehouseSelect,
ActualWarehouseSelect,
TimeInput,
AbnormalForm
AbnormalForm,
ProductInfo,
RawMaterialInfo,
},
dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree'],
data() {

4
klp-ui/src/views/wms/coil/split.vue
View File

@@ -161,8 +161,8 @@
</el-select>
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="item.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="item.packingStatus" placeholder="请输入原料材质" :disabled="readonly">
</el-input>
</el-form-item>

24
klp-ui/src/views/wms/coil/typing.vue
View File

@@ -48,6 +48,26 @@
<span class="info-label">物料名称：</span>
<span class="info-value">{{ currentInfo.itemName || '—' }}</span>
</div>
<div class="info-row">
<span class="info-label">规格：</span>
<span class="info-value">{{ currentInfo.specification || '—' }}</span>
</div>
<div class="info-row">
<span class="info-label">材质：</span>
<span class="info-value">{{ currentInfo.material || '—' }}</span>
</div>
<div class="info-row">
<span class="info-label">原料材质：</span>
<span class="info-value">{{ currentInfo.packingStatus || '—' }}</span>
</div>
<div class="info-row">
<span class="info-label">厂家：</span>
<span class="info-value">{{ currentInfo.manufacturer || '—' }}</span>
</div>
<div class="info-row">
<span class="info-label">表面处理：</span>
<span class="info-value">{{ currentInfo.surfaceTreatmentDesc || '—' }}</span>
</div>
<div class="info-row">
<span class="info-label">毛重：</span>
<span class="info-value">{{ currentInfo.grossWeight ? currentInfo.grossWeight + ' t' : '—' }}</span>
@@ -136,8 +156,8 @@
</el-select>
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="updateForm.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus">
<el-input v-model="updateForm.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>

2
klp-ui/src/views/wms/delivery/mycoil/index.vue
View File

@@ -80,7 +80,7 @@ export default {
showOverflowTooltip: true
},
{ label: '质量状态', prop: 'qualityStatus' },
{ label: '打包状态', prop: 'packingStatus' },
{ label: '原料材质', prop: 'packingStatus' },
// 对应edgeType
{ label: '切边要求', prop: 'edgeRequirement' },
// 对应packaging

2
klp-ui/src/views/wms/delivery/permi/index.vue
View File

@@ -263,7 +263,7 @@ export default {
{ label: '毛重', prop: 'grossWeight' },
{ label: '备注', prop: 'remark' },
{ label: '质量状态', prop: 'qualityStatus' },
{ label: '打包状态', prop: 'packingStatus' },
{ label: '原料材质', prop: 'packingStatus' },
{ label: '切边要求', prop: 'edgeRequirement' },
{ label: '包装要求', prop: 'packagingRequirement' },
{ label: '厂家', prop: 'itemManufacturer' }

6
klp-ui/src/views/wms/delivery/plan/index.vue
View File

@@ -89,7 +89,7 @@
<el-table :data="selectedCoilList" border highlight-current-row style="width: 100%" max-height="400px">
<!-- <el-table-column type="index" width="50" align="center" label="序号" /> -->
<!-- { label: '质量状态', prop: 'qualityStatus' },
{ label: '打包状态', prop: 'packingStatus' },
{ label: '原料材质', prop: 'packingStatus' },
// 对应edgeType
{ label: '切边要求', prop: 'edgeRequirement' },
// 对应packaging
@@ -97,7 +97,7 @@
<el-table-column label="卷号" align="center" prop="coilDetail.currentCoilNo"
:show-overflow-tooltip="true" />
<el-table-column label="质量状态" align="center" prop="coilDetail.qualityStatus" />
<!-- <el-table-column label="打包状态" align="center" prop="coilDetail.packingStatus" /> -->
<!-- <el-table-column label="原料材质" align="center" prop="coilDetail.packingStatus" /> -->
<el-table-column label="切边要求" align="center" prop="coilDetail.edgeRequirement" />
<el-table-column label="包装要求" align="center" prop="coilDetail.packagingRequirement" />
<el-table-column label="存储位置" align="center" prop="coilDetail.actualWarehouseName" width="120"
@@ -230,7 +230,7 @@ export default {
showOverflowTooltip: true
},
{ label: '质量状态', prop: 'qualityStatus' },
{ label: '打包状态', prop: 'packingStatus' },
{ label: '原料材质', prop: 'packingStatus' },
// 对应edgeType
{ label: '切边要求', prop: 'edgeRequirement' },
// 对应packaging

6
klp-ui/src/views/wms/move/correct.vue
View File

@@ -98,7 +98,7 @@
<span class="param-value">{{ item.trimmingRequirement }}</span>
</div>
<div class="param-row" v-if="item.packingStatus">
<span class="param-label">打包状态：</span>
<span class="param-label">原料材质：</span>
<span class="param-value">{{ item.packingStatus }}</span>
</div>
<div class="param-row" v-if="item.packagingRequirement">
@@ -311,8 +311,8 @@
</el-select>
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus" disabled>
<el-input disabled v-model="form.packingStatus" placeholder="请输入打包状态">
<el-form-item label="原料材质" prop="packingStatus" disabled>
<el-input disabled v-model="form.packingStatus" placeholder="请输入原料材质">
</el-input>
</el-form-item>

2
klp-ui/src/views/wms/report/components/setting/columns.vue
View File

@@ -142,7 +142,7 @@ export default {
{ label: '质量状态', value: 'qualityStatus' },
{ label: '切边要求', value: 'trimmingRequirement' },
{ label: '打包状态', value: 'packingStatus' },
{ label: '原料材质', value: 'packingStatus' },
{ label: '包装要求', value: 'packagingRequirement' },
{ label: '产品类型', value: 'itemId' },