fix: 修改O卷标签并添加禁用O卷功能
更新优品卷标签为O卷,同时在CoilSelector组件中添加disableO属性以禁用O卷选择 在发货单相关组件中设置disableO为true,防止选择O卷
This commit is contained in:
@@ -219,7 +219,12 @@ export default {
|
|||||||
multiple: {
|
multiple: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
}
|
},
|
||||||
|
// 是否禁用O卷
|
||||||
|
disableO: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -489,6 +494,10 @@ export default {
|
|||||||
this.$message.warning('您没有权限选择此钢卷');
|
this.$message.warning('您没有权限选择此钢卷');
|
||||||
return; // 终止后续逻辑
|
return; // 终止后续逻辑
|
||||||
}
|
}
|
||||||
|
if (this.disableO && row.qualityStatus == 'O') {
|
||||||
|
this.$message.warning('O卷不能选择');
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.handleSelect(row);
|
this.handleSelect(row);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-tabs class="app-container" v-model="activeTab">
|
<el-tabs class="app-container" v-model="activeTab">
|
||||||
<el-tab-pane label="优品卷" name="third">
|
<el-tab-pane label="O卷" name="third">
|
||||||
<BasePage :qrcode="qrcode" :querys="querys3" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
|
<BasePage :qrcode="qrcode" :querys="querys3" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
|
||||||
:hideType="hideType" />
|
:hideType="hideType" />
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<coil-selector dialogWidth="1200px" :use-trigger="true" multiple @confirm="handleBatchAdd"
|
<coil-selector dialogWidth="1200px" :use-trigger="true" multiple @confirm="handleBatchAdd"
|
||||||
:filters="{ selectType: 'product', status: 0, excludeBound: true, orderBy: true }" :orderBy="true">
|
:filters="{ selectType: 'product', status: 0, excludeBound: true, orderBy: true }" :orderBy="true" :disableO="true">
|
||||||
<el-button type="primary" plain icon="el-icon-plus" size="mini">批量新增</el-button>
|
<el-button type="primary" plain icon="el-icon-plus" size="mini">批量新增</el-button>
|
||||||
</coil-selector>
|
</coil-selector>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
<div style="display: flex; gap: 10px;">
|
<div style="display: flex; gap: 10px;">
|
||||||
<coil-selector dialogWidth="1200px" v-model="form.coilId" :use-trigger="true"
|
<coil-selector dialogWidth="1200px" v-model="form.coilId" :use-trigger="true"
|
||||||
:filters="{ selectType: 'product', status: 0, excludeBound: true, orderBy: true }" @select="handleSelect"
|
:filters="{ selectType: 'product', status: 0, excludeBound: true, orderBy: true }" @select="handleSelect"
|
||||||
:orderBy="true" />
|
:orderBy="true" :disableO="true"/>
|
||||||
<el-checkbox v-model="autoFillForm" label="自动填写表单信息" />
|
<el-checkbox v-model="autoFillForm" label="自动填写表单信息" />
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
Reference in New Issue
Block a user