Merge remote-tracking branch 'origin/main'

This commit is contained in:
wangyilin 2024-12-03 11:17:07 +08:00
commit 5ebc6c9b84
3 changed files with 5 additions and 5 deletions

View File

@ -144,7 +144,7 @@ const props = withDefaults(defineProps<TableProMaxProps<T, P>>(), {
showExpandColumn: undefined, showExpandColumn: undefined,
sticky: undefined, sticky: undefined,
}) })
console.log(props) // console.log(props)
const slots = defineSlots<TableProMaxSlots<T>>() const slots = defineSlots<TableProMaxSlots<T>>()
@ -189,7 +189,7 @@ const {
props.dataCallback, props.dataCallback,
props.requestError props.requestError
) )
console.log('pageParams', pageParams) // console.log('pageParams', pageParams)
onMounted(() => props.requestAuto && requestGetTableData(true)) onMounted(() => props.requestAuto && requestGetTableData(true))

View File

@ -37,7 +37,7 @@ const _formParams = reactive<securityUnitIdListParams>({
const searchSecurityUnitId = debounce(async () => { const searchSecurityUnitId = debounce(async () => {
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
console.log('process.env.NODE_ENV === development') // console.log('process.env.NODE_ENV === development')
const res = await axios.get(`https://www.hnjinglian.cn:5678/common/querySecurityNumberByIdCard?idCard=${_formParams.idCard}`) const res = await axios.get(`https://www.hnjinglian.cn:5678/common/querySecurityNumberByIdCard?idCard=${_formParams.idCard}`)
if (res.data?.data?.hasOwnProperty('bayzh')) { if (res.data?.data?.hasOwnProperty('bayzh')) {
_formParams.securityNumber = res.data.data.bayzh _formParams.securityNumber = res.data.data.bayzh
@ -232,7 +232,7 @@ export const showEnterprisesUnit = (record_) => {
{ {
dataIndex: 'securityNumber', dataIndex: 'securityNumber',
title: '保安证号', title: '保安证号',
width: 120, width: 150,
ellipsis: true, ellipsis: true,
}, },
{ {

View File

@ -148,7 +148,7 @@ const columns: TableProps['columns'] = [
] ]
// const x: number = columns.reduce((a, b) => a + (b.width as number), 0) // const x: number = columns.reduce((a, b) => a + (b.width as number), 0)
const x: number = columns.reduce((a, b) => { const x: number = columns.reduce((a, b) => {
console.log('x_____________________', a, b, b.width) // console.log('x_____________________', a, b, b.width)
return a + (b.width as number) return a + (b.width as number)
}, 0) }, 0)