feat(钢卷管理): 添加钢卷号组件并优化相关功能
新增CoilNo组件用于统一显示钢卷号,支持G开头钢卷号特殊样式 在actflow、detail、panels等页面中使用新组件替换原有el-tag显示 添加showExportTime属性控制发货时间列的显示 优化ImportGuide组件,钢卷号自动添加G前缀
This commit is contained in:
@@ -69,9 +69,9 @@
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" type="index" width="60" align="center" />
|
||||
|
||||
<el-table-column label="钢卷号" align="center" prop="currentCoilNo" :show-overflow-tooltip="true">
|
||||
<el-table-column label="钢卷号" align="center" prop="currentCoilNo">
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="info" size="small">{{ scope.row.currentCoilNo }}</el-tag>
|
||||
<coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -268,17 +268,18 @@ import {
|
||||
addPendingAction,
|
||||
updatePendingAction,
|
||||
startProcess,
|
||||
completeAction,
|
||||
cancelAction
|
||||
} from '@/api/wms/pendingAction';
|
||||
import CoilSelector from '@/components/CoilSelector';
|
||||
import CoilNo from '@/components/KLPService/Renderer/CoilNo.vue';
|
||||
|
||||
|
||||
export default {
|
||||
name: 'CoilActflow',
|
||||
dicts: ['action_type'],
|
||||
components: {
|
||||
CoilSelector
|
||||
CoilSelector,
|
||||
CoilNo
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
@@ -71,8 +71,16 @@
|
||||
|
||||
<KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" :floatLayer="true" :floatLayerConfig="floatLayerConfig">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo" />
|
||||
<el-table-column label="当前钢卷号" align="center" prop="currentCoilNo" />
|
||||
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
|
||||
<template slot-scope="scope">
|
||||
<coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
|
||||
<template slot-scope="scope">
|
||||
<coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" /> -->
|
||||
<el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
|
||||
<el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery" />
|
||||
@@ -92,6 +100,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="更新时间" align="center" prop="updateTime" />
|
||||
<el-table-column label="发货时间" align="center" v-if="showExportTime" prop="exportTime" />
|
||||
<el-table-column label="更新人" align="center" prop="updateBy" />
|
||||
|
||||
<el-table-column label="二维码" v-if="qrcode">
|
||||
@@ -99,6 +108,7 @@
|
||||
<QRCode :content="scope.row.qrcodeRecordId" :size="50" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- <el-table-column label="状态" v-if="showStatus" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.status" placeholder="请选择状态" @change="handleStatusChange(scope.row)">
|
||||
@@ -134,7 +144,7 @@
|
||||
<el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
|
||||
导出标签
|
||||
</el-button>
|
||||
<el-button size="mini" v-if="showStatus" type="text" icon="el-icon-upload" @click="handleExportCoil(scope.row.coilId)">
|
||||
<el-button size="mini" v-if="showStatus" type="text" icon="el-icon-upload" @click="handleExportCoil(scope.row)">
|
||||
发货
|
||||
</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)" v-if="showControl">修正</el-button>
|
||||
@@ -248,6 +258,8 @@ import LabelRender from './LabelRender/index.vue'
|
||||
import MaterialSelect from "@/components/KLPService/MaterialSelect";
|
||||
import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
|
||||
import { findItemWithBom } from "@/store/modules/category";
|
||||
import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
|
||||
|
||||
|
||||
export default {
|
||||
name: "MaterialCoil",
|
||||
@@ -262,7 +274,8 @@ export default {
|
||||
BomInfoMini,
|
||||
CoilTraceResult,
|
||||
LabelRender,
|
||||
ActualWarehouseSelect
|
||||
ActualWarehouseSelect,
|
||||
CoilNo
|
||||
},
|
||||
dicts: ['product_coil_status'],
|
||||
props: {
|
||||
@@ -293,7 +306,11 @@ export default {
|
||||
showControl: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
}
|
||||
},
|
||||
showExportTime: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :showStatus="showStatus" :hideType="hideType" />
|
||||
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :showStatus="showStatus" :hideType="hideType" :showControl="showControl" :showExportTime="showExportTime" />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -21,6 +21,7 @@ export default {
|
||||
labelType: '3',
|
||||
showStatus: false,
|
||||
hideType: false,
|
||||
showExportTime: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user