diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index b0453a5..2c32210 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -342,7 +342,7 @@ { text: '测量范围', value: 'mesureRange', align: 'center' }, { text: '不确定度', value: 'uncertainty', align: 'center' }, { text: '溯源机构', value: 'mesureDeptName', align: 'center' }, - // { text: '证书编号', value: 'zsbh', align: 'center' }, + { text: '证书编号', value: 'certificateNo', align: 'center' }, { text: '有效日期', value: 'validDate', align: 'center' }, ]) diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index b0453a5..2c32210 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -342,7 +342,7 @@ { text: '测量范围', value: 'mesureRange', align: 'center' }, { text: '不确定度', value: 'uncertainty', align: 'center' }, { text: '溯源机构', value: 'mesureDeptName', align: 'center' }, - // { text: '证书编号', value: 'zsbh', align: 'center' }, + { text: '证书编号', value: 'certificateNo', align: 'center' }, { text: '有效日期', value: 'validDate', align: 'center' }, ]) diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 7b793fd..2bfb6e3 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -95,6 +95,8 @@ supportStandardEquipmentName: '', supportStandardEquipmentNo: '', version: '', + + certificateNo: '', // 证书编号 }) // 表单 const rules = ref({ assetType: [{ required: true, message: '资产类型必填', trigger: 'blur' }], @@ -266,6 +268,7 @@ supportStandardEquipmentName: '', supportStandardEquipmentNo: '', version: '', + certificateNo: '', // 证书编号 } ruleForm.value.assetType = props.name !== '固定资产' ? '1' : '' } @@ -571,6 +574,12 @@ + + + + + + diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index b0453a5..2c32210 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -342,7 +342,7 @@ { text: '测量范围', value: 'mesureRange', align: 'center' }, { text: '不确定度', value: 'uncertainty', align: 'center' }, { text: '溯源机构', value: 'mesureDeptName', align: 'center' }, - // { text: '证书编号', value: 'zsbh', align: 'center' }, + { text: '证书编号', value: 'certificateNo', align: 'center' }, { text: '有效日期', value: 'validDate', align: 'center' }, ]) diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 7b793fd..2bfb6e3 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -95,6 +95,8 @@ supportStandardEquipmentName: '', supportStandardEquipmentNo: '', version: '', + + certificateNo: '', // 证书编号 }) // 表单 const rules = ref({ assetType: [{ required: true, message: '资产类型必填', trigger: 'blur' }], @@ -266,6 +268,7 @@ supportStandardEquipmentName: '', supportStandardEquipmentNo: '', version: '', + certificateNo: '', // 证书编号 } ruleForm.value.assetType = props.name !== '固定资产' ? '1' : '' } @@ -571,6 +574,12 @@ + + + + + + diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts index 4d239dd..a8e2dc6 100644 --- a/src/views/device/standingBook/standingBook-interface.ts +++ b/src/views/device/standingBook/standingBook-interface.ts @@ -2,9 +2,9 @@ // 固定资产查询参数 export interface fixedAssetsParams { abc?: string // ABC false - assetNo?: string // 资产编号 false - assetType?: string // 资产类型 false - equipmentCategory?: string // 设备类别 false + assetNo?: string // 资产编号 false + assetType?: string // 资产类型 false + equipmentCategory?: string // 设备类别 false equipmentName: string // 设备名称 false equipmentNo?: string // 设备编号 false equipmentSpecifications?: string // 设备规格 false @@ -108,6 +108,7 @@ version: string // 版本号 weight: string // 重量(吨) compulsoryVerification?: string | number // 强制检定 + certificateNo: string // 证书编号 } // 固定资产-查询用