diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index 6d6da54..b167be4 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -515,8 +515,12 @@ }, { immediate: true }) const $route = useRoute() watch(() => props.list, (newVal) => { // 检定项表格 - const updataOld = $route.query.updataOld as string - const isFirstConfig = $route.query.isFirstConfig as string + const updataOld = $route.query.updataOld as string // 是否更新了检定项或者标准装置 + const isFirstConfig = $route.query.isFirstConfig as string // 是否第一次配置 + + console.log('是否更新了检定项或者标准装置', updataOld) + console.log('是否第一次配置', isFirstConfig) + if (newVal && Object.keys(newVal).length && updataOld !== 'true' && isFirstConfig !== 'true') { const topList = newVal.filter((item: any) => `${item.dataType}` === '1') listTop.value = topList.map((item: any) => { @@ -535,7 +539,6 @@ resolution: Number(item.resolution), // 分辨力 } }) - console.log('oooooooooooooooo', props.pageType) showListTop.value = !!listTop.value.length showListBottom.value = !!listBottom.value.length // if(props.pageType === 'detail' && (props.itemCategoryName === '电子式绝缘电阻表(数字式)' || props.itemCategoryName === '电子式绝缘电阻表(指针式)')) { @@ -583,7 +586,7 @@ stripe style="width: 100%;" max-height="300" - @selection-change="(e) => handleSelectionChange(e, 'top')" + @selection-change="(e: any) => handleSelectionChange(e, 'top')" > diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index 6d6da54..b167be4 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -515,8 +515,12 @@ }, { immediate: true }) const $route = useRoute() watch(() => props.list, (newVal) => { // 检定项表格 - const updataOld = $route.query.updataOld as string - const isFirstConfig = $route.query.isFirstConfig as string + const updataOld = $route.query.updataOld as string // 是否更新了检定项或者标准装置 + const isFirstConfig = $route.query.isFirstConfig as string // 是否第一次配置 + + console.log('是否更新了检定项或者标准装置', updataOld) + console.log('是否第一次配置', isFirstConfig) + if (newVal && Object.keys(newVal).length && updataOld !== 'true' && isFirstConfig !== 'true') { const topList = newVal.filter((item: any) => `${item.dataType}` === '1') listTop.value = topList.map((item: any) => { @@ -535,7 +539,6 @@ resolution: Number(item.resolution), // 分辨力 } }) - console.log('oooooooooooooooo', props.pageType) showListTop.value = !!listTop.value.length showListBottom.value = !!listBottom.value.length // if(props.pageType === 'detail' && (props.itemCategoryName === '电子式绝缘电阻表(数字式)' || props.itemCategoryName === '电子式绝缘电阻表(指针式)')) { @@ -583,7 +586,7 @@ stripe style="width: 100%;" max-height="300" - @selection-change="(e) => handleSelectionChange(e, 'top')" + @selection-change="(e: any) => handleSelectionChange(e, 'top')" > diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index fed29f3..784617a 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -67,7 +67,7 @@ labH: [{ required: true, message: '海口实验室名字不能为空', trigger: ['blur', 'change'] }], }) const getList = ref([]) // 检定项列表 -const getObject = ref < any > ({}) // 检定项表单 +const getObject = ref ({}) // 检定项表单 // ==========================第一套：多功能校准源标准装置数据================================== const appearanceFunctionCheck = ref(true) // 第一套:多功能校准源--外观及功能检查 const indicationError = ref(true) // 第一套:多功能校准源--示值误差 @@ -693,12 +693,7 @@ else { getList.value = response.measureItemDataElectricalSafetyList // 检定项表格 } - if (`${$route.query.isFirstConfig}` === 'true') { - getObject.value = { - ...response, - appearanceFunctionCheck: 1, - } - } + getObject.value = response // 检定项表单 } else if (form.value.belongStandardEquipment === '4') { // 第四套：0.02级活塞式压力计 getList.value = response.measureItemDataPistonGaugeList // 检定项表格 diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index 6d6da54..b167be4 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -515,8 +515,12 @@ }, { immediate: true }) const $route = useRoute() watch(() => props.list, (newVal) => { // 检定项表格 - const updataOld = $route.query.updataOld as string - const isFirstConfig = $route.query.isFirstConfig as string + const updataOld = $route.query.updataOld as string // 是否更新了检定项或者标准装置 + const isFirstConfig = $route.query.isFirstConfig as string // 是否第一次配置 + + console.log('是否更新了检定项或者标准装置', updataOld) + console.log('是否第一次配置', isFirstConfig) + if (newVal && Object.keys(newVal).length && updataOld !== 'true' && isFirstConfig !== 'true') { const topList = newVal.filter((item: any) => `${item.dataType}` === '1') listTop.value = topList.map((item: any) => { @@ -535,7 +539,6 @@ resolution: Number(item.resolution), // 分辨力 } }) - console.log('oooooooooooooooo', props.pageType) showListTop.value = !!listTop.value.length showListBottom.value = !!listBottom.value.length // if(props.pageType === 'detail' && (props.itemCategoryName === '电子式绝缘电阻表(数字式)' || props.itemCategoryName === '电子式绝缘电阻表(指针式)')) { @@ -583,7 +586,7 @@ stripe style="width: 100%;" max-height="300" - @selection-change="(e) => handleSelectionChange(e, 'top')" + @selection-change="(e: any) => handleSelectionChange(e, 'top')" > diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index fed29f3..784617a 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -67,7 +67,7 @@ labH: [{ required: true, message: '海口实验室名字不能为空', trigger: ['blur', 'change'] }], }) const getList = ref([]) // 检定项列表 -const getObject = ref < any > ({}) // 检定项表单 +const getObject = ref ({}) // 检定项表单 // ==========================第一套：多功能校准源标准装置数据================================== const appearanceFunctionCheck = ref(true) // 第一套:多功能校准源--外观及功能检查 const indicationError = ref(true) // 第一套:多功能校准源--示值误差 @@ -693,12 +693,7 @@ else { getList.value = response.measureItemDataElectricalSafetyList // 检定项表格 } - if (`${$route.query.isFirstConfig}` === 'true') { - getObject.value = { - ...response, - appearanceFunctionCheck: 1, - } - } + getObject.value = response // 检定项表单 } else if (form.value.belongStandardEquipment === '4') { // 第四套：0.02级活塞式压力计 getList.value = response.measureItemDataPistonGaugeList // 检定项表格 diff --git a/src/views/business/measure/item/dialog/confirmConfigDialog.vue b/src/views/business/measure/item/dialog/confirmConfigDialog.vue index 62f5d3f..7cdace0 100644 --- a/src/views/business/measure/item/dialog/confirmConfigDialog.vue +++ b/src/views/business/measure/item/dialog/confirmConfigDialog.vue @@ -110,6 +110,7 @@ isFirstConfig: isFirstConfig.value, } console.log('确实是不是第一次配置', isFirstConfig.value) + form.value.updataOld = false emits('confirm', params) dialogFormVisible.value = false diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index 6d6da54..b167be4 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -515,8 +515,12 @@ }, { immediate: true }) const $route = useRoute() watch(() => props.list, (newVal) => { // 检定项表格 - const updataOld = $route.query.updataOld as string - const isFirstConfig = $route.query.isFirstConfig as string + const updataOld = $route.query.updataOld as string // 是否更新了检定项或者标准装置 + const isFirstConfig = $route.query.isFirstConfig as string // 是否第一次配置 + + console.log('是否更新了检定项或者标准装置', updataOld) + console.log('是否第一次配置', isFirstConfig) + if (newVal && Object.keys(newVal).length && updataOld !== 'true' && isFirstConfig !== 'true') { const topList = newVal.filter((item: any) => `${item.dataType}` === '1') listTop.value = topList.map((item: any) => { @@ -535,7 +539,6 @@ resolution: Number(item.resolution), // 分辨力 } }) - console.log('oooooooooooooooo', props.pageType) showListTop.value = !!listTop.value.length showListBottom.value = !!listBottom.value.length // if(props.pageType === 'detail' && (props.itemCategoryName === '电子式绝缘电阻表(数字式)' || props.itemCategoryName === '电子式绝缘电阻表(指针式)')) { @@ -583,7 +586,7 @@ stripe style="width: 100%;" max-height="300" - @selection-change="(e) => handleSelectionChange(e, 'top')" + @selection-change="(e: any) => handleSelectionChange(e, 'top')" > diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index fed29f3..784617a 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -67,7 +67,7 @@ labH: [{ required: true, message: '海口实验室名字不能为空', trigger: ['blur', 'change'] }], }) const getList = ref([]) // 检定项列表 -const getObject = ref < any > ({}) // 检定项表单 +const getObject = ref ({}) // 检定项表单 // ==========================第一套：多功能校准源标准装置数据================================== const appearanceFunctionCheck = ref(true) // 第一套:多功能校准源--外观及功能检查 const indicationError = ref(true) // 第一套:多功能校准源--示值误差 @@ -693,12 +693,7 @@ else { getList.value = response.measureItemDataElectricalSafetyList // 检定项表格 } - if (`${$route.query.isFirstConfig}` === 'true') { - getObject.value = { - ...response, - appearanceFunctionCheck: 1, - } - } + getObject.value = response // 检定项表单 } else if (form.value.belongStandardEquipment === '4') { // 第四套：0.02级活塞式压力计 getList.value = response.measureItemDataPistonGaugeList // 检定项表格 diff --git a/src/views/business/measure/item/dialog/confirmConfigDialog.vue b/src/views/business/measure/item/dialog/confirmConfigDialog.vue index 62f5d3f..7cdace0 100644 --- a/src/views/business/measure/item/dialog/confirmConfigDialog.vue +++ b/src/views/business/measure/item/dialog/confirmConfigDialog.vue @@ -110,6 +110,7 @@ isFirstConfig: isFirstConfig.value, } console.log('确实是不是第一次配置', isFirstConfig.value) + form.value.updataOld = false emits('confirm', params) dialogFormVisible.value = false diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 9fc14d1..a78d08b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -1425,7 +1425,7 @@ - + props.list, (newVal) => { // 检定项表格 - const updataOld = $route.query.updataOld as string - const isFirstConfig = $route.query.isFirstConfig as string + const updataOld = $route.query.updataOld as string // 是否更新了检定项或者标准装置 + const isFirstConfig = $route.query.isFirstConfig as string // 是否第一次配置 + + console.log('是否更新了检定项或者标准装置', updataOld) + console.log('是否第一次配置', isFirstConfig) + if (newVal && Object.keys(newVal).length && updataOld !== 'true' && isFirstConfig !== 'true') { const topList = newVal.filter((item: any) => `${item.dataType}` === '1') listTop.value = topList.map((item: any) => { @@ -535,7 +539,6 @@ resolution: Number(item.resolution), // 分辨力 } }) - console.log('oooooooooooooooo', props.pageType) showListTop.value = !!listTop.value.length showListBottom.value = !!listBottom.value.length // if(props.pageType === 'detail' && (props.itemCategoryName === '电子式绝缘电阻表(数字式)' || props.itemCategoryName === '电子式绝缘电阻表(指针式)')) { @@ -583,7 +586,7 @@ stripe style="width: 100%;" max-height="300" - @selection-change="(e) => handleSelectionChange(e, 'top')" + @selection-change="(e: any) => handleSelectionChange(e, 'top')" > diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index fed29f3..784617a 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -67,7 +67,7 @@ labH: [{ required: true, message: '海口实验室名字不能为空', trigger: ['blur', 'change'] }], }) const getList = ref([]) // 检定项列表 -const getObject = ref < any > ({}) // 检定项表单 +const getObject = ref ({}) // 检定项表单 // ==========================第一套：多功能校准源标准装置数据================================== const appearanceFunctionCheck = ref(true) // 第一套:多功能校准源--外观及功能检查 const indicationError = ref(true) // 第一套:多功能校准源--示值误差 @@ -693,12 +693,7 @@ else { getList.value = response.measureItemDataElectricalSafetyList // 检定项表格 } - if (`${$route.query.isFirstConfig}` === 'true') { - getObject.value = { - ...response, - appearanceFunctionCheck: 1, - } - } + getObject.value = response // 检定项表单 } else if (form.value.belongStandardEquipment === '4') { // 第四套：0.02级活塞式压力计 getList.value = response.measureItemDataPistonGaugeList // 检定项表格 diff --git a/src/views/business/measure/item/dialog/confirmConfigDialog.vue b/src/views/business/measure/item/dialog/confirmConfigDialog.vue index 62f5d3f..7cdace0 100644 --- a/src/views/business/measure/item/dialog/confirmConfigDialog.vue +++ b/src/views/business/measure/item/dialog/confirmConfigDialog.vue @@ -110,6 +110,7 @@ isFirstConfig: isFirstConfig.value, } console.log('确实是不是第一次配置', isFirstConfig.value) + form.value.updataOld = false emits('confirm', params) dialogFormVisible.value = false diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 9fc14d1..a78d08b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -1425,7 +1425,7 @@ - + { const type = rule.field === 'humidity' ? '相对湿度' : '温度' @@ -129,6 +131,7 @@ meterIdentify: [{ required: true, message: '计量标识不能为空', trigger: ['blur', 'change'] }], labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }], groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }], + remark: [{ required: true, message: '测试结果不能为空', trigger: ['blur', 'change'] }], }) // -------------------------------------------字典---------------------------------------------+ @@ -642,7 +645,7 @@ - + --> + + + + + diff --git a/src/views/business/measure/item/components/third/templateDetail.vue b/src/views/business/measure/item/components/third/templateDetail.vue index 6d6da54..b167be4 100644 --- a/src/views/business/measure/item/components/third/templateDetail.vue +++ b/src/views/business/measure/item/components/third/templateDetail.vue @@ -515,8 +515,12 @@ }, { immediate: true }) const $route = useRoute() watch(() => props.list, (newVal) => { // 检定项表格 - const updataOld = $route.query.updataOld as string - const isFirstConfig = $route.query.isFirstConfig as string + const updataOld = $route.query.updataOld as string // 是否更新了检定项或者标准装置 + const isFirstConfig = $route.query.isFirstConfig as string // 是否第一次配置 + + console.log('是否更新了检定项或者标准装置', updataOld) + console.log('是否第一次配置', isFirstConfig) + if (newVal && Object.keys(newVal).length && updataOld !== 'true' && isFirstConfig !== 'true') { const topList = newVal.filter((item: any) => `${item.dataType}` === '1') listTop.value = topList.map((item: any) => { @@ -535,7 +539,6 @@ resolution: Number(item.resolution), // 分辨力 } }) - console.log('oooooooooooooooo', props.pageType) showListTop.value = !!listTop.value.length showListBottom.value = !!listBottom.value.length // if(props.pageType === 'detail' && (props.itemCategoryName === '电子式绝缘电阻表(数字式)' || props.itemCategoryName === '电子式绝缘电阻表(指针式)')) { @@ -583,7 +586,7 @@ stripe style="width: 100%;" max-height="300" - @selection-change="(e) => handleSelectionChange(e, 'top')" + @selection-change="(e: any) => handleSelectionChange(e, 'top')" > diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index fed29f3..784617a 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -67,7 +67,7 @@ labH: [{ required: true, message: '海口实验室名字不能为空', trigger: ['blur', 'change'] }], }) const getList = ref([]) // 检定项列表 -const getObject = ref < any > ({}) // 检定项表单 +const getObject = ref ({}) // 检定项表单 // ==========================第一套：多功能校准源标准装置数据================================== const appearanceFunctionCheck = ref(true) // 第一套:多功能校准源--外观及功能检查 const indicationError = ref(true) // 第一套:多功能校准源--示值误差 @@ -693,12 +693,7 @@ else { getList.value = response.measureItemDataElectricalSafetyList // 检定项表格 } - if (`${$route.query.isFirstConfig}` === 'true') { - getObject.value = { - ...response, - appearanceFunctionCheck: 1, - } - } + getObject.value = response // 检定项表单 } else if (form.value.belongStandardEquipment === '4') { // 第四套：0.02级活塞式压力计 getList.value = response.measureItemDataPistonGaugeList // 检定项表格 diff --git a/src/views/business/measure/item/dialog/confirmConfigDialog.vue b/src/views/business/measure/item/dialog/confirmConfigDialog.vue index 62f5d3f..7cdace0 100644 --- a/src/views/business/measure/item/dialog/confirmConfigDialog.vue +++ b/src/views/business/measure/item/dialog/confirmConfigDialog.vue @@ -110,6 +110,7 @@ isFirstConfig: isFirstConfig.value, } console.log('确实是不是第一次配置', isFirstConfig.value) + form.value.updataOld = false emits('confirm', params) dialogFormVisible.value = false diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue index 9fc14d1..a78d08b 100644 --- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue @@ -1425,7 +1425,7 @@ - + { const type = rule.field === 'humidity' ? '相对湿度' : '温度' @@ -129,6 +131,7 @@ meterIdentify: [{ required: true, message: '计量标识不能为空', trigger: ['blur', 'change'] }], labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }], groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }], + remark: [{ required: true, message: '测试结果不能为空', trigger: ['blur', 'change'] }], }) // -------------------------------------------字典---------------------------------------------+ @@ -642,7 +645,7 @@ - + --> + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/third/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/third/templateDetail.vue index 20888d2..dd38dca 100644 --- a/src/views/business/taskMeasure/measureData/components/third/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/third/templateDetail.vue @@ -603,7 +603,7 @@ --> - +