diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index 1ca5e66..946084a 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -91,12 +91,12 @@ ]) // 表头 const columnsCalibration = ref([ - { text: '被测样品名称', value: 'sampleName', align: 'center', required: true }, + { text: '器具名称', value: 'sampleName', align: 'center', required: true }, { text: '型号规格', value: 'sampleModel', align: 'center', required: true }, { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true }, { text: '生产厂家', value: 'manufacturer', align: 'center', required: true }, { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true }, - { text: '证书要求', value: 'certificateRequire', align: 'center', required: false }, + { text: '校准要求', value: 'certificateRequire', align: 'center', required: false }, { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false }, // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false }, { text: '备注', value: 'remark', align: 'center', required: false }, diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index 1ca5e66..946084a 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -91,12 +91,12 @@ ]) // 表头 const columnsCalibration = ref([ - { text: '被测样品名称', value: 'sampleName', align: 'center', required: true }, + { text: '器具名称', value: 'sampleName', align: 'center', required: true }, { text: '型号规格', value: 'sampleModel', align: 'center', required: true }, { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true }, { text: '生产厂家', value: 'manufacturer', align: 'center', required: true }, { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true }, - { text: '证书要求', value: 'certificateRequire', align: 'center', required: false }, + { text: '校准要求', value: 'certificateRequire', align: 'center', required: false }, { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false }, // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false }, { text: '备注', value: 'remark', align: 'center', required: false }, diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue index ec1186d..88a4283 100644 --- a/src/views/finance/businessSettlement/list.vue +++ b/src/views/finance/businessSettlement/list.vue @@ -246,12 +246,10 @@ /** * js检查数组中的属性值不能重复 * @param list 要检查的数组 - * @param prop key + * @param property key */ function useArrayDataUnique(list: any, prop: string) { - return ( - new Set(list.map((item: { [key: string]: string | number }) => item[prop])).size === list.length - ) + return list.every((item: any) => item[prop] === list[0][prop]) } // 点击确定 @@ -261,7 +259,10 @@ return false } if (exportSettlementDocType.value === '4') { // 业务统计 - if (useArrayDataUnique(checkoutList.value, 'customerId')) { + console.log(checkoutList.value) + console.log(useArrayDataUnique(checkoutList.value, 'customerId')) + + if (checkoutList.value.length > 1 && !useArrayDataUnique(checkoutList.value, 'customerId')) { ElMessage.warning('只能导出同一委托方的数据') return false }