diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts index bbec9b0..15769ef 100644 --- a/src/api/equipment/standard/book.ts +++ b/src/api/equipment/standard/book.ts @@ -111,6 +111,16 @@ }) } +// 导出word/pdf/打印 +export function getStream(data: any) { + return request({ + url: '/standard/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} + // -----------------------------------------计量人员-------------------------------------------- // 删除 export function deletePerson(data: { ids: string[] }) { diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts index bbec9b0..15769ef 100644 --- a/src/api/equipment/standard/book.ts +++ b/src/api/equipment/standard/book.ts @@ -111,6 +111,16 @@ }) } +// 导出word/pdf/打印 +export function getStream(data: any) { + return request({ + url: '/standard/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} + // -----------------------------------------计量人员-------------------------------------------- // 删除 export function deletePerson(data: { ids: string[] }) { diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index f94f56c..10ac8e1 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -78,7 +78,7 @@ const rules = reactive({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts index bbec9b0..15769ef 100644 --- a/src/api/equipment/standard/book.ts +++ b/src/api/equipment/standard/book.ts @@ -111,6 +111,16 @@ }) } +// 导出word/pdf/打印 +export function getStream(data: any) { + return request({ + url: '/standard/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} + // -----------------------------------------计量人员-------------------------------------------- // 删除 export function deletePerson(data: { ids: string[] }) { diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index f94f56c..10ac8e1 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -78,7 +78,7 @@ const rules = reactive({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + ({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + ({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + ({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + ({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + { + loadingTable.value = true + // 审批状态 + const res = await getDictByCode('bizEquipmentStatusApprovalType') + res.data.forEach((item: { value: string; name: string }) => { + statusTypeMap.value[`${item.value}`] = item.name + }) +} // -----------------------------------------方法-------------------------------------------------- // 数据查询 function fetchData(isNowPage = false) { @@ -45,11 +56,12 @@ } listQuery.value.equipmentId = equipmentId.value // 设备编号 getStatusLog(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { createTime: string; statusType: string }) => { + list.value = response.data.map((item: { endTime: string; startTime: string; statusType: string }) => { return { ...item, - createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, - followLinkArr: [item.statusType], + startTime: item.startTime ? dayjs(item.startTime).format('YYYY-MM-DD') : item.startTime, + endTime: item.endTime ? dayjs(item.endTime).format('YYYY-MM-DD') : item.endTime, + followLinkArr: [statusTypeMap.value[item.statusType]], } }) total.value = parseInt(response.data.total) @@ -74,8 +86,10 @@ console.log('监听到props.equipmentId', newValue) equipmentId.value = newValue! }, { immediate: true }) -onMounted(async () => { - fetchData() +onMounted(() => { + getDict().then(() => { + fetchData() + }) }) diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts index bbec9b0..15769ef 100644 --- a/src/api/equipment/standard/book.ts +++ b/src/api/equipment/standard/book.ts @@ -111,6 +111,16 @@ }) } +// 导出word/pdf/打印 +export function getStream(data: any) { + return request({ + url: '/standard/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} + // -----------------------------------------计量人员-------------------------------------------- // 删除 export function deletePerson(data: { ids: string[] }) { diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index f94f56c..10ac8e1 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -78,7 +78,7 @@ const rules = reactive({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + { + loadingTable.value = true + // 审批状态 + const res = await getDictByCode('bizEquipmentStatusApprovalType') + res.data.forEach((item: { value: string; name: string }) => { + statusTypeMap.value[`${item.value}`] = item.name + }) +} // -----------------------------------------方法-------------------------------------------------- // 数据查询 function fetchData(isNowPage = false) { @@ -45,11 +56,12 @@ } listQuery.value.equipmentId = equipmentId.value // 设备编号 getStatusLog(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { createTime: string; statusType: string }) => { + list.value = response.data.map((item: { endTime: string; startTime: string; statusType: string }) => { return { ...item, - createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, - followLinkArr: [item.statusType], + startTime: item.startTime ? dayjs(item.startTime).format('YYYY-MM-DD') : item.startTime, + endTime: item.endTime ? dayjs(item.endTime).format('YYYY-MM-DD') : item.endTime, + followLinkArr: [statusTypeMap.value[item.statusType]], } }) total.value = parseInt(response.data.total) @@ -74,8 +86,10 @@ console.log('监听到props.equipmentId', newValue) equipmentId.value = newValue! }, { immediate: true }) -onMounted(async () => { - fetchData() +onMounted(() => { + getDict().then(() => { + fetchData() + }) }) diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue index 5bc39ec..ec69cec 100644 --- a/src/views/equipement/info/book/list.vue +++ b/src/views/equipement/info/book/list.vue @@ -45,7 +45,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -156,7 +156,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -263,7 +263,7 @@ measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束 meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称 model: listQuery.value.model, // 型号规格 - manufacture: listQuery.value.manufacture, // 生产厂家 + manufacturer: listQuery.value.manufacturer, // 生产厂家 // partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: listQuery.value.standardType, // 标准类型(字典code) traceCompany: listQuery.value.traceCompany, // 溯源单位 @@ -437,7 +437,7 @@ - + ({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + { + loadingTable.value = true + // 审批状态 + const res = await getDictByCode('bizEquipmentStatusApprovalType') + res.data.forEach((item: { value: string; name: string }) => { + statusTypeMap.value[`${item.value}`] = item.name + }) +} // -----------------------------------------方法-------------------------------------------------- // 数据查询 function fetchData(isNowPage = false) { @@ -45,11 +56,12 @@ } listQuery.value.equipmentId = equipmentId.value // 设备编号 getStatusLog(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { createTime: string; statusType: string }) => { + list.value = response.data.map((item: { endTime: string; startTime: string; statusType: string }) => { return { ...item, - createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, - followLinkArr: [item.statusType], + startTime: item.startTime ? dayjs(item.startTime).format('YYYY-MM-DD') : item.startTime, + endTime: item.endTime ? dayjs(item.endTime).format('YYYY-MM-DD') : item.endTime, + followLinkArr: [statusTypeMap.value[item.statusType]], } }) total.value = parseInt(response.data.total) @@ -74,8 +86,10 @@ console.log('监听到props.equipmentId', newValue) equipmentId.value = newValue! }, { immediate: true }) -onMounted(async () => { - fetchData() +onMounted(() => { + getDict().then(() => { + fetchData() + }) }) diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue index 5bc39ec..ec69cec 100644 --- a/src/views/equipement/info/book/list.vue +++ b/src/views/equipement/info/book/list.vue @@ -45,7 +45,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -156,7 +156,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -263,7 +263,7 @@ measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束 meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称 model: listQuery.value.model, // 型号规格 - manufacture: listQuery.value.manufacture, // 生产厂家 + manufacturer: listQuery.value.manufacturer, // 生产厂家 // partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: listQuery.value.standardType, // 标准类型(字典code) traceCompany: listQuery.value.traceCompany, // 溯源单位 @@ -437,7 +437,7 @@ - + { if (valid) { const loading = ElLoading.service({ @@ -300,6 +304,31 @@ }) } +// 不同的包装箱不能有同一个设备 +function checkArrayDataUnique() { + const compArr = [] as any + list.value.forEach((item) => { + if (item.equipmentList.length) { + item.equipmentList.forEach((i: any) => { + compArr.push({ + ...i, + packIndex: item.packIndex, // 包装箱索引 + packageNo: item.packageNo, // 包装箱号 + }) + }) + } + }) + for (let i = 0; i < compArr.length; i++) { + for (let j = 0; j < compArr.length; j++) { + if (i !== j && compArr[i].equipmentId === compArr[j].equipmentId) { + ElMessage.warning(`第${compArr[i].packIndex}个包装箱，箱号：【${compArr[i].packageNo}】 和 第${compArr[j].packIndex}个包装箱，箱号：【${compArr[j].packageNo}】不能同时含有设备 【${compArr[i].equipmentNo}-${compArr[i].equipmentName}-${compArr[i].model}】`) + return false + } + } + } + return true +} + onMounted(async () => { getDict().then(() => { // await fetchStaffList() diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts index bbec9b0..15769ef 100644 --- a/src/api/equipment/standard/book.ts +++ b/src/api/equipment/standard/book.ts @@ -111,6 +111,16 @@ }) } +// 导出word/pdf/打印 +export function getStream(data: any) { + return request({ + url: '/standard/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} + // -----------------------------------------计量人员-------------------------------------------- // 删除 export function deletePerson(data: { ids: string[] }) { diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index f94f56c..10ac8e1 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -78,7 +78,7 @@ const rules = reactive({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + { + loadingTable.value = true + // 审批状态 + const res = await getDictByCode('bizEquipmentStatusApprovalType') + res.data.forEach((item: { value: string; name: string }) => { + statusTypeMap.value[`${item.value}`] = item.name + }) +} // -----------------------------------------方法-------------------------------------------------- // 数据查询 function fetchData(isNowPage = false) { @@ -45,11 +56,12 @@ } listQuery.value.equipmentId = equipmentId.value // 设备编号 getStatusLog(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { createTime: string; statusType: string }) => { + list.value = response.data.map((item: { endTime: string; startTime: string; statusType: string }) => { return { ...item, - createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, - followLinkArr: [item.statusType], + startTime: item.startTime ? dayjs(item.startTime).format('YYYY-MM-DD') : item.startTime, + endTime: item.endTime ? dayjs(item.endTime).format('YYYY-MM-DD') : item.endTime, + followLinkArr: [statusTypeMap.value[item.statusType]], } }) total.value = parseInt(response.data.total) @@ -74,8 +86,10 @@ console.log('监听到props.equipmentId', newValue) equipmentId.value = newValue! }, { immediate: true }) -onMounted(async () => { - fetchData() +onMounted(() => { + getDict().then(() => { + fetchData() + }) }) diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue index 5bc39ec..ec69cec 100644 --- a/src/views/equipement/info/book/list.vue +++ b/src/views/equipement/info/book/list.vue @@ -45,7 +45,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -156,7 +156,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -263,7 +263,7 @@ measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束 meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称 model: listQuery.value.model, // 型号规格 - manufacture: listQuery.value.manufacture, // 生产厂家 + manufacturer: listQuery.value.manufacturer, // 生产厂家 // partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: listQuery.value.standardType, // 标准类型(字典code) traceCompany: listQuery.value.traceCompany, // 溯源单位 @@ -437,7 +437,7 @@ - + { if (valid) { const loading = ElLoading.service({ @@ -300,6 +304,31 @@ }) } +// 不同的包装箱不能有同一个设备 +function checkArrayDataUnique() { + const compArr = [] as any + list.value.forEach((item) => { + if (item.equipmentList.length) { + item.equipmentList.forEach((i: any) => { + compArr.push({ + ...i, + packIndex: item.packIndex, // 包装箱索引 + packageNo: item.packageNo, // 包装箱号 + }) + }) + } + }) + for (let i = 0; i < compArr.length; i++) { + for (let j = 0; j < compArr.length; j++) { + if (i !== j && compArr[i].equipmentId === compArr[j].equipmentId) { + ElMessage.warning(`第${compArr[i].packIndex}个包装箱，箱号：【${compArr[i].packageNo}】 和 第${compArr[j].packIndex}个包装箱，箱号：【${compArr[j].packageNo}】不能同时含有设备 【${compArr[i].equipmentNo}-${compArr[i].equipmentName}-${compArr[i].model}】`) + return false + } + } + } + return true +} + onMounted(async () => { getDict().then(() => { // await fetchStaffList() diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue index 3116997..9a45890 100644 --- a/src/views/equipement/resume/encasement/list.vue +++ b/src/views/equipement/resume/encasement/list.vue @@ -21,7 +21,7 @@ const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 // 表头 const columns = ref([ - { text: '装箱单编号', value: 'formNo', align: 'center', width: '160' }, + { text: '装箱单编号', value: 'formNo', align: 'center', width: '180' }, { text: '装箱单名称', value: 'formName', align: 'center' }, { text: '装箱日期', value: 'packingTime', align: 'center', width: '120' }, { text: '运输类型', value: 'transportTypeName', align: 'center' }, diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts index bbec9b0..15769ef 100644 --- a/src/api/equipment/standard/book.ts +++ b/src/api/equipment/standard/book.ts @@ -111,6 +111,16 @@ }) } +// 导出word/pdf/打印 +export function getStream(data: any) { + return request({ + url: '/standard/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} + // -----------------------------------------计量人员-------------------------------------------- // 删除 export function deletePerson(data: { ids: string[] }) { diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index f94f56c..10ac8e1 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -78,7 +78,7 @@ const rules = reactive({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + { + loadingTable.value = true + // 审批状态 + const res = await getDictByCode('bizEquipmentStatusApprovalType') + res.data.forEach((item: { value: string; name: string }) => { + statusTypeMap.value[`${item.value}`] = item.name + }) +} // -----------------------------------------方法-------------------------------------------------- // 数据查询 function fetchData(isNowPage = false) { @@ -45,11 +56,12 @@ } listQuery.value.equipmentId = equipmentId.value // 设备编号 getStatusLog(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { createTime: string; statusType: string }) => { + list.value = response.data.map((item: { endTime: string; startTime: string; statusType: string }) => { return { ...item, - createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, - followLinkArr: [item.statusType], + startTime: item.startTime ? dayjs(item.startTime).format('YYYY-MM-DD') : item.startTime, + endTime: item.endTime ? dayjs(item.endTime).format('YYYY-MM-DD') : item.endTime, + followLinkArr: [statusTypeMap.value[item.statusType]], } }) total.value = parseInt(response.data.total) @@ -74,8 +86,10 @@ console.log('监听到props.equipmentId', newValue) equipmentId.value = newValue! }, { immediate: true }) -onMounted(async () => { - fetchData() +onMounted(() => { + getDict().then(() => { + fetchData() + }) }) diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue index 5bc39ec..ec69cec 100644 --- a/src/views/equipement/info/book/list.vue +++ b/src/views/equipement/info/book/list.vue @@ -45,7 +45,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -156,7 +156,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -263,7 +263,7 @@ measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束 meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称 model: listQuery.value.model, // 型号规格 - manufacture: listQuery.value.manufacture, // 生产厂家 + manufacturer: listQuery.value.manufacturer, // 生产厂家 // partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: listQuery.value.standardType, // 标准类型(字典code) traceCompany: listQuery.value.traceCompany, // 溯源单位 @@ -437,7 +437,7 @@ - + { if (valid) { const loading = ElLoading.service({ @@ -300,6 +304,31 @@ }) } +// 不同的包装箱不能有同一个设备 +function checkArrayDataUnique() { + const compArr = [] as any + list.value.forEach((item) => { + if (item.equipmentList.length) { + item.equipmentList.forEach((i: any) => { + compArr.push({ + ...i, + packIndex: item.packIndex, // 包装箱索引 + packageNo: item.packageNo, // 包装箱号 + }) + }) + } + }) + for (let i = 0; i < compArr.length; i++) { + for (let j = 0; j < compArr.length; j++) { + if (i !== j && compArr[i].equipmentId === compArr[j].equipmentId) { + ElMessage.warning(`第${compArr[i].packIndex}个包装箱，箱号：【${compArr[i].packageNo}】 和 第${compArr[j].packIndex}个包装箱，箱号：【${compArr[j].packageNo}】不能同时含有设备 【${compArr[i].equipmentNo}-${compArr[i].equipmentName}-${compArr[i].model}】`) + return false + } + } + } + return true +} + onMounted(async () => { getDict().then(() => { // await fetchStaffList() diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue index 3116997..9a45890 100644 --- a/src/views/equipement/resume/encasement/list.vue +++ b/src/views/equipement/resume/encasement/list.vue @@ -21,7 +21,7 @@ const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 // 表头 const columns = ref([ - { text: '装箱单编号', value: 'formNo', align: 'center', width: '160' }, + { text: '装箱单编号', value: 'formNo', align: 'center', width: '180' }, { text: '装箱单名称', value: 'formName', align: 'center' }, { text: '装箱日期', value: 'packingTime', align: 'center', width: '120' }, { text: '运输类型', value: 'transportTypeName', align: 'center' }, diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue index 3e7f663..21637ab 100644 --- a/src/views/equipement/resume/unpack/list.vue +++ b/src/views/equipement/resume/unpack/list.vue @@ -47,6 +47,7 @@ { text: '记录表名称', value: 'logName', align: 'center' }, { text: '设备名称', value: 'equipmentName', align: 'center' }, { text: '型号', value: 'model', align: 'center' }, + { text: '出厂编号', value: 'manufactureNo', align: 'center' }, { text: '生产厂家', value: 'manufacturer', align: 'center' }, { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' }, { text: '验收人', value: 'createUserName', align: 'center' }, diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts index bbec9b0..15769ef 100644 --- a/src/api/equipment/standard/book.ts +++ b/src/api/equipment/standard/book.ts @@ -111,6 +111,16 @@ }) } +// 导出word/pdf/打印 +export function getStream(data: any) { + return request({ + url: '/standard/exportFile', + method: 'post', + responseType: 'blob', + data, + }) +} + // -----------------------------------------计量人员-------------------------------------------- // 删除 export function deletePerson(data: { ids: string[] }) { diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index f94f56c..10ac8e1 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -78,7 +78,7 @@ const rules = reactive({ // 表单验证规则 deliverer: [{ required: true, message: '送检人不能为空', trigger: 'blur' }], customerName: [{ required: true, message: '委托方不能为空', trigger: ['change', 'blur'] }], - customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], + // customerPhone: [{ required: true, message: '电话不能为空', trigger: 'change' }], planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }], requireOverTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }], isUrgent: [{ required: true, message: '是否加急不能为空', trigger: 'change' }], diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue index a18de13..2cd7d12 100644 --- a/src/views/business/manager/sendReceive/components/basic.vue +++ b/src/views/business/manager/sendReceive/components/basic.vue @@ -223,41 +223,33 @@ - - + - - + /> - - + - - + /> + + + + + @@ -283,16 +275,7 @@ /> - - - - - + - - - - - + + - - + + + + + + + + > + + @@ -377,6 +372,25 @@ + + + + + + + @@ -392,7 +406,7 @@ - + @@ -451,24 +465,6 @@ - - - - - - - @@ -505,38 +501,43 @@ + + + + + + + + + - + + + - - - - + - - - - - - - - - - - + --> @@ -547,6 +548,25 @@ + + + + + + + + { + loadingTable.value = true + // 审批状态 + const res = await getDictByCode('bizEquipmentStatusApprovalType') + res.data.forEach((item: { value: string; name: string }) => { + statusTypeMap.value[`${item.value}`] = item.name + }) +} // -----------------------------------------方法-------------------------------------------------- // 数据查询 function fetchData(isNowPage = false) { @@ -45,11 +56,12 @@ } listQuery.value.equipmentId = equipmentId.value // 设备编号 getStatusLog(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { createTime: string; statusType: string }) => { + list.value = response.data.map((item: { endTime: string; startTime: string; statusType: string }) => { return { ...item, - createTime: item.createTime ? dayjs(item.createTime).format('YYYY-MM-DD') : item.createTime, - followLinkArr: [item.statusType], + startTime: item.startTime ? dayjs(item.startTime).format('YYYY-MM-DD') : item.startTime, + endTime: item.endTime ? dayjs(item.endTime).format('YYYY-MM-DD') : item.endTime, + followLinkArr: [statusTypeMap.value[item.statusType]], } }) total.value = parseInt(response.data.total) @@ -74,8 +86,10 @@ console.log('监听到props.equipmentId', newValue) equipmentId.value = newValue! }, { immediate: true }) -onMounted(async () => { - fetchData() +onMounted(() => { + getDict().then(() => { + fetchData() + }) }) diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue index 5bc39ec..ec69cec 100644 --- a/src/views/equipement/info/book/list.vue +++ b/src/views/equipement/info/book/list.vue @@ -45,7 +45,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -156,7 +156,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -263,7 +263,7 @@ measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束 meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称 model: listQuery.value.model, // 型号规格 - manufacture: listQuery.value.manufacture, // 生产厂家 + manufacturer: listQuery.value.manufacturer, // 生产厂家 // partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: listQuery.value.standardType, // 标准类型(字典code) traceCompany: listQuery.value.traceCompany, // 溯源单位 @@ -437,7 +437,7 @@ - + { if (valid) { const loading = ElLoading.service({ @@ -300,6 +304,31 @@ }) } +// 不同的包装箱不能有同一个设备 +function checkArrayDataUnique() { + const compArr = [] as any + list.value.forEach((item) => { + if (item.equipmentList.length) { + item.equipmentList.forEach((i: any) => { + compArr.push({ + ...i, + packIndex: item.packIndex, // 包装箱索引 + packageNo: item.packageNo, // 包装箱号 + }) + }) + } + }) + for (let i = 0; i < compArr.length; i++) { + for (let j = 0; j < compArr.length; j++) { + if (i !== j && compArr[i].equipmentId === compArr[j].equipmentId) { + ElMessage.warning(`第${compArr[i].packIndex}个包装箱，箱号：【${compArr[i].packageNo}】 和 第${compArr[j].packIndex}个包装箱，箱号：【${compArr[j].packageNo}】不能同时含有设备 【${compArr[i].equipmentNo}-${compArr[i].equipmentName}-${compArr[i].model}】`) + return false + } + } + } + return true +} + onMounted(async () => { getDict().then(() => { // await fetchStaffList() diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue index 3116997..9a45890 100644 --- a/src/views/equipement/resume/encasement/list.vue +++ b/src/views/equipement/resume/encasement/list.vue @@ -21,7 +21,7 @@ const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 // 表头 const columns = ref([ - { text: '装箱单编号', value: 'formNo', align: 'center', width: '160' }, + { text: '装箱单编号', value: 'formNo', align: 'center', width: '180' }, { text: '装箱单名称', value: 'formName', align: 'center' }, { text: '装箱日期', value: 'packingTime', align: 'center', width: '120' }, { text: '运输类型', value: 'transportTypeName', align: 'center' }, diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue index 3e7f663..21637ab 100644 --- a/src/views/equipement/resume/unpack/list.vue +++ b/src/views/equipement/resume/unpack/list.vue @@ -47,6 +47,7 @@ { text: '记录表名称', value: 'logName', align: 'center' }, { text: '设备名称', value: 'equipmentName', align: 'center' }, { text: '型号', value: 'model', align: 'center' }, + { text: '出厂编号', value: 'manufactureNo', align: 'center' }, { text: '生产厂家', value: 'manufacturer', align: 'center' }, { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' }, { text: '验收人', value: 'createUserName', align: 'center' }, diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue index 79b9d7e..1112dfc 100644 --- a/src/views/equipement/standard/book/list.vue +++ b/src/views/equipement/standard/book/list.vue @@ -2,7 +2,7 @@ diff --git a/src/views/equipement/info/book/list.vue b/src/views/equipement/info/book/list.vue index 5bc39ec..ec69cec 100644 --- a/src/views/equipement/info/book/list.vue +++ b/src/views/equipement/info/book/list.vue @@ -45,7 +45,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -156,7 +156,7 @@ measureValidDateEnd: '', // 检定有效期结束 meterStandardName: '', // 所属标准装置名称 model: '', // 型号规格 - manufacture: '', // 生产厂家 + manufacturer: '', // 生产厂家 // partType: '', // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: '', // 标准类型(字典code) traceCompany: '', // 溯源单位 @@ -263,7 +263,7 @@ measureValidDateEnd: listQuery.value.measureValidDateEnd, // 检定有效期结束 meterStandardName: listQuery.value.meterStandardName, // 所属标准装置名称 model: listQuery.value.model, // 型号规格 - manufacture: listQuery.value.manufacture, // 生产厂家 + manufacturer: listQuery.value.manufacturer, // 生产厂家 // partType: listQuery.value., // 参照标准、工作标准和关键测量设备表功能该参数传1（同时approvalStatus参数传0），其余情况不用传该参数 standardType: listQuery.value.standardType, // 标准类型(字典code) traceCompany: listQuery.value.traceCompany, // 溯源单位 @@ -437,7 +437,7 @@ - + { if (valid) { const loading = ElLoading.service({ @@ -300,6 +304,31 @@ }) } +// 不同的包装箱不能有同一个设备 +function checkArrayDataUnique() { + const compArr = [] as any + list.value.forEach((item) => { + if (item.equipmentList.length) { + item.equipmentList.forEach((i: any) => { + compArr.push({ + ...i, + packIndex: item.packIndex, // 包装箱索引 + packageNo: item.packageNo, // 包装箱号 + }) + }) + } + }) + for (let i = 0; i < compArr.length; i++) { + for (let j = 0; j < compArr.length; j++) { + if (i !== j && compArr[i].equipmentId === compArr[j].equipmentId) { + ElMessage.warning(`第${compArr[i].packIndex}个包装箱，箱号：【${compArr[i].packageNo}】 和 第${compArr[j].packIndex}个包装箱，箱号：【${compArr[j].packageNo}】不能同时含有设备 【${compArr[i].equipmentNo}-${compArr[i].equipmentName}-${compArr[i].model}】`) + return false + } + } + } + return true +} + onMounted(async () => { getDict().then(() => { // await fetchStaffList() diff --git a/src/views/equipement/resume/encasement/list.vue b/src/views/equipement/resume/encasement/list.vue index 3116997..9a45890 100644 --- a/src/views/equipement/resume/encasement/list.vue +++ b/src/views/equipement/resume/encasement/list.vue @@ -21,7 +21,7 @@ const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 // 表头 const columns = ref([ - { text: '装箱单编号', value: 'formNo', align: 'center', width: '160' }, + { text: '装箱单编号', value: 'formNo', align: 'center', width: '180' }, { text: '装箱单名称', value: 'formName', align: 'center' }, { text: '装箱日期', value: 'packingTime', align: 'center', width: '120' }, { text: '运输类型', value: 'transportTypeName', align: 'center' }, diff --git a/src/views/equipement/resume/unpack/list.vue b/src/views/equipement/resume/unpack/list.vue index 3e7f663..21637ab 100644 --- a/src/views/equipement/resume/unpack/list.vue +++ b/src/views/equipement/resume/unpack/list.vue @@ -47,6 +47,7 @@ { text: '记录表名称', value: 'logName', align: 'center' }, { text: '设备名称', value: 'equipmentName', align: 'center' }, { text: '型号', value: 'model', align: 'center' }, + { text: '出厂编号', value: 'manufactureNo', align: 'center' }, { text: '生产厂家', value: 'manufacturer', align: 'center' }, { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' }, { text: '验收人', value: 'createUserName', align: 'center' }, diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue index 79b9d7e..1112dfc 100644 --- a/src/views/equipement/standard/book/list.vue +++ b/src/views/equipement/standard/book/list.vue @@ -2,7 +2,7 @@