diff --git a/package.json b/package.json index bb1a572..b8ad7e3 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "splitpanes": "4.0.4", "vue": "3.5.16", "vue-cropper": "1.1.1", + "vue-pdf-embed": "^2.1.3", "vue-router": "4.5.1", "vuedraggable": "4.1.0" }, diff --git a/src/components/FileUpload/PdfPreview.vue b/src/components/FileUpload/PdfPreview.vue new file mode 100644 index 0000000..d6c2edf --- /dev/null +++ b/src/components/FileUpload/PdfPreview.vue @@ -0,0 +1,72 @@ + + + + + + 上一页 + 第 {{ currentPage }} 页 / 共 {{ pageCount }} 页 + 下一页 + + + + + + + + \ No newline at end of file diff --git a/src/components/FileUpload/multiFileUpload.vue b/src/components/FileUpload/multiFileUpload.vue new file mode 100644 index 0000000..4ebf1f6 --- /dev/null +++ b/src/components/FileUpload/multiFileUpload.vue @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index e2e7e49..346a7dd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, // 超时 - timeout: 10000 + timeout: 300000 }) // request拦截器 diff --git a/src/views/supplier/supplierForm.vue b/src/views/supplier/supplierForm.vue index 9cbd34b..47951a9 100644 --- a/src/views/supplier/supplierForm.vue +++ b/src/views/supplier/supplierForm.vue @@ -13,8 +13,8 @@ - + @@ -103,7 +103,8 @@ - + @@ -280,7 +281,7 @@ - @@ -298,108 +299,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -410,19 +324,13 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index a77f240..b5d6ab8 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -107,6 +107,14 @@ + + + + 否 + 是 + + + @@ -181,7 +189,8 @@ function reset() { leader: undefined, phone: undefined, email: undefined, - status: "0" + status: "0", + businessFlag: 0 } proxy.resetForm("deptRef") }