diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 22d47cc..b160f15 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -28,7 +28,6 @@ const showItemTableType = ref('') // 显示检定项表格两种页面(addRowPattern: 增加行模式，createPattern: 生成检定项模式) const form = ref({ model: '', // 型号规格 - modelNo: '', // 型号规格编号 deviceName: '', // 设备名称 helpInstruction: '', // 辅助字段 helpFieldInstruction: '', // 辅助字段说明 @@ -313,11 +312,6 @@ > - - - - - diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 22d47cc..b160f15 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -28,7 +28,6 @@ const showItemTableType = ref('') // 显示检定项表格两种页面(addRowPattern: 增加行模式，createPattern: 生成检定项模式) const form = ref({ model: '', // 型号规格 - modelNo: '', // 型号规格编号 deviceName: '', // 设备名称 helpInstruction: '', // 辅助字段 helpFieldInstruction: '', // 辅助字段说明 @@ -313,11 +312,6 @@ > - - - - - diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts index 7ef260d..3925d61 100644 --- a/src/views/business/measure/item/item-interface.ts +++ b/src/views/business/measure/item/item-interface.ts @@ -4,7 +4,6 @@ deviceType: string // 设备分类 helpInstruction: string // 辅助字段 model: string // 型号规格 - modelNo: string // 型号规格编号 syncTimeEnd: string // 自动检定系统最新同步时间结束 syncTimeStart: string // 自动检定系统最新同步时间开始 limit: number @@ -13,7 +12,6 @@ export interface IList { id: string - modelNo: string // 型号规格编号 deviceName: string // 设备名称 model: string // 型号规格 helpInstruction: string // 辅助字段 diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 22d47cc..b160f15 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -28,7 +28,6 @@ const showItemTableType = ref('') // 显示检定项表格两种页面(addRowPattern: 增加行模式，createPattern: 生成检定项模式) const form = ref({ model: '', // 型号规格 - modelNo: '', // 型号规格编号 deviceName: '', // 设备名称 helpInstruction: '', // 辅助字段 helpFieldInstruction: '', // 辅助字段说明 @@ -313,11 +312,6 @@ > - - - - - diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts index 7ef260d..3925d61 100644 --- a/src/views/business/measure/item/item-interface.ts +++ b/src/views/business/measure/item/item-interface.ts @@ -4,7 +4,6 @@ deviceType: string // 设备分类 helpInstruction: string // 辅助字段 model: string // 型号规格 - modelNo: string // 型号规格编号 syncTimeEnd: string // 自动检定系统最新同步时间结束 syncTimeStart: string // 自动检定系统最新同步时间开始 limit: number @@ -13,7 +12,6 @@ export interface IList { id: string - modelNo: string // 型号规格编号 deviceName: string // 设备名称 model: string // 型号规格 helpInstruction: string // 辅助字段 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index aef402f..0479b99 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -20,7 +20,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -29,7 +28,6 @@ // 表头 const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, @@ -148,7 +146,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -209,7 +206,6 @@ deviceType: listQuery.value.deviceType, // 设备分类 helpInstruction: listQuery.value.helpInstruction, // 辅助字段 model: listQuery.value.model, // 型号规格 - modelNo: listQuery.value.modelNo, // 型号规格编号 syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束 syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始 offset: 1, @@ -249,7 +245,6 @@ if (index !== -1) { list.value.splice(index + 1, 0, { id: '', - modelNo: checkoutList.value[0].modelNo, // 型号规格编号 deviceName: checkoutList.value[0].deviceName, // 设备名称 model: checkoutList.value[0].model, // 型号规格 helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段 @@ -310,9 +305,6 @@ - - - diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 22d47cc..b160f15 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -28,7 +28,6 @@ const showItemTableType = ref('') // 显示检定项表格两种页面(addRowPattern: 增加行模式，createPattern: 生成检定项模式) const form = ref({ model: '', // 型号规格 - modelNo: '', // 型号规格编号 deviceName: '', // 设备名称 helpInstruction: '', // 辅助字段 helpFieldInstruction: '', // 辅助字段说明 @@ -313,11 +312,6 @@ > - - - - - diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts index 7ef260d..3925d61 100644 --- a/src/views/business/measure/item/item-interface.ts +++ b/src/views/business/measure/item/item-interface.ts @@ -4,7 +4,6 @@ deviceType: string // 设备分类 helpInstruction: string // 辅助字段 model: string // 型号规格 - modelNo: string // 型号规格编号 syncTimeEnd: string // 自动检定系统最新同步时间结束 syncTimeStart: string // 自动检定系统最新同步时间开始 limit: number @@ -13,7 +12,6 @@ export interface IList { id: string - modelNo: string // 型号规格编号 deviceName: string // 设备名称 model: string // 型号规格 helpInstruction: string // 辅助字段 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index aef402f..0479b99 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -20,7 +20,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -29,7 +28,6 @@ // 表头 const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, @@ -148,7 +146,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -209,7 +206,6 @@ deviceType: listQuery.value.deviceType, // 设备分类 helpInstruction: listQuery.value.helpInstruction, // 辅助字段 model: listQuery.value.model, // 型号规格 - modelNo: listQuery.value.modelNo, // 型号规格编号 syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束 syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始 offset: 1, @@ -249,7 +245,6 @@ if (index !== -1) { list.value.splice(index + 1, 0, { id: '', - modelNo: checkoutList.value[0].modelNo, // 型号规格编号 deviceName: checkoutList.value[0].deviceName, // 设备名称 model: checkoutList.value[0].model, // 型号规格 helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段 @@ -310,9 +305,6 @@ - - - diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 72fb246..205b80b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -589,6 +589,8 @@ }, { immediate: true }) onMounted(async () => { + console.log('=====================') + console.log(pageType.value, 'pageType') console.log(infoId.value, 'infoId.value') getDict().then(() => { diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 22d47cc..b160f15 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -28,7 +28,6 @@ const showItemTableType = ref('') // 显示检定项表格两种页面(addRowPattern: 增加行模式，createPattern: 生成检定项模式) const form = ref({ model: '', // 型号规格 - modelNo: '', // 型号规格编号 deviceName: '', // 设备名称 helpInstruction: '', // 辅助字段 helpFieldInstruction: '', // 辅助字段说明 @@ -313,11 +312,6 @@ > - - - - - diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts index 7ef260d..3925d61 100644 --- a/src/views/business/measure/item/item-interface.ts +++ b/src/views/business/measure/item/item-interface.ts @@ -4,7 +4,6 @@ deviceType: string // 设备分类 helpInstruction: string // 辅助字段 model: string // 型号规格 - modelNo: string // 型号规格编号 syncTimeEnd: string // 自动检定系统最新同步时间结束 syncTimeStart: string // 自动检定系统最新同步时间开始 limit: number @@ -13,7 +12,6 @@ export interface IList { id: string - modelNo: string // 型号规格编号 deviceName: string // 设备名称 model: string // 型号规格 helpInstruction: string // 辅助字段 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index aef402f..0479b99 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -20,7 +20,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -29,7 +28,6 @@ // 表头 const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, @@ -148,7 +146,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -209,7 +206,6 @@ deviceType: listQuery.value.deviceType, // 设备分类 helpInstruction: listQuery.value.helpInstruction, // 辅助字段 model: listQuery.value.model, // 型号规格 - modelNo: listQuery.value.modelNo, // 型号规格编号 syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束 syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始 offset: 1, @@ -249,7 +245,6 @@ if (index !== -1) { list.value.splice(index + 1, 0, { id: '', - modelNo: checkoutList.value[0].modelNo, // 型号规格编号 deviceName: checkoutList.value[0].deviceName, // 设备名称 model: checkoutList.value[0].model, // 型号规格 helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段 @@ -310,9 +305,6 @@ - - - diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 72fb246..205b80b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -589,6 +589,8 @@ }, { immediate: true }) onMounted(async () => { + console.log('=====================') + console.log(pageType.value, 'pageType') console.log(infoId.value, 'infoId.value') getDict().then(() => { diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 7343c67..7904048 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -51,6 +51,8 @@ indicatingError: '', // 示值误差允许值(示值误差) maxReturnError: '', // 最大回差(回程误差最大值) returnError: '', // 回差（允许回差） + + tempData: '', // 无用，计算输出时去掉 }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -273,14 +275,14 @@ itemFormData.value.itemId = res.data.itemId // 检定项id itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称 itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id - itemFormData.value.appearance = res.data.appearance // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观备注说明 - itemFormData.value.pointerDeflectionStability = res.data.pointerDeflectionStability // 指针偏转平稳性 + itemFormData.value.pointerDeflectionStability = `${res.data.pointerDeflectionStability}` // 指针偏转平稳性 itemFormData.value.pointerDeflectionStabilityRemark = res.data.pointerDeflectionStabilityRemark // 指针偏转平稳性备注说明 - itemFormData.value.tightness = res.data.tightness // 密封性 + itemFormData.value.tightness = `${res.data.tightness}` // 密封性 itemFormData.value.tightnessRemark = res.data.tightnessRemark // 密封性备注说明 itemFormData.value.zeroDriftResult = res.data.zeroDriftResult // 零位飘移结果（合格/不合格，直接存文字） - itemFormData.value.insulationResistance = res.data.insulationResistance // 绝缘电阻 + itemFormData.value.insulationResistance = `${res.data.insulationResistance}`// 绝缘电阻 itemFormData.value.insulationResistanceRemark = res.data.insulationResistanceRemark // 绝缘电阻备注说明-0.02活塞式压力计 itemFormData.value.remark = res.data.remark // 备注 @@ -400,11 +402,11 @@ belongStandardEquipment, // 检校标准装置字典code } getItemInfo(params).then((res) => { - itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : false // 指针偏转平稳性 - itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : false // 密封性 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : false // 外观及功能检查 1有外观，2没有外观 + itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : '' // 指针偏转平稳性 + itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : '' // 密封性 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观 initInputData(res.data.measureItemDataPistonGaugeList) itemFormData.value.cycleNumber = res.data.measureItemConfigPistonGauge.cycleNumber // 循环次数 @@ -540,27 +542,24 @@ watch(() => props.infoId, (newValue) => { if (newValue) { infoId.value = newValue - fetchInfo() } }, { immediate: true }) -onMounted(async () => { - console.log(pageType.value, 'pageType') - console.log(infoId.value, 'infoId.value') +onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 - itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 // 查输入值(查检定项管理的详情) fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string) } else { + itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id - itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string || ''// 标准装置code - itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 + itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code + itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 fetchInfo() } }) @@ -825,9 +824,9 @@ - + - + - + - + - + - + - + - + - + - + - - - - - diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts index 7ef260d..3925d61 100644 --- a/src/views/business/measure/item/item-interface.ts +++ b/src/views/business/measure/item/item-interface.ts @@ -4,7 +4,6 @@ deviceType: string // 设备分类 helpInstruction: string // 辅助字段 model: string // 型号规格 - modelNo: string // 型号规格编号 syncTimeEnd: string // 自动检定系统最新同步时间结束 syncTimeStart: string // 自动检定系统最新同步时间开始 limit: number @@ -13,7 +12,6 @@ export interface IList { id: string - modelNo: string // 型号规格编号 deviceName: string // 设备名称 model: string // 型号规格 helpInstruction: string // 辅助字段 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index aef402f..0479b99 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -20,7 +20,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -29,7 +28,6 @@ // 表头 const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, @@ -148,7 +146,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -209,7 +206,6 @@ deviceType: listQuery.value.deviceType, // 设备分类 helpInstruction: listQuery.value.helpInstruction, // 辅助字段 model: listQuery.value.model, // 型号规格 - modelNo: listQuery.value.modelNo, // 型号规格编号 syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束 syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始 offset: 1, @@ -249,7 +245,6 @@ if (index !== -1) { list.value.splice(index + 1, 0, { id: '', - modelNo: checkoutList.value[0].modelNo, // 型号规格编号 deviceName: checkoutList.value[0].deviceName, // 设备名称 model: checkoutList.value[0].model, // 型号规格 helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段 @@ -310,9 +305,6 @@ - - - diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 72fb246..205b80b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -589,6 +589,8 @@ }, { immediate: true }) onMounted(async () => { + console.log('=====================') + console.log(pageType.value, 'pageType') console.log(infoId.value, 'infoId.value') getDict().then(() => { diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 7343c67..7904048 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -51,6 +51,8 @@ indicatingError: '', // 示值误差允许值(示值误差) maxReturnError: '', // 最大回差(回程误差最大值) returnError: '', // 回差（允许回差） + + tempData: '', // 无用，计算输出时去掉 }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -273,14 +275,14 @@ itemFormData.value.itemId = res.data.itemId // 检定项id itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称 itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id - itemFormData.value.appearance = res.data.appearance // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观备注说明 - itemFormData.value.pointerDeflectionStability = res.data.pointerDeflectionStability // 指针偏转平稳性 + itemFormData.value.pointerDeflectionStability = `${res.data.pointerDeflectionStability}` // 指针偏转平稳性 itemFormData.value.pointerDeflectionStabilityRemark = res.data.pointerDeflectionStabilityRemark // 指针偏转平稳性备注说明 - itemFormData.value.tightness = res.data.tightness // 密封性 + itemFormData.value.tightness = `${res.data.tightness}` // 密封性 itemFormData.value.tightnessRemark = res.data.tightnessRemark // 密封性备注说明 itemFormData.value.zeroDriftResult = res.data.zeroDriftResult // 零位飘移结果（合格/不合格，直接存文字） - itemFormData.value.insulationResistance = res.data.insulationResistance // 绝缘电阻 + itemFormData.value.insulationResistance = `${res.data.insulationResistance}`// 绝缘电阻 itemFormData.value.insulationResistanceRemark = res.data.insulationResistanceRemark // 绝缘电阻备注说明-0.02活塞式压力计 itemFormData.value.remark = res.data.remark // 备注 @@ -400,11 +402,11 @@ belongStandardEquipment, // 检校标准装置字典code } getItemInfo(params).then((res) => { - itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : false // 指针偏转平稳性 - itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : false // 密封性 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : false // 外观及功能检查 1有外观，2没有外观 + itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : '' // 指针偏转平稳性 + itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : '' // 密封性 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观 initInputData(res.data.measureItemDataPistonGaugeList) itemFormData.value.cycleNumber = res.data.measureItemConfigPistonGauge.cycleNumber // 循环次数 @@ -540,27 +542,24 @@ watch(() => props.infoId, (newValue) => { if (newValue) { infoId.value = newValue - fetchInfo() } }, { immediate: true }) -onMounted(async () => { - console.log(pageType.value, 'pageType') - console.log(infoId.value, 'infoId.value') +onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 - itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 // 查输入值(查检定项管理的详情) fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string) } else { + itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id - itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string || ''// 标准装置code - itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 + itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code + itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 fetchInfo() } }) @@ -825,9 +824,9 @@ - + - + - + - + - + - + - + - + - + - + @@ -480,3 +485,12 @@ padding-bottom: 20px; } + + + diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 22d47cc..b160f15 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -28,7 +28,6 @@ const showItemTableType = ref('') // 显示检定项表格两种页面(addRowPattern: 增加行模式，createPattern: 生成检定项模式) const form = ref({ model: '', // 型号规格 - modelNo: '', // 型号规格编号 deviceName: '', // 设备名称 helpInstruction: '', // 辅助字段 helpFieldInstruction: '', // 辅助字段说明 @@ -313,11 +312,6 @@ > - - - - - diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts index 7ef260d..3925d61 100644 --- a/src/views/business/measure/item/item-interface.ts +++ b/src/views/business/measure/item/item-interface.ts @@ -4,7 +4,6 @@ deviceType: string // 设备分类 helpInstruction: string // 辅助字段 model: string // 型号规格 - modelNo: string // 型号规格编号 syncTimeEnd: string // 自动检定系统最新同步时间结束 syncTimeStart: string // 自动检定系统最新同步时间开始 limit: number @@ -13,7 +12,6 @@ export interface IList { id: string - modelNo: string // 型号规格编号 deviceName: string // 设备名称 model: string // 型号规格 helpInstruction: string // 辅助字段 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index aef402f..0479b99 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -20,7 +20,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -29,7 +28,6 @@ // 表头 const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, @@ -148,7 +146,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -209,7 +206,6 @@ deviceType: listQuery.value.deviceType, // 设备分类 helpInstruction: listQuery.value.helpInstruction, // 辅助字段 model: listQuery.value.model, // 型号规格 - modelNo: listQuery.value.modelNo, // 型号规格编号 syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束 syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始 offset: 1, @@ -249,7 +245,6 @@ if (index !== -1) { list.value.splice(index + 1, 0, { id: '', - modelNo: checkoutList.value[0].modelNo, // 型号规格编号 deviceName: checkoutList.value[0].deviceName, // 设备名称 model: checkoutList.value[0].model, // 型号规格 helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段 @@ -310,9 +305,6 @@ - - - diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 72fb246..205b80b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -589,6 +589,8 @@ }, { immediate: true }) onMounted(async () => { + console.log('=====================') + console.log(pageType.value, 'pageType') console.log(infoId.value, 'infoId.value') getDict().then(() => { diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 7343c67..7904048 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -51,6 +51,8 @@ indicatingError: '', // 示值误差允许值(示值误差) maxReturnError: '', // 最大回差(回程误差最大值) returnError: '', // 回差（允许回差） + + tempData: '', // 无用，计算输出时去掉 }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -273,14 +275,14 @@ itemFormData.value.itemId = res.data.itemId // 检定项id itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称 itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id - itemFormData.value.appearance = res.data.appearance // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观备注说明 - itemFormData.value.pointerDeflectionStability = res.data.pointerDeflectionStability // 指针偏转平稳性 + itemFormData.value.pointerDeflectionStability = `${res.data.pointerDeflectionStability}` // 指针偏转平稳性 itemFormData.value.pointerDeflectionStabilityRemark = res.data.pointerDeflectionStabilityRemark // 指针偏转平稳性备注说明 - itemFormData.value.tightness = res.data.tightness // 密封性 + itemFormData.value.tightness = `${res.data.tightness}` // 密封性 itemFormData.value.tightnessRemark = res.data.tightnessRemark // 密封性备注说明 itemFormData.value.zeroDriftResult = res.data.zeroDriftResult // 零位飘移结果（合格/不合格，直接存文字） - itemFormData.value.insulationResistance = res.data.insulationResistance // 绝缘电阻 + itemFormData.value.insulationResistance = `${res.data.insulationResistance}`// 绝缘电阻 itemFormData.value.insulationResistanceRemark = res.data.insulationResistanceRemark // 绝缘电阻备注说明-0.02活塞式压力计 itemFormData.value.remark = res.data.remark // 备注 @@ -400,11 +402,11 @@ belongStandardEquipment, // 检校标准装置字典code } getItemInfo(params).then((res) => { - itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : false // 指针偏转平稳性 - itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : false // 密封性 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : false // 外观及功能检查 1有外观，2没有外观 + itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : '' // 指针偏转平稳性 + itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : '' // 密封性 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观 initInputData(res.data.measureItemDataPistonGaugeList) itemFormData.value.cycleNumber = res.data.measureItemConfigPistonGauge.cycleNumber // 循环次数 @@ -540,27 +542,24 @@ watch(() => props.infoId, (newValue) => { if (newValue) { infoId.value = newValue - fetchInfo() } }, { immediate: true }) -onMounted(async () => { - console.log(pageType.value, 'pageType') - console.log(infoId.value, 'infoId.value') +onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 - itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 // 查输入值(查检定项管理的详情) fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string) } else { + itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id - itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string || ''// 标准装置code - itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 + itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code + itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 fetchInfo() } }) @@ -825,9 +824,9 @@ - + - + - + - + - + - + - + - + - + - + @@ -480,3 +485,12 @@ padding-bottom: 20px; } + + + diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue index dd8f0f8..5eeb00e 100644 --- a/src/views/business/taskMeasure/measureData/detail.vue +++ b/src/views/business/taskMeasure/measureData/detail.vue @@ -22,6 +22,9 @@ const saveMeasureCertificateRef = ref() // 生成原始记录和检定证书组件ref const belongStandardEquipment = ref('') // 检校标准装置 const belongStandardEquipmentName = ref('') // 检校标准装置名称 +const itemCategoryName = ref('') // 检定项分类名称 +const itemCategoryId = ref('') // 检定项分类id + // ----------------------------------路由参数-------------------------------------------- if ($route.params && $route.params.type) { pageType.value = $route.params.type as string @@ -64,7 +67,6 @@ model: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleModel, // 型号 equipmentIds: templateDetailRef.value.templateFormAndTableRef.measureEquipmentList.map((item: { id: string }) => item.id), measureDataPistonGaugeList: templateDetailRef.value.list, // 检定数据 - measureDataCalibratorList: [], id: pageType.value === 'edit' ? infoId.value : '', } } @@ -136,14 +138,7 @@ // 生成原始记录和检定证书 const createRecord = () => { - const params = { - ...templateDetailRef.value.form, - ...templateDetailRef.value.sampleList[0], // 被检件信息 - customerName: pageType.value === 'add' ? '' : templateDetailRef.value.form.customerName, // 委托单位系统生成，在此置空(原有数据是从我的任务列表页带来，仅做展示) - model: templateDetailRef.value.sampleList[0].sampleModel, // 型号 - equipmentIds: templateDetailRef.value.measureDataCalibratorList.map((item: { id: string }) => item.id), - measureDataCalibratorList: templateDetailRef.value.list, // 检定数据 - } + const params = solveSaveParams() saveMeasureCertificateRef.value.initDialog(params) } @@ -153,13 +148,10 @@ // -------------------------------------------获取详情信息-------------------------------------------------- onMounted(async () => { + itemCategoryName.value = $route.query.itemCategoryName as string || '' // 检定项分类名称 + itemCategoryId.value = $route.query.itemCategoryId as string || '' // 检定项分类id belongStandardEquipment.value = $route.query.belongStandardEquipment as string || ''// 标准装置code belongStandardEquipmentName.value = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 - if (pageType.value !== 'add') { - // fetchInfo() - } - else { // 新建 - } }) diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 22d47cc..b160f15 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -28,7 +28,6 @@ const showItemTableType = ref('') // 显示检定项表格两种页面(addRowPattern: 增加行模式，createPattern: 生成检定项模式) const form = ref({ model: '', // 型号规格 - modelNo: '', // 型号规格编号 deviceName: '', // 设备名称 helpInstruction: '', // 辅助字段 helpFieldInstruction: '', // 辅助字段说明 @@ -313,11 +312,6 @@ > - - - - - diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts index 7ef260d..3925d61 100644 --- a/src/views/business/measure/item/item-interface.ts +++ b/src/views/business/measure/item/item-interface.ts @@ -4,7 +4,6 @@ deviceType: string // 设备分类 helpInstruction: string // 辅助字段 model: string // 型号规格 - modelNo: string // 型号规格编号 syncTimeEnd: string // 自动检定系统最新同步时间结束 syncTimeStart: string // 自动检定系统最新同步时间开始 limit: number @@ -13,7 +12,6 @@ export interface IList { id: string - modelNo: string // 型号规格编号 deviceName: string // 设备名称 model: string // 型号规格 helpInstruction: string // 辅助字段 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index aef402f..0479b99 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -20,7 +20,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -29,7 +28,6 @@ // 表头 const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, @@ -148,7 +146,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -209,7 +206,6 @@ deviceType: listQuery.value.deviceType, // 设备分类 helpInstruction: listQuery.value.helpInstruction, // 辅助字段 model: listQuery.value.model, // 型号规格 - modelNo: listQuery.value.modelNo, // 型号规格编号 syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束 syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始 offset: 1, @@ -249,7 +245,6 @@ if (index !== -1) { list.value.splice(index + 1, 0, { id: '', - modelNo: checkoutList.value[0].modelNo, // 型号规格编号 deviceName: checkoutList.value[0].deviceName, // 设备名称 model: checkoutList.value[0].model, // 型号规格 helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段 @@ -310,9 +305,6 @@ - - - diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 72fb246..205b80b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -589,6 +589,8 @@ }, { immediate: true }) onMounted(async () => { + console.log('=====================') + console.log(pageType.value, 'pageType') console.log(infoId.value, 'infoId.value') getDict().then(() => { diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 7343c67..7904048 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -51,6 +51,8 @@ indicatingError: '', // 示值误差允许值(示值误差) maxReturnError: '', // 最大回差(回程误差最大值) returnError: '', // 回差（允许回差） + + tempData: '', // 无用，计算输出时去掉 }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -273,14 +275,14 @@ itemFormData.value.itemId = res.data.itemId // 检定项id itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称 itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id - itemFormData.value.appearance = res.data.appearance // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观备注说明 - itemFormData.value.pointerDeflectionStability = res.data.pointerDeflectionStability // 指针偏转平稳性 + itemFormData.value.pointerDeflectionStability = `${res.data.pointerDeflectionStability}` // 指针偏转平稳性 itemFormData.value.pointerDeflectionStabilityRemark = res.data.pointerDeflectionStabilityRemark // 指针偏转平稳性备注说明 - itemFormData.value.tightness = res.data.tightness // 密封性 + itemFormData.value.tightness = `${res.data.tightness}` // 密封性 itemFormData.value.tightnessRemark = res.data.tightnessRemark // 密封性备注说明 itemFormData.value.zeroDriftResult = res.data.zeroDriftResult // 零位飘移结果（合格/不合格，直接存文字） - itemFormData.value.insulationResistance = res.data.insulationResistance // 绝缘电阻 + itemFormData.value.insulationResistance = `${res.data.insulationResistance}`// 绝缘电阻 itemFormData.value.insulationResistanceRemark = res.data.insulationResistanceRemark // 绝缘电阻备注说明-0.02活塞式压力计 itemFormData.value.remark = res.data.remark // 备注 @@ -400,11 +402,11 @@ belongStandardEquipment, // 检校标准装置字典code } getItemInfo(params).then((res) => { - itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : false // 指针偏转平稳性 - itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : false // 密封性 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : false // 外观及功能检查 1有外观，2没有外观 + itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : '' // 指针偏转平稳性 + itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : '' // 密封性 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观 initInputData(res.data.measureItemDataPistonGaugeList) itemFormData.value.cycleNumber = res.data.measureItemConfigPistonGauge.cycleNumber // 循环次数 @@ -540,27 +542,24 @@ watch(() => props.infoId, (newValue) => { if (newValue) { infoId.value = newValue - fetchInfo() } }, { immediate: true }) -onMounted(async () => { - console.log(pageType.value, 'pageType') - console.log(infoId.value, 'infoId.value') +onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 - itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 // 查输入值(查检定项管理的详情) fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string) } else { + itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id - itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string || ''// 标准装置code - itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 + itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code + itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 fetchInfo() } }) @@ -825,9 +824,9 @@ - + - + - + - + - + - + - + - + - + - + @@ -480,3 +485,12 @@ padding-bottom: 20px; } + + + diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue index dd8f0f8..5eeb00e 100644 --- a/src/views/business/taskMeasure/measureData/detail.vue +++ b/src/views/business/taskMeasure/measureData/detail.vue @@ -22,6 +22,9 @@ const saveMeasureCertificateRef = ref() // 生成原始记录和检定证书组件ref const belongStandardEquipment = ref('') // 检校标准装置 const belongStandardEquipmentName = ref('') // 检校标准装置名称 +const itemCategoryName = ref('') // 检定项分类名称 +const itemCategoryId = ref('') // 检定项分类id + // ----------------------------------路由参数-------------------------------------------- if ($route.params && $route.params.type) { pageType.value = $route.params.type as string @@ -64,7 +67,6 @@ model: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleModel, // 型号 equipmentIds: templateDetailRef.value.templateFormAndTableRef.measureEquipmentList.map((item: { id: string }) => item.id), measureDataPistonGaugeList: templateDetailRef.value.list, // 检定数据 - measureDataCalibratorList: [], id: pageType.value === 'edit' ? infoId.value : '', } } @@ -136,14 +138,7 @@ // 生成原始记录和检定证书 const createRecord = () => { - const params = { - ...templateDetailRef.value.form, - ...templateDetailRef.value.sampleList[0], // 被检件信息 - customerName: pageType.value === 'add' ? '' : templateDetailRef.value.form.customerName, // 委托单位系统生成，在此置空(原有数据是从我的任务列表页带来，仅做展示) - model: templateDetailRef.value.sampleList[0].sampleModel, // 型号 - equipmentIds: templateDetailRef.value.measureDataCalibratorList.map((item: { id: string }) => item.id), - measureDataCalibratorList: templateDetailRef.value.list, // 检定数据 - } + const params = solveSaveParams() saveMeasureCertificateRef.value.initDialog(params) } @@ -153,13 +148,10 @@ // -------------------------------------------获取详情信息-------------------------------------------------- onMounted(async () => { + itemCategoryName.value = $route.query.itemCategoryName as string || '' // 检定项分类名称 + itemCategoryId.value = $route.query.itemCategoryId as string || '' // 检定项分类id belongStandardEquipment.value = $route.query.belongStandardEquipment as string || ''// 标准装置code belongStandardEquipmentName.value = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 - if (pageType.value !== 'add') { - // fetchInfo() - } - else { // 新建 - } }) diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue index 7edeadf..135c9e0 100644 --- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue +++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue @@ -19,7 +19,6 @@ const list = ref([]) // 表格数据 const total = ref(0) const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index 22d47cc..b160f15 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -28,7 +28,6 @@ const showItemTableType = ref('') // 显示检定项表格两种页面(addRowPattern: 增加行模式，createPattern: 生成检定项模式) const form = ref({ model: '', // 型号规格 - modelNo: '', // 型号规格编号 deviceName: '', // 设备名称 helpInstruction: '', // 辅助字段 helpFieldInstruction: '', // 辅助字段说明 @@ -313,11 +312,6 @@ > - - - - - diff --git a/src/views/business/measure/item/item-interface.ts b/src/views/business/measure/item/item-interface.ts index 7ef260d..3925d61 100644 --- a/src/views/business/measure/item/item-interface.ts +++ b/src/views/business/measure/item/item-interface.ts @@ -4,7 +4,6 @@ deviceType: string // 设备分类 helpInstruction: string // 辅助字段 model: string // 型号规格 - modelNo: string // 型号规格编号 syncTimeEnd: string // 自动检定系统最新同步时间结束 syncTimeStart: string // 自动检定系统最新同步时间开始 limit: number @@ -13,7 +12,6 @@ export interface IList { id: string - modelNo: string // 型号规格编号 deviceName: string // 设备名称 model: string // 型号规格 helpInstruction: string // 辅助字段 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index aef402f..0479b99 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -20,7 +20,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -29,7 +28,6 @@ // 表头 const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, @@ -148,7 +146,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20, @@ -209,7 +206,6 @@ deviceType: listQuery.value.deviceType, // 设备分类 helpInstruction: listQuery.value.helpInstruction, // 辅助字段 model: listQuery.value.model, // 型号规格 - modelNo: listQuery.value.modelNo, // 型号规格编号 syncTimeEnd: listQuery.value.syncTimeEnd, // 自动检定系统最新同步时间结束 syncTimeStart: listQuery.value.syncTimeStart, // 自动检定系统最新同步时间开始 offset: 1, @@ -249,7 +245,6 @@ if (index !== -1) { list.value.splice(index + 1, 0, { id: '', - modelNo: checkoutList.value[0].modelNo, // 型号规格编号 deviceName: checkoutList.value[0].deviceName, // 设备名称 model: checkoutList.value[0].model, // 型号规格 helpInstruction: checkoutList.value[0].helpInstruction, // 辅助字段 @@ -310,9 +305,6 @@ - - - diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 72fb246..205b80b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -589,6 +589,8 @@ }, { immediate: true }) onMounted(async () => { + console.log('=====================') + console.log(pageType.value, 'pageType') console.log(infoId.value, 'infoId.value') getDict().then(() => { diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 7343c67..7904048 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -51,6 +51,8 @@ indicatingError: '', // 示值误差允许值(示值误差) maxReturnError: '', // 最大回差(回程误差最大值) returnError: '', // 回差（允许回差） + + tempData: '', // 无用，计算输出时去掉 }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -273,14 +275,14 @@ itemFormData.value.itemId = res.data.itemId // 检定项id itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称 itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id - itemFormData.value.appearance = res.data.appearance // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观备注说明 - itemFormData.value.pointerDeflectionStability = res.data.pointerDeflectionStability // 指针偏转平稳性 + itemFormData.value.pointerDeflectionStability = `${res.data.pointerDeflectionStability}` // 指针偏转平稳性 itemFormData.value.pointerDeflectionStabilityRemark = res.data.pointerDeflectionStabilityRemark // 指针偏转平稳性备注说明 - itemFormData.value.tightness = res.data.tightness // 密封性 + itemFormData.value.tightness = `${res.data.tightness}` // 密封性 itemFormData.value.tightnessRemark = res.data.tightnessRemark // 密封性备注说明 itemFormData.value.zeroDriftResult = res.data.zeroDriftResult // 零位飘移结果（合格/不合格，直接存文字） - itemFormData.value.insulationResistance = res.data.insulationResistance // 绝缘电阻 + itemFormData.value.insulationResistance = `${res.data.insulationResistance}`// 绝缘电阻 itemFormData.value.insulationResistanceRemark = res.data.insulationResistanceRemark // 绝缘电阻备注说明-0.02活塞式压力计 itemFormData.value.remark = res.data.remark // 备注 @@ -400,11 +402,11 @@ belongStandardEquipment, // 检校标准装置字典code } getItemInfo(params).then((res) => { - itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : false // 指针偏转平稳性 - itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : false // 密封性 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : false // 绝缘电阻 - itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : false // 外观及功能检查 1有外观，2没有外观 + itemFormData.value.pointerDeflectionStability = res.data.measureItemConfigPistonGauge.pointerDeflectionStability ? '1' : '' // 指针偏转平稳性 + itemFormData.value.tightness = res.data.measureItemConfigPistonGauge.tightness ? '1' : '' // 密封性 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.insulationResistance = res.data.measureItemConfigPistonGauge.insulationResistance ? '1' : '' // 绝缘电阻 + itemFormData.value.appearance = res.data.measureItemConfigPistonGauge.appearance ? '1' : '' // 外观及功能检查 1有外观，2没有外观 initInputData(res.data.measureItemDataPistonGaugeList) itemFormData.value.cycleNumber = res.data.measureItemConfigPistonGauge.cycleNumber // 循环次数 @@ -540,27 +542,24 @@ watch(() => props.infoId, (newValue) => { if (newValue) { infoId.value = newValue - fetchInfo() } }, { immediate: true }) -onMounted(async () => { - console.log(pageType.value, 'pageType') - console.log(infoId.value, 'infoId.value') +onMounted(() => { if (pageType.value === 'add') { // 从我的任务跳转过来（新增） itemFormData.value.itemId = $route.query.itemId as string// 检定项id itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 - itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 // 查输入值(查检定项管理的详情) fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string) } else { + itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string // 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id - itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string || ''// 标准装置code - itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 + itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code + itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 fetchInfo() } }) @@ -825,9 +824,9 @@ - + - + - + - + - + - + - + - + - + - + @@ -480,3 +485,12 @@ padding-bottom: 20px; } + + + diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue index dd8f0f8..5eeb00e 100644 --- a/src/views/business/taskMeasure/measureData/detail.vue +++ b/src/views/business/taskMeasure/measureData/detail.vue @@ -22,6 +22,9 @@ const saveMeasureCertificateRef = ref() // 生成原始记录和检定证书组件ref const belongStandardEquipment = ref('') // 检校标准装置 const belongStandardEquipmentName = ref('') // 检校标准装置名称 +const itemCategoryName = ref('') // 检定项分类名称 +const itemCategoryId = ref('') // 检定项分类id + // ----------------------------------路由参数-------------------------------------------- if ($route.params && $route.params.type) { pageType.value = $route.params.type as string @@ -64,7 +67,6 @@ model: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleModel, // 型号 equipmentIds: templateDetailRef.value.templateFormAndTableRef.measureEquipmentList.map((item: { id: string }) => item.id), measureDataPistonGaugeList: templateDetailRef.value.list, // 检定数据 - measureDataCalibratorList: [], id: pageType.value === 'edit' ? infoId.value : '', } } @@ -136,14 +138,7 @@ // 生成原始记录和检定证书 const createRecord = () => { - const params = { - ...templateDetailRef.value.form, - ...templateDetailRef.value.sampleList[0], // 被检件信息 - customerName: pageType.value === 'add' ? '' : templateDetailRef.value.form.customerName, // 委托单位系统生成，在此置空(原有数据是从我的任务列表页带来，仅做展示) - model: templateDetailRef.value.sampleList[0].sampleModel, // 型号 - equipmentIds: templateDetailRef.value.measureDataCalibratorList.map((item: { id: string }) => item.id), - measureDataCalibratorList: templateDetailRef.value.list, // 检定数据 - } + const params = solveSaveParams() saveMeasureCertificateRef.value.initDialog(params) } @@ -153,13 +148,10 @@ // -------------------------------------------获取详情信息-------------------------------------------------- onMounted(async () => { + itemCategoryName.value = $route.query.itemCategoryName as string || '' // 检定项分类名称 + itemCategoryId.value = $route.query.itemCategoryId as string || '' // 检定项分类id belongStandardEquipment.value = $route.query.belongStandardEquipment as string || ''// 标准装置code belongStandardEquipmentName.value = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 - if (pageType.value !== 'add') { - // fetchInfo() - } - else { // 新建 - } }) diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue index 7edeadf..135c9e0 100644 --- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue +++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue @@ -19,7 +19,6 @@ const list = ref([]) // 表格数据 const total = ref(0) const columns = ref([ - { text: '型号规格编号', value: 'modelNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue index 63eecc6..41e6495 100644 --- a/src/views/business/taskMeasure/myTask/list.vue +++ b/src/views/business/taskMeasure/myTask/list.vue @@ -227,7 +227,6 @@ deviceType: '', // 设备分类 helpInstruction: '', // 辅助字段 model: '', // 型号规格 - modelNo: '', // 型号规格编号 syncTimeEnd: '', // 自动检定系统最新同步时间结束 syncTimeStart: '', // 自动检定系统最新同步时间开始 limit: 20,