合并代码

This commit is contained in:
duan 2024-07-05 09:20:12 +08:00
parent 2cb8006f8d
commit 4f927cd201
1 changed files with 3 additions and 4 deletions

View File

@ -56,9 +56,9 @@
<!-- <el-table-column label="单位耗材值" prop="surplusStock" /> --> <!-- <el-table-column label="单位耗材值" prop="surplusStock" /> -->
<!-- <el-table-column label="排序" prop="sort" sortable /> --> <!-- <el-table-column label="排序" prop="sort" sortable /> -->
<el-table-column label="更新时间" prop="updateTime"> <el-table-column label="更新时间" prop="updateTime">
<template v-slot="scope"> <!-- <template v-slot="scope">
{{ dayjs(scope.row.createdAt).format('YYYY-MM-DD HH:mm:ss') }} {{ dayjs(scope.row.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="耗材记录"> <el-table-column label="耗材记录">
<template v-slot="scope"> <template v-slot="scope">
@ -273,7 +273,7 @@ export default {
{ required: true, message: '请输入耗材信息名称', trigger: 'blur' } { required: true, message: '请输入耗材信息名称', trigger: 'blur' }
], ],
conNames: [ conNames: [
{ required: true, message: '请输入耗材类型', trigger: 'blur' } { required: true, message: '请选择耗材类型', trigger: 'blur' }
], ],
price: [ price: [
{ required: true, message: '请输入耗材价格', trigger: 'blur' } { required: true, message: '请输入耗材价格', trigger: 'blur' }
@ -388,7 +388,6 @@ export default {
}, },
// //
tableDatatypetable(item) { tableDatatypetable(item) {
console.log(item, '调试-选择完的数据')
this.ruleForm.conCode = item.conTypeCode this.ruleForm.conCode = item.conTypeCode
this.ruleForm.conNames = item.conTypeName this.ruleForm.conNames = item.conTypeName
this.ruleForm.conTypeId = item.id this.ruleForm.conTypeId = item.id