feat: 添加 CurrentCoilNo 组件并替换原有钢卷号显示
引入新的 CurrentCoilNo 组件用于统一显示钢卷号,支持不同长度钢卷号的格式化显示和颜色区分 替换多个视图中的 el-tag 和 CoilNo 组件为新的 CurrentCoilNo 组件
This commit is contained in:
@@ -39,7 +39,7 @@
|
||||
:style="getBorderStyle(item)">
|
||||
<div class="card-header">
|
||||
<div class="header-left">
|
||||
<el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
|
||||
<current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
|
||||
<el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{
|
||||
getTypeLabel(item) }}</el-tag>
|
||||
<span class="material-type">{{ item.materialType || '原料' }}</span>
|
||||
@@ -660,7 +660,7 @@ export default {
|
||||
// ========== 物料列表相关方法 ==========
|
||||
/** 查询物料列表 */
|
||||
handleRestoreMaterial(row) {
|
||||
this.$modal.confirm('是否要将改钢卷还原到上次加工的状态(会删除该钢卷并将上一步的历史钢卷)').then(_ => {
|
||||
this.$modal.confirm('是否要将改钢卷还原到上次加工的状态(会删除该钢卷并将上一步的历史钢卷还原)').then(_ => {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: '处理中...',
|
||||
@@ -753,7 +753,7 @@ export default {
|
||||
/** 删除按钮操作 */
|
||||
hanleDeleteMaterial(row) {
|
||||
const coilIds = row.coilId;
|
||||
this.$modal.confirm('是否确认删除钢卷物料编号为"' + coilIds + '"的数据项,会同时清理刚钢卷相关的待操作记录且无法恢复!!!是否继续删除?').then(() => {
|
||||
this.$modal.confirm('是否确认删除钢卷物料编号为"' + coilIds + '"的数据项?').then(() => {
|
||||
this.loading = true;
|
||||
return delMaterialCoil(coilIds);
|
||||
}).then(() => {
|
||||
|
||||
@@ -216,7 +216,7 @@
|
||||
'important-card': item.priority === 1
|
||||
}">
|
||||
<div class="card-header">
|
||||
<el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
|
||||
<current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
<div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card">
|
||||
<div class="card-header">
|
||||
<div class="header-left">
|
||||
<el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
|
||||
<current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
|
||||
<span class="material-type">{{ item.materialType || '原料' }}</span>
|
||||
<el-popover v-if="item.rawMaterial || item.product" placement="top" width="280" trigger="hover"
|
||||
popper-class="material-params-popover">
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
}"
|
||||
>
|
||||
<div class="card-header">
|
||||
<el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
|
||||
<current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
<el-table v-else v-loading="loading" border :data="pendingActions" highlight-current-row>
|
||||
<el-table-column label="钢卷号" align="center" prop="currentCoilNo" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<CoilNo :coil-no="scope.row.currentCoilNo" :coil-id="scope.row.coilId" />
|
||||
<current-coil-no :current-coil-no="scope.row.currentCoilNo"></current-coil-no>
|
||||
<!-- <el-tag type="info" size="small">{{ scope.row.currentCoilNo }}</el-tag> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
|
||||
<template slot-scope="scope">
|
||||
<coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
|
||||
<current-coil-no :current-coil-no="scope.row.currentCoilNo"></current-coil-no>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" /> -->
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
:style="{ border: item.abnormalCount > 0 ? '1px solid red' : ' 1px solid #e4e7ed' }">
|
||||
<div class="card-header">
|
||||
<div class="header-left">
|
||||
<el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
|
||||
<current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
|
||||
<!-- <span class="material-type">{{ item.materialType || '原料' }}</span> -->
|
||||
<el-popover v-if="item.rawMaterial || item.product" placement="top" width="280" trigger="hover"
|
||||
popper-class="material-params-popover">
|
||||
@@ -340,7 +340,7 @@
|
||||
'important-card': item.priority === 1
|
||||
}">
|
||||
<div class="card-header">
|
||||
<el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
|
||||
<current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
|
||||
<div class="status-tags">
|
||||
<el-tag v-if="item.actionStatus === 0" type="info" size="mini">待处理</el-tag>
|
||||
<el-tag v-else-if="item.actionStatus === 1" type="warning" size="mini">处理中</el-tag>
|
||||
|
||||
@@ -38,7 +38,11 @@
|
||||
<el-table-column label="包装" align="center" prop="packaging" />
|
||||
<el-table-column label="结算方式" align="center" prop="settlementType" />
|
||||
<!-- <el-table-column label="原料厂家" align="center" prop="rawMaterialFactory" /> -->
|
||||
<el-table-column label="卷号" align="center" prop="coilNo" />
|
||||
<el-table-column label="卷号" align="center" prop="coilNo">
|
||||
<template slot-scope="scope">
|
||||
<current-coil-no :current-coil-no="scope.row.coilNo"></current-coil-no>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" prop="specification" />
|
||||
<el-table-column label="材质" align="center" prop="material" />
|
||||
<el-table-column label="数量" align="center" prop="quantity" />
|
||||
|
||||
Reference in New Issue
Block a user