|
|
|
@ -10,27 +10,26 @@ |
|
|
|
<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="90"> |
|
|
|
<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="90"> |
|
|
|
<el-row> |
|
|
|
<el-row> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="作业中心" prop="zuoyezhongxin"> |
|
|
|
<el-form-item label="作业中心" prop="wcId"> |
|
|
|
<el-select v-model="ruleForm.zuoyezhongxin" placeholder="请选择" @change="handelchange"> |
|
|
|
<el-select v-model="ruleForm.wcId" placeholder="请选择" @change="changeWork"> |
|
|
|
<el-option |
|
|
|
<el-option |
|
|
|
v-for="item in options" |
|
|
|
v-for="item in options" |
|
|
|
:key="item.value" |
|
|
|
:key="item.id" |
|
|
|
:label="item.label" |
|
|
|
:label="item.wcName" |
|
|
|
:value="item.value" |
|
|
|
:value="item.id" |
|
|
|
/> |
|
|
|
/> |
|
|
|
</el-select> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="化验时间" prop="huayanshijian"> |
|
|
|
<el-form-item label="化验时间" prop="assayTime"> |
|
|
|
<!-- 修复日期选择器v-model绑定错误 --> |
|
|
|
<!-- 修复日期选择器v-model绑定错误 --> |
|
|
|
<el-date-picker |
|
|
|
<el-date-picker |
|
|
|
v-model="ruleForm.huayanshijian" |
|
|
|
v-model="ruleForm.assayTime" |
|
|
|
type="date" |
|
|
|
type="date" |
|
|
|
placeholder="请选择" |
|
|
|
placeholder="请选择" |
|
|
|
format="YYYY-MM-DD" |
|
|
|
format="YYYY-MM-DD" |
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
@change="handelchange" |
|
|
|
|
|
|
|
/> |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-col> |
|
|
|
@ -38,7 +37,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
<el-table :data="ruleForm.tableData" style="width: 100%"> |
|
|
|
<el-table :data="ruleForm.tableData" style="width: 100%"> |
|
|
|
<el-table-column type="index" label="序号" width="180" /> |
|
|
|
<el-table-column type="index" label="序号" width="180" /> |
|
|
|
<el-table-column prop="slot" label="作业槽" width="180" /> |
|
|
|
<el-table-column prop="slotName" label="作业槽" width="180" /> |
|
|
|
<el-table-column prop="testVal" label="测量值"> |
|
|
|
<el-table-column prop="testVal" label="测量值"> |
|
|
|
<template #header> |
|
|
|
<template #header> |
|
|
|
<span><i style="color: red">*</i>测量值</span> |
|
|
|
<span><i style="color: red">*</i>测量值</span> |
|
|
|
@ -46,7 +45,6 @@ |
|
|
|
<template #default="scope"> |
|
|
|
<template #default="scope"> |
|
|
|
<!-- 将输入框放入form-item内部，避免校验时的更新冲突 --> |
|
|
|
<!-- 将输入框放入form-item内部，避免校验时的更新冲突 --> |
|
|
|
<el-form-item |
|
|
|
<el-form-item |
|
|
|
|
|
|
|
|
|
|
|
:prop="'tableData.' + scope.$index + '.testVal'" |
|
|
|
:prop="'tableData.' + scope.$index + '.testVal'" |
|
|
|
:rules="[{ required: true, message: '请输入测量值', trigger: ['blur', 'change'] }]" |
|
|
|
:rules="[{ required: true, message: '请输入测量值', trigger: ['blur', 'change'] }]" |
|
|
|
> |
|
|
|
> |
|
|
|
@ -54,6 +52,7 @@ |
|
|
|
v-model="scope.row.testVal" |
|
|
|
v-model="scope.row.testVal" |
|
|
|
controls-position="right" |
|
|
|
controls-position="right" |
|
|
|
@change="handleChange" |
|
|
|
@change="handleChange" |
|
|
|
|
|
|
|
style="margin-top:18px;" |
|
|
|
/> |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
@ -71,7 +70,7 @@ |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
<script> |
|
|
|
import { add } from '@/api/productionManagement/assayedContent'; |
|
|
|
import { add,getWorkCenter,getTank } from '@/api/productionManagement/assayedContent'; |
|
|
|
export default { |
|
|
|
export default { |
|
|
|
props: { |
|
|
|
props: { |
|
|
|
showDialog: { |
|
|
|
showDialog: { |
|
|
|
@ -83,41 +82,74 @@ export default { |
|
|
|
return { |
|
|
|
return { |
|
|
|
openShow: false, |
|
|
|
openShow: false, |
|
|
|
ruleForm: { |
|
|
|
ruleForm: { |
|
|
|
huayanshijian: '', |
|
|
|
assayTime: '', |
|
|
|
zuoyezhongxin: '', |
|
|
|
wcId: '', |
|
|
|
tableData: [ |
|
|
|
tableData: [], |
|
|
|
{ testVal: null, slot: '#16' }, |
|
|
|
|
|
|
|
{ testVal: null, slot: '#15' }, |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
rules: { |
|
|
|
rules: { |
|
|
|
huayanshijian: [{ required: true, message: '请选择化验时间', trigger: ['change', 'blur'] }], |
|
|
|
assayTime: [{ required: true, message: '请选择化验时间', trigger: ['change', 'blur'] }], |
|
|
|
zuoyezhongxin: [{ required: true, message: '请选择作业中心', trigger: ['change', 'blur'] }], |
|
|
|
wcId: [{ required: true, message: '请选择作业中心', trigger: ['change', 'blur'] }], |
|
|
|
}, |
|
|
|
}, |
|
|
|
options: [ |
|
|
|
options: [], |
|
|
|
{ label: '作业中心一1', value: '1' }, |
|
|
|
|
|
|
|
{ label: '作业中心二', value: '2' }, |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
}; |
|
|
|
}; |
|
|
|
}, |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
mounted() { |
|
|
|
this.openShow = this.showDialog; |
|
|
|
this.openShow = this.showDialog; |
|
|
|
|
|
|
|
this.ruleForm.tableData = [] |
|
|
|
|
|
|
|
this.getWorkCenterList() |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
methods: { |
|
|
|
|
|
|
|
// 获取作业中心 |
|
|
|
|
|
|
|
getWorkCenterList(){ |
|
|
|
|
|
|
|
getWorkCenter().then(res =>{ |
|
|
|
|
|
|
|
this.options = res.data.data |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
changeWork(value){ |
|
|
|
|
|
|
|
getTank({ workstationId: value }).then(res =>{ |
|
|
|
|
|
|
|
res.data.data.map(item =>{ |
|
|
|
|
|
|
|
this.ruleForm.tableData.push({ |
|
|
|
|
|
|
|
slot:item.workTankCode, |
|
|
|
|
|
|
|
slotName:item.name, |
|
|
|
|
|
|
|
testVal:"" |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
//查询表格 |
|
|
|
//查询表格 |
|
|
|
handelchange(){ |
|
|
|
handelchange(){ |
|
|
|
console.log(this.ruleForm,22222) |
|
|
|
console.log(this.ruleForm,22222) |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
closeDialog() { |
|
|
|
closeDialog(val) { |
|
|
|
this.openShow = false; |
|
|
|
this.openShow = false; |
|
|
|
this.$emit('closeDialog'); |
|
|
|
this.$emit('closeDialog',val); |
|
|
|
}, |
|
|
|
}, |
|
|
|
async submit() { |
|
|
|
async submit() { |
|
|
|
this.$refs.ruleFormRef.validate(valid => { |
|
|
|
this.$refs.ruleFormRef.validate(valid => { |
|
|
|
if (valid) { |
|
|
|
if (valid) { |
|
|
|
const res= add() |
|
|
|
let params = { |
|
|
|
console.log('提交数据:', this.ruleForm); |
|
|
|
assayContent:{ |
|
|
|
// 提交逻辑 |
|
|
|
wcId:this.ruleForm.wcId, |
|
|
|
|
|
|
|
assayTime:this.ruleForm.assayTime |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
detailList:this.ruleForm.tableData |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
console.log('params---------------',params) |
|
|
|
|
|
|
|
add(params).then(res =>{ |
|
|
|
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
|
|
|
this.$message.success('新增成功') |
|
|
|
|
|
|
|
this.closeDialog(true) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}).catch(err=>{ |
|
|
|
|
|
|
|
this.closeDialog() |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
// if(this.ruleForm.tableData.length == 0){ |
|
|
|
|
|
|
|
// this.$message.error('请至少添加数据'); |
|
|
|
|
|
|
|
// } |
|
|
|
|
|
|
|
// const res= add() |
|
|
|
|
|
|
|
// console.log('提交数据:', this.ruleForm); |
|
|
|
|
|
|
|
// // 提交逻辑 |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
jinna
3 months ago