feat: 修改打包状态为原料材质并优化异常管理功能
修改所有打包状态字段为原料材质,统一业务术语 重构异常管理功能,新增异常记录列表和删除功能 优化分条钢卷面板显示更多物料信息 将切边要求和包装要求改为下拉选择框
This commit is contained in:
@@ -98,7 +98,7 @@
|
||||
<span class="param-value">{{ item.trimmingRequirement }}</span>
|
||||
</div>
|
||||
<div class="param-row" v-if="item.packingStatus">
|
||||
<span class="param-label">打包状态:</span>
|
||||
<span class="param-label">原料材质:</span>
|
||||
<span class="param-value">{{ item.packingStatus }}</span>
|
||||
</div>
|
||||
<div class="param-row" v-if="item.packagingRequirement">
|
||||
@@ -204,11 +204,11 @@
|
||||
:loading="item.picking" class="action-btn">修正</el-button>
|
||||
<el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(item)"
|
||||
:loading="item.picking" class="action-btn">删除</el-button>
|
||||
<el-button type="warning" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
|
||||
<!-- <el-button type="warning" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
|
||||
@click="handleAddAbnormal(item)" :loading="item.cancelling" class="action-btn">
|
||||
异常
|
||||
<span v-if="item.abnormalCount > 0">({{ item.abnormalCount }})</span>
|
||||
</el-button>
|
||||
</el-button> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -310,8 +310,8 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="打包状态" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
|
||||
<el-form-item label="原料材质" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
<span class="param-value">{{ item.trimmingRequirement }}</span>
|
||||
</div>
|
||||
<div class="param-row" v-if="item.packingStatus">
|
||||
<span class="param-label">打包状态:</span>
|
||||
<span class="param-label">原料材质:</span>
|
||||
<span class="param-value">{{ item.packingStatus }}</span>
|
||||
</div>
|
||||
<div class="param-row" v-if="item.packagingRequirement">
|
||||
@@ -384,8 +384,8 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="打包状态" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
|
||||
<el-form-item label="原料材质" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
@@ -95,8 +95,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="打包状态" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
|
||||
<el-form-item label="原料材质" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入原料材质" :disabled="readonly">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -165,8 +165,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="打包状态" prop="packingStatus">
|
||||
<memo-input v-model="form.packingStatus" placeholder="请输入打包状态" storageKey="packingStatus">
|
||||
<el-form-item label="原料材质" prop="packingStatus">
|
||||
<memo-input v-model="form.packingStatus" placeholder="请输入原料材质" storageKey="packingStatus">
|
||||
</memo-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@@ -92,8 +92,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="打包状态" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
|
||||
<el-form-item label="原料材质" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@@ -88,8 +88,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="打包状态" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
|
||||
<el-form-item label="原料材质" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@@ -76,8 +76,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="打包状态" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
|
||||
<el-form-item label="原料材质" prop="packingStatus">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入原料材质">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -136,11 +136,17 @@
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="getItemLabel" prop="itemId" v-if="!form.coilId">
|
||||
<product-select v-if="form.itemType == 'product'" v-model="form.itemId" clearable />
|
||||
<raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId" clearable />
|
||||
<product-select v-if="form.itemType == 'product'" @change="handleProductChange" v-model="form.itemId" clearable />
|
||||
<raw-material-select v-else-if="form.itemType == 'raw_material'" @change="handleProductChange" v-model="form.itemId" clearable />
|
||||
<div v-else>请先选择材料类型</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24">
|
||||
<el-form-item label="原料材质" prop="packingStatus" v-if="!form.coilId">
|
||||
<el-input v-model="form.packingStatus" placeholder="请输入原料材质" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-form-item>
|
||||
@@ -306,8 +312,8 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="打包状态" prop="packingStatus">
|
||||
<el-input v-model="editCoil.form.packingStatus" placeholder="请输入打包状态">
|
||||
<el-form-item label="原料材质" prop="packingStatus">
|
||||
<el-input v-model="editCoil.form.packingStatus" placeholder="请输入原料材质">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
@@ -548,6 +554,10 @@ export default {
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
handleProductChange(value, obj) {
|
||||
console.log(value, obj.material)
|
||||
this.form.packingStatus = obj.material || ''
|
||||
},
|
||||
// 处理材料类型变化
|
||||
handleMaterialTypeChange(value) {
|
||||
// 清空物品选择
|
||||
|
||||
Reference in New Issue
Block a user