From 0dfc8213f906ce386719a099511aa574458f14ae Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 7 May 2024 14:42:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=8A=E4=BC=A0=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=8A=A5=E5=91=8A=EF=BC=8C=E6=96=87=E4=BB=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Annex/src/Annex.vue | 9 ++++++++- src/components/Detail/src/Detail.vue | 2 ++ src/components/UploadFile/src/UploadFile.vue | 2 +- .../supplierdeliverInspectionDetail.data.ts | 1 + .../supplierdeliver/supplierdeliverRequestMain/index.vue | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index cb68ced7d..7d5f0e142 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -3,7 +3,7 @@
-
@@ -48,6 +48,13 @@ const props = defineProps({ type: Object, required: true }, + fileType:{ + type:Array, + required: false, + default: () => { + return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'] + } + }, showPreview: { type: Boolean, required: false diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index ad389ea97..9ce1534df 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -103,6 +103,7 @@ { annexList, hasSubDetail:item.hasSubDetail||false, subDetailTableData:item.subDetailTableData, + fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'], showPreview:item.showPreview||false, // 是否展示预览按钮 showDownload:item.showDownload||false, // 是否展示下载按钮 hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮 diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index 33de112d5..05ce5f239 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -56,7 +56,7 @@ const props = defineProps({ title: propTypes.string.def('文件上传'), updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL), upData: propTypes.object.def(), - fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg'] + fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg'] fileSize: propTypes.number.def(5), // 大小限制(MB) limit: propTypes.number.def(5), // 数量限制 autoUpload: propTypes.bool.def(true), // 自动上传 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts index e125b7976..34c890aa4 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts @@ -15,6 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive Date: Tue, 7 May 2024 14:59:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9vue=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../counter/counter.data.ts | 0 .../{basicDataManage => }/counter/index.vue | 0 .../dynamicRule/dynamicRule.data.ts | 0 .../dynamicRule/index.vue | 0 src/views/qms/inspectionJob/addForm.vue | 860 ++++++++++++++++++ .../{inspection => }/inspectionJob/detail.vue | 0 src/views/qms/inspectionJob/index.vue | 314 +++++++ .../inspectionJob/inspectionJobMain.data.ts | 0 .../inspectionRecord/addForm.vue | 0 .../inspectionRecord/detail.vue | 0 .../inspectionRecord/index.vue | 0 .../inspectionRecordMain.data.ts | 0 .../inspectionRequest/index.vue | 0 .../inspectionRequestMain.data.ts | 0 .../inspectionScheme/addForm.vue | 6 +- .../inspectionScheme/index.vue | 0 .../inspectionScheme/inspectionScheme.data.ts | 0 .../inspectionStage/index.vue | 0 .../inspectionStage/inspectionStage.data.ts | 0 .../inspectionTemplate/addForm.vue | 4 +- .../inspectionTemplate/index.vue | 0 .../inspectionTemplate.data.ts | 0 .../selectedProject/index.vue | 0 .../selectedProject/selectedProject.data.ts | 0 .../selectedSet/index.vue | 0 .../selectedSet/selectedSet.data.ts | 0 26 files changed, 1179 insertions(+), 5 deletions(-) rename src/views/qms/{basicDataManage => }/counter/counter.data.ts (100%) rename src/views/qms/{basicDataManage => }/counter/index.vue (100%) rename src/views/qms/{basicDataManage => }/dynamicRule/dynamicRule.data.ts (100%) rename src/views/qms/{basicDataManage => }/dynamicRule/index.vue (100%) create mode 100644 src/views/qms/inspectionJob/addForm.vue rename src/views/qms/{inspection => }/inspectionJob/detail.vue (100%) create mode 100644 src/views/qms/inspectionJob/index.vue rename src/views/qms/{inspection => }/inspectionJob/inspectionJobMain.data.ts (100%) rename src/views/qms/{inspection => }/inspectionRecord/addForm.vue (100%) rename src/views/qms/{inspection => }/inspectionRecord/detail.vue (100%) rename src/views/qms/{inspection => }/inspectionRecord/index.vue (100%) rename src/views/qms/{inspection => }/inspectionRecord/inspectionRecordMain.data.ts (100%) rename src/views/qms/{inspection => }/inspectionRequest/index.vue (100%) rename src/views/qms/{inspection => }/inspectionRequest/inspectionRequestMain.data.ts (100%) rename src/views/qms/{basicDataManage => }/inspectionScheme/addForm.vue (99%) rename src/views/qms/{basicDataManage => }/inspectionScheme/index.vue (100%) rename src/views/qms/{basicDataManage => }/inspectionScheme/inspectionScheme.data.ts (100%) rename src/views/qms/{basicDataManage => }/inspectionStage/index.vue (100%) rename src/views/qms/{basicDataManage => }/inspectionStage/inspectionStage.data.ts (100%) rename src/views/qms/{basicDataManage => }/inspectionTemplate/addForm.vue (99%) rename src/views/qms/{basicDataManage => }/inspectionTemplate/index.vue (100%) rename src/views/qms/{basicDataManage => }/inspectionTemplate/inspectionTemplate.data.ts (100%) rename src/views/qms/{basicDataManage => }/selectedProject/index.vue (100%) rename src/views/qms/{basicDataManage => }/selectedProject/selectedProject.data.ts (100%) rename src/views/qms/{basicDataManage => }/selectedSet/index.vue (100%) rename src/views/qms/{basicDataManage => }/selectedSet/selectedSet.data.ts (100%) diff --git a/src/views/qms/basicDataManage/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts similarity index 100% rename from src/views/qms/basicDataManage/counter/counter.data.ts rename to src/views/qms/counter/counter.data.ts diff --git a/src/views/qms/basicDataManage/counter/index.vue b/src/views/qms/counter/index.vue similarity index 100% rename from src/views/qms/basicDataManage/counter/index.vue rename to src/views/qms/counter/index.vue diff --git a/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts b/src/views/qms/dynamicRule/dynamicRule.data.ts similarity index 100% rename from src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts rename to src/views/qms/dynamicRule/dynamicRule.data.ts diff --git a/src/views/qms/basicDataManage/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue similarity index 100% rename from src/views/qms/basicDataManage/dynamicRule/index.vue rename to src/views/qms/dynamicRule/index.vue diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue new file mode 100644 index 000000000..8d3704a9a --- /dev/null +++ b/src/views/qms/inspectionJob/addForm.vue @@ -0,0 +1,860 @@ + + + + diff --git a/src/views/qms/inspection/inspectionJob/detail.vue b/src/views/qms/inspectionJob/detail.vue similarity index 100% rename from src/views/qms/inspection/inspectionJob/detail.vue rename to src/views/qms/inspectionJob/detail.vue diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue new file mode 100644 index 000000000..dcc7d81b3 --- /dev/null +++ b/src/views/qms/inspectionJob/index.vue @@ -0,0 +1,314 @@ + + + diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts similarity index 100% rename from src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts rename to src/views/qms/inspectionJob/inspectionJobMain.data.ts diff --git a/src/views/qms/inspection/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue similarity index 100% rename from src/views/qms/inspection/inspectionRecord/addForm.vue rename to src/views/qms/inspectionRecord/addForm.vue diff --git a/src/views/qms/inspection/inspectionRecord/detail.vue b/src/views/qms/inspectionRecord/detail.vue similarity index 100% rename from src/views/qms/inspection/inspectionRecord/detail.vue rename to src/views/qms/inspectionRecord/detail.vue diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue similarity index 100% rename from src/views/qms/inspection/inspectionRecord/index.vue rename to src/views/qms/inspectionRecord/index.vue diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts similarity index 100% rename from src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts rename to src/views/qms/inspectionRecord/inspectionRecordMain.data.ts diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue similarity index 100% rename from src/views/qms/inspection/inspectionRequest/index.vue rename to src/views/qms/inspectionRequest/index.vue diff --git a/src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts similarity index 100% rename from src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts rename to src/views/qms/inspectionRequest/inspectionRequestMain.data.ts diff --git a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue similarity index 99% rename from src/views/qms/basicDataManage/inspectionScheme/addForm.vue rename to src/views/qms/inspectionScheme/addForm.vue index e199200ac..540a2dc53 100644 --- a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -637,7 +637,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate' import { SearchTable } from '@/components/SearchTable' import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data' -import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data' +import { InspectionTemplateMain } from '@/views/qms/inspectionTemplate/inspectionTemplate.data' import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import * as ItemBasicApi from '@/api/wms/itembasic' @@ -645,9 +645,9 @@ import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程 import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法 import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法 import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则 -import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则 +import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集 -import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集 +import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集 import {validateTwoNum} from '@/utils/validator' const message = useMessage() // 消息弹窗 diff --git a/src/views/qms/basicDataManage/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue similarity index 100% rename from src/views/qms/basicDataManage/inspectionScheme/index.vue rename to src/views/qms/inspectionScheme/index.vue diff --git a/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts similarity index 100% rename from src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts rename to src/views/qms/inspectionScheme/inspectionScheme.data.ts diff --git a/src/views/qms/basicDataManage/inspectionStage/index.vue b/src/views/qms/inspectionStage/index.vue similarity index 100% rename from src/views/qms/basicDataManage/inspectionStage/index.vue rename to src/views/qms/inspectionStage/index.vue diff --git a/src/views/qms/basicDataManage/inspectionStage/inspectionStage.data.ts b/src/views/qms/inspectionStage/inspectionStage.data.ts similarity index 100% rename from src/views/qms/basicDataManage/inspectionStage/inspectionStage.data.ts rename to src/views/qms/inspectionStage/inspectionStage.data.ts diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue similarity index 99% rename from src/views/qms/basicDataManage/inspectionTemplate/addForm.vue rename to src/views/qms/inspectionTemplate/addForm.vue index aa72e0a49..3ac8f2979 100644 --- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue +++ b/src/views/qms/inspectionTemplate/addForm.vue @@ -431,9 +431,9 @@ import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程 import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法 import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法 import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则 -import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则 +import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集 -import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集 +import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集 import { validateInteger,validateTwoNum,validateMaxNumber5,validateNumSix } from '@/utils/validator' const message = useMessage() // 消息弹窗 diff --git a/src/views/qms/basicDataManage/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue similarity index 100% rename from src/views/qms/basicDataManage/inspectionTemplate/index.vue rename to src/views/qms/inspectionTemplate/index.vue diff --git a/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts similarity index 100% rename from src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts rename to src/views/qms/inspectionTemplate/inspectionTemplate.data.ts diff --git a/src/views/qms/basicDataManage/selectedProject/index.vue b/src/views/qms/selectedProject/index.vue similarity index 100% rename from src/views/qms/basicDataManage/selectedProject/index.vue rename to src/views/qms/selectedProject/index.vue diff --git a/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts b/src/views/qms/selectedProject/selectedProject.data.ts similarity index 100% rename from src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts rename to src/views/qms/selectedProject/selectedProject.data.ts diff --git a/src/views/qms/basicDataManage/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue similarity index 100% rename from src/views/qms/basicDataManage/selectedSet/index.vue rename to src/views/qms/selectedSet/index.vue diff --git a/src/views/qms/basicDataManage/selectedSet/selectedSet.data.ts b/src/views/qms/selectedSet/selectedSet.data.ts similarity index 100% rename from src/views/qms/basicDataManage/selectedSet/selectedSet.data.ts rename to src/views/qms/selectedSet/selectedSet.data.ts