diff --git a/src/components.d.ts b/src/components.d.ts index 64cf608..6cd708a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -35,6 +35,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] FilePreviewUrl: typeof import('./components/filePreview/filePreviewUrl.vue')['default'] diff --git a/src/components.d.ts b/src/components.d.ts index 64cf608..6cd708a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -35,6 +35,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] FilePreviewUrl: typeof import('./components/filePreview/filePreviewUrl.vue')['default'] diff --git a/src/components/filePreview/excelOreview.vue b/src/components/filePreview/excelOreview.vue new file mode 100644 index 0000000..521bd7f --- /dev/null +++ b/src/components/filePreview/excelOreview.vue @@ -0,0 +1,60 @@ + + + + + + diff --git a/src/components.d.ts b/src/components.d.ts index 64cf608..6cd708a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -35,6 +35,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] FilePreviewUrl: typeof import('./components/filePreview/filePreviewUrl.vue')['default'] diff --git a/src/components/filePreview/excelOreview.vue b/src/components/filePreview/excelOreview.vue new file mode 100644 index 0000000..521bd7f --- /dev/null +++ b/src/components/filePreview/excelOreview.vue @@ -0,0 +1,60 @@ + + + + + + diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index 70654e8..b3bdb08 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -264,7 +264,7 @@ const clickConfirmSample = (val: Array) => { val.forEach((item: ISampleList) => { // 只添加列表里不存在的 - const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo) + const index = list.value.findIndex((i: ISampleList) => item.id === i.id) if (index === -1) { list.value.push({ ...item, diff --git a/src/components.d.ts b/src/components.d.ts index 64cf608..6cd708a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -35,6 +35,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] FilePreviewUrl: typeof import('./components/filePreview/filePreviewUrl.vue')['default'] diff --git a/src/components/filePreview/excelOreview.vue b/src/components/filePreview/excelOreview.vue new file mode 100644 index 0000000..521bd7f --- /dev/null +++ b/src/components/filePreview/excelOreview.vue @@ -0,0 +1,60 @@ + + + + + + diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index 70654e8..b3bdb08 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -264,7 +264,7 @@ const clickConfirmSample = (val: Array) => { val.forEach((item: ISampleList) => { // 只添加列表里不存在的 - const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo) + const index = list.value.findIndex((i: ISampleList) => item.id === i.id) if (index === -1) { list.value.push({ ...item, diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue index 47951d8..42d0d3e 100644 --- a/src/views/device/standingBook/components/templatePage.vue +++ b/src/views/device/standingBook/components/templatePage.vue @@ -461,7 +461,7 @@ 详情 - + 删除