feat(wms): 添加镀锌纵剪分条原料库支持并扩展分条功能
扩展分条功能以支持更多工序类型,包括镀锌、脱脂、拉矫平整等。添加镀锌纵剪分条原料库选项,并改进分条按钮样式和操作流程。同时调整时间格式显示为更易读的形式。 新增镀铬工序分条支持,优化分条操作界面显示当前工序名称。修复分条列表加载逻辑,确保在操作类型有效时才进行加载。添加新的分条操作页面用于管理分条任务。
This commit is contained in:
@@ -199,7 +199,7 @@
|
||||
</div>
|
||||
|
||||
<div class="card-footer">
|
||||
<el-button v-if="useSpecialSplit" type="success" icon="el-icon-scissors" size="mini"
|
||||
<el-button v-if="useSpecialSplit" :style="splitButtonStyle" icon="el-icon-scissors" size="mini"
|
||||
@click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">加工</el-button>
|
||||
<el-button v-else type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
|
||||
:loading="buttonLoading" class="action-btn">领料</el-button>
|
||||
@@ -223,7 +223,7 @@
|
||||
<div class="section-card action-section" v-if="useSpecialSplit" style="margin-bottom: 20px;"
|
||||
v-loading="stepSpilt.loading">
|
||||
<div class="section-header ">
|
||||
<h3 class="section-title">进行中的镀锌工序</h3>
|
||||
<h3 class="section-title">进行中的{{ label }}</h3>
|
||||
<el-button size="mini" icon="el-icon-refresh" @click="getStepSplitList">刷新</el-button>
|
||||
</div>
|
||||
<div v-if="stepSpilt.list.length > 0" style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
|
||||
@@ -552,7 +552,7 @@ export default {
|
||||
degree: null,
|
||||
remark: null
|
||||
},
|
||||
tagSizeMap: {
|
||||
tagSizeMap: {
|
||||
'2': {
|
||||
width: 100,
|
||||
height: 80,
|
||||
@@ -602,6 +602,42 @@ export default {
|
||||
})
|
||||
return acidAction ? parseInt(acidAction.value) : null
|
||||
},
|
||||
splitButtonStyle() {
|
||||
if (this.acidRollingActionType == 501) {
|
||||
return {
|
||||
backgroundColor: '#2cb867',
|
||||
border: '1px solid #2cb867',
|
||||
color: '#111'
|
||||
}
|
||||
} else if (this.acidRollingActionType == 502) {
|
||||
return {
|
||||
backgroundColor: 'purple',
|
||||
border: '1px solid purple',
|
||||
color: '#fff'
|
||||
}
|
||||
} else if (this.acidRollingActionType == 503) {
|
||||
return {
|
||||
backgroundColor: '#f56c6c',
|
||||
border: '1px solid #f56c6c',
|
||||
color: '#fff'
|
||||
}
|
||||
} else if (this.acidRollingActionType == 504) {
|
||||
return {
|
||||
backgroundColor: 'orange',
|
||||
border: '1px solid orange',
|
||||
color: '#111'
|
||||
}
|
||||
} else if (this.acidRollingActionType == 505) {
|
||||
return {
|
||||
// 青色
|
||||
backgroundColor: 'blue',
|
||||
border: '1px solid blue',
|
||||
color: '#fff'
|
||||
}
|
||||
} else {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// 监听字典数据加载,当acidRollingActionType有值时自动加载待操作列表
|
||||
@@ -643,9 +679,11 @@ export default {
|
||||
if (this.acidRollingActionType) {
|
||||
this.actionQueryParams.actionType = this.acidRollingActionType
|
||||
this.getPendingAction()
|
||||
if (this.useSpecialSplit) {
|
||||
this.getStepSplitList()
|
||||
}
|
||||
}
|
||||
})
|
||||
this.getStepSplitList()
|
||||
},
|
||||
mounted() {
|
||||
// 确保在mounted时也尝试加载(字典数据可能此时才加载完成)
|
||||
@@ -667,7 +705,7 @@ export default {
|
||||
// 在镀锌颜料库的卷使用镀锌原料标签
|
||||
if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
|
||||
this.labelRender.type = '5';
|
||||
}
|
||||
}
|
||||
// 脱脂原料库
|
||||
else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) {
|
||||
this.labelRender.type = '6';
|
||||
@@ -699,7 +737,11 @@ export default {
|
||||
|
||||
getStepSplitList() {
|
||||
this.stepSpilt.loading = true
|
||||
listPendingAction({ actionType: 501, actionStatus: 0 }).then(response => {
|
||||
if (!this.acidRollingActionType) {
|
||||
this.$message.error(`未找到${this.label}操作类型,请检查字典配置`)
|
||||
return
|
||||
}
|
||||
listPendingAction({ actionType: this.acidRollingActionType, actionStatus: 0 }).then(response => {
|
||||
this.stepSpilt.list = response.rows || []
|
||||
this.stepSpilt.loading = false
|
||||
})
|
||||
@@ -964,7 +1006,7 @@ export default {
|
||||
try {
|
||||
await this.$modal.confirm('是否确认领料开始分步加工操作?')
|
||||
this.stepSpilt.loading = true
|
||||
await startSpecialSplit(row.coilId);
|
||||
await startSpecialSplit(row.coilId, this.acidRollingActionType);
|
||||
// await addPendingAction({
|
||||
// coilId: row.coilId,
|
||||
// currentCoilNo: row.currentCoilNo,
|
||||
|
||||
Reference in New Issue
Block a user