|
|
@@ -9,12 +9,14 @@
|
|
|
top="50px"
|
|
|
>
|
|
|
<el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
|
|
|
- <el-form-item label='选择工序' prop="procedureId">
|
|
|
+ <el-form-item label='选择工序' prop="taskId">
|
|
|
<template>
|
|
|
- <div v-if="procedureList.length>0">
|
|
|
- <div v-for="procedure in procedureList" :key="procedure.id">
|
|
|
- <el-radio v-model="tenant.procedureId" :label="procedure.id" border>{{procedure.no}} {{procedure.name}}</el-radio>
|
|
|
- </div>
|
|
|
+ <div v-if="procedureList.length>0">
|
|
|
+ <el-radio-group v-model="tenant.taskId">
|
|
|
+ <div v-for="procedure in procedureList" :key="procedure.id">
|
|
|
+ <el-radio :label="procedure.id" border>{{procedure.procedureNo}} {{procedure.procedureName}}</el-radio>
|
|
|
+ </div>
|
|
|
+ </el-radio-group>
|
|
|
</div>
|
|
|
<div class="hint" v-else><span>没有可以选择的工序</span></div>
|
|
|
</template>
|
|
|
@@ -55,7 +57,7 @@ export default {
|
|
|
},
|
|
|
roles: [],
|
|
|
rules: {
|
|
|
- procedureId: [
|
|
|
+ taskId: [
|
|
|
{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
|
|
|
]
|
|
|
}
|
|
|
@@ -85,7 +87,7 @@ export default {
|
|
|
bomId: '',
|
|
|
orderId: '',
|
|
|
planId: '',
|
|
|
- procedureId: '',
|
|
|
+ taskId: '',
|
|
|
zoneId: '',
|
|
|
result: '',
|
|
|
report: '',
|
|
|
@@ -114,7 +116,7 @@ export default {
|
|
|
}
|
|
|
// 字典表
|
|
|
this.dicts = dicts
|
|
|
- this.getProcedures({bomId: this.tenant.bomId,workpieceId:this.tenant.workpieceId})
|
|
|
+ this.getProcedures(this.tenant)
|
|
|
},
|
|
|
close () {
|
|
|
this.$emit('close')
|
