feat(wms,cost): 新增多项功能并修复部分问题
1. 退火计划页面新增exclusiveStatus状态字段 2. 钢卷分步加工新增预览标签功能 3. 修复实际库位空值判断问题 4. 成本综合页面新增价格管理功能,支持配置指标单价
This commit is contained in:
@@ -279,6 +279,7 @@ export default {
|
||||
currentCoilNo: undefined,
|
||||
status: 0,
|
||||
dataType: 1,
|
||||
exclusiveStatus: 0,
|
||||
},
|
||||
statusForm: {
|
||||
planId: undefined,
|
||||
|
||||
@@ -146,7 +146,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="实际库位" align="center" width="220">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.coil.actualWarehouseName || '-' }}</span>
|
||||
<span>{{ scope.row.coil && scope.row.coil.actualWarehouseName || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="100" prop="action">
|
||||
@@ -257,6 +257,7 @@ export default {
|
||||
currentCoilNo: undefined,
|
||||
status: 0,
|
||||
dataType: 1,
|
||||
exclusiveStatus: 0,
|
||||
},
|
||||
statusForm: {
|
||||
planId: undefined,
|
||||
@@ -522,6 +523,7 @@ export default {
|
||||
this.$message.success('已入炉');
|
||||
},
|
||||
handleUnbind(row) {
|
||||
console.log(row);
|
||||
this.$confirm('确定解绑该钢卷吗?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
|
||||
@@ -318,7 +318,7 @@
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog title="分步加工" :visible.sync="stepSpilt.visible" width="1400px" append-to-body fullscreen>
|
||||
<step-split @print="handlePrintLabel" @complete="handleComposeSplit" :actionId="stepSpilt.actionId"
|
||||
<step-split @print="handlePrintLabel" @preview="handlePreviewLabel" @complete="handleComposeSplit" :actionId="stepSpilt.actionId"
|
||||
:coilId="stepSpilt.coilId" :actionStatus="stepSpilt.actionStatus" :actionType="stepSpilt.actionType" />
|
||||
</el-dialog>
|
||||
|
||||
@@ -375,6 +375,7 @@ export default {
|
||||
pageSize: 20,
|
||||
dataType: 1,
|
||||
status: 0,
|
||||
exclusiveStatus: 0,
|
||||
enterCoilNo: null,
|
||||
currentCoilNo: null
|
||||
},
|
||||
|
||||
@@ -77,9 +77,10 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" width="180">
|
||||
<el-table-column label="操作" width="220">
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.dataType == 1 && scope.row.status == 0">
|
||||
<el-button @click.stop="handlePreview(scope.row)">预览</el-button>
|
||||
<el-button @click.stop="handlePrint(scope.row)">打印</el-button>
|
||||
<el-button @click.stop="handleEditSplit(scope.row)">编辑</el-button>
|
||||
<el-button @click.stop="handleDeleteSplit(scope.row)">删除</el-button>
|
||||
@@ -660,6 +661,9 @@ export default {
|
||||
async handlePrint(row) {
|
||||
this.$emit('print', row)
|
||||
},
|
||||
async handlePreview(row) {
|
||||
this.$emit('preview', row)
|
||||
},
|
||||
|
||||
async handleDeleteSplit(row) {
|
||||
this.$modal.confirm('确认删除该分卷吗?').then(async () => {
|
||||
|
||||
Reference in New Issue
Block a user