feat(qc): 新增入场钢卷号字段并优化质检相关流程
1. 在质检任务相关BO、VO、实体类中新增enterCoilNos字段 2. 调整检验任务查询逻辑,支持按入场钢卷号筛选 3. 优化钢卷相关页面的字段展示和表单校验 4. 简化理化导入流程,移除钢卷匹配步骤
This commit is contained in:
@@ -74,6 +74,7 @@
|
||||
<el-table-column label="任务ID" align="center" prop="taskId" v-if="false" />
|
||||
<el-table-column label="任务编号" align="center" prop="taskCode" />
|
||||
<el-table-column label="任务类型" align="center" prop="taskType" />
|
||||
<el-table-column label="入场卷号" align="center" prop="enterCoilNos" />
|
||||
<el-table-column label="所属单位" align="center" prop="belongCompany" />
|
||||
<el-table-column label="方案名称" align="center" prop="schemeName" />
|
||||
<el-table-column label="状态" align="center" prop="status" width="90">
|
||||
@@ -99,7 +100,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="最终结果" align="center" prop="result" />
|
||||
<el-table-column label="关联钢卷" align="center" width="140">
|
||||
<!-- <el-table-column label="关联钢卷" align="center" width="140">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.coilList && scope.row.coilList.length > 0"
|
||||
style="display: flex; flex-wrap: wrap; gap: 4px;">
|
||||
@@ -109,7 +110,7 @@
|
||||
</div>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
|
||||
<template slot-scope="scope">
|
||||
@@ -244,6 +245,9 @@
|
||||
<el-form-item label="任务编号" prop="taskCode">
|
||||
<el-input v-model="taskForm.taskCode" placeholder="请输入任务编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入场卷号" prop="enterCoilNos">
|
||||
<el-input v-model="taskForm.enterCoilNos" placeholder="请输入入场卷号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务类型" prop="taskType">
|
||||
<el-select v-model="taskForm.taskType" placeholder="请选择任务类型" clearable filterable allow-create>
|
||||
<el-option label="内控检验" value="内控检验" />
|
||||
@@ -263,7 +267,8 @@
|
||||
<el-input v-model="taskForm.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="margin: 0 0 12px 80px;">
|
||||
|
||||
<!-- <div style="margin: 0 0 12px 80px;">
|
||||
<CoilSelector use-trigger multiple @confirm="handleTaskCoilConfirm">
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="small">选择钢卷</el-button>
|
||||
</CoilSelector>
|
||||
@@ -279,7 +284,7 @@
|
||||
<CurrentCoilNo :currentCoilNo="coil.currentCoilNo || coil.coilNo || ''" />
|
||||
<el-button type="text" icon="el-icon-close" size="mini" @click="taskCoilList.splice(index, 1)"></el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button :loading="buttonLoading" type="primary" @click="submitTaskForm">确 定</el-button>
|
||||
<el-button @click="cancelTask">取 消</el-button>
|
||||
@@ -396,7 +401,13 @@ export default {
|
||||
result: undefined,
|
||||
},
|
||||
taskForm: {},
|
||||
taskRules: {},
|
||||
taskRules: {
|
||||
taskCode: [{ required: true, message: '请输入任务编号', trigger: 'blur' }],
|
||||
enterCoilNos: [{ required: true, message: '请输入入场卷号', trigger: 'blur' }],
|
||||
taskType: [{ required: true, message: '请选择任务类型', trigger: 'change' }],
|
||||
belongCompany: [{ required: true, message: '请输入所属公司', trigger: 'blur' }],
|
||||
schemeName: [{ required: true, message: '请输入检验方案名称', trigger: 'blur' }],
|
||||
},
|
||||
|
||||
itemLoading: false,
|
||||
itemIds: [],
|
||||
@@ -566,7 +577,7 @@ export default {
|
||||
handleQuickCreate() {
|
||||
this.schemeVisible = true;
|
||||
},
|
||||
handleSchemeConfirm({ template, taskCode, taskType, belongCompany, coilIds }) {
|
||||
handleSchemeConfirm({ template, taskCode, taskType, belongCompany, coilIds, enterCoilNos }) {
|
||||
this.taskLoading = true;
|
||||
addInspectionTaskWithItems({
|
||||
taskCode: taskCode,
|
||||
@@ -574,7 +585,8 @@ export default {
|
||||
schemeName: template.templateName,
|
||||
belongCompany: belongCompany,
|
||||
taskType: taskType,
|
||||
coilIds: coilIds
|
||||
coilIds: coilIds || undefined,
|
||||
enterCoilNos: enterCoilNos || undefined
|
||||
}).then(() => {
|
||||
this.$modal.msgSuccess("快捷创建成功");
|
||||
this.getTaskList();
|
||||
|
||||
Reference in New Issue
Block a user