diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue index 2d738fc..e261313 100644 --- a/src/views/device/standingBook/components/templatePage.vue +++ b/src/views/device/standingBook/components/templatePage.vue @@ -24,7 +24,7 @@ required: true, }, // 是否测量设备 - equipmentCategory: { + assetType: { type: String, default: '', }, @@ -59,21 +59,21 @@ managerState: '', // 管理状态 useDept: '', // 使用部门 assetType: '', // 资产类型 - equipmentCategory: '', // 测量设备 + equipmentCategory: '', // 设备类别 isCalibrationTestEquipment: '', // 校准/检定设备 isMeasureAccount: '', // 测量工装 isStandardSupportEquipment: '', // 标准配套设备 isFixedAssets: '', // 固定资产 validStartDate: '', // 有效开始日期 validEndDate: '', // 有效结束日期 - abc: null, + abc: '', limit: 20, offset: 1, ids: [] as string[], }) // 查询参数 watch(() => searchQuery.abc, (newVal) => { if (!newVal) { - searchQuery.abc = null + searchQuery.abc = '' } }) watch(() => validDate.value, (newVal) => { @@ -135,7 +135,7 @@ searchQuery.isMeasureAccount = props.isMeasureAccount searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment if (props.name === '测量设备') { - searchQuery.equipmentCategory = '1' + searchQuery.assetType = '1' } listPageApi(searchQuery).then((res) => { if (res.code === 200) { diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue index 2d738fc..e261313 100644 --- a/src/views/device/standingBook/components/templatePage.vue +++ b/src/views/device/standingBook/components/templatePage.vue @@ -24,7 +24,7 @@ required: true, }, // 是否测量设备 - equipmentCategory: { + assetType: { type: String, default: '', }, @@ -59,21 +59,21 @@ managerState: '', // 管理状态 useDept: '', // 使用部门 assetType: '', // 资产类型 - equipmentCategory: '', // 测量设备 + equipmentCategory: '', // 设备类别 isCalibrationTestEquipment: '', // 校准/检定设备 isMeasureAccount: '', // 测量工装 isStandardSupportEquipment: '', // 标准配套设备 isFixedAssets: '', // 固定资产 validStartDate: '', // 有效开始日期 validEndDate: '', // 有效结束日期 - abc: null, + abc: '', limit: 20, offset: 1, ids: [] as string[], }) // 查询参数 watch(() => searchQuery.abc, (newVal) => { if (!newVal) { - searchQuery.abc = null + searchQuery.abc = '' } }) watch(() => validDate.value, (newVal) => { @@ -135,7 +135,7 @@ searchQuery.isMeasureAccount = props.isMeasureAccount searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment if (props.name === '测量设备') { - searchQuery.equipmentCategory = '1' + searchQuery.assetType = '1' } listPageApi(searchQuery).then((res) => { if (res.code === 200) { diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue index 887c39e..dcf37ae 100644 --- a/src/views/device/standingBook/measureDevice.vue +++ b/src/views/device/standingBook/measureDevice.vue @@ -5,7 +5,7 @@