test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
Showing only changes of commit 4d0c0ae91a - Show all commits

View File

@ -17,6 +17,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
label="操作" label="操作"
fixed="right"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleTableBtnClick" /> @clickBtn="handleTableBtnClick" />
</base-table> </base-table>
@ -49,6 +50,9 @@
prop: 'typeId', prop: 'typeId',
url: '/base/quality-inspection-type/listAll', url: '/base/quality-inspection-type/listAll',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
bind: {
filterable: true,
},
}, },
], ],
[ [
@ -59,7 +63,14 @@
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
}, },
], ],
[{ input: true, label: '检测编码', prop: 'code' }], [
{
input: true,
label: '内容编码',
prop: 'code',
url: '/base/quality-inspection-det/getCode',
},
],
[{ input: true, label: '备注', prop: 'remark' }], [{ input: true, label: '备注', prop: 'remark' }],
]" /> ]" />
</base-dialog> </base-dialog>
@ -93,20 +104,20 @@ export default {
placeholder: '请输入检测内容', placeholder: '请输入检测内容',
param: 'content', param: 'content',
}, },
{ // {
type: 'datePicker', // type: 'datePicker',
label: '创建时间', // label: '',
dateType: 'daterange', // datetimerange // dateType: 'daterange', // datetimerange
// format: 'yyyy-MM-dd HH:mm:ss', // // format: 'yyyy-MM-dd HH:mm:ss',
format: 'yyyy-MM-dd', // format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd HH:mm:ss', // valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-', // rangeSeparator: '-',
startPlaceholder: '开始日期', // startPlaceholder: '',
endPlaceholder: '结束日期', // endPlaceholder: '',
defaultTime: ['00:00:00', '23:59:59'], // defaultTime: ['00:00:00', '23:59:59'],
param: 'createTime', // param: 'createTime',
width: 350, // width: 350,
}, // },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
@ -161,8 +172,8 @@ export default {
width: 180, width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
}, },
{ prop: 'typeId', label: '检测类型ID', align: 'center' }, { prop: 'typeName', label: '类型名称', align: 'center' },
{ prop: 'content', label: '检测类型内容', align: 'center' }, { prop: 'content', label: '检测内容', align: 'center' },
{ prop: 'code', label: '检测编码', align: 'center' }, { prop: 'code', label: '检测编码', align: 'center' },
{ prop: 'remark', label: '备注', align: 'center' }, { prop: 'remark', label: '备注', align: 'center' },
], ],