diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..e447f41
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+ return request({
+ url: `${prefix}/supplier/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+ return request({
+ url: `${prefix}/supplier/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+ return request({
+ url: `/sys/area/list?pid=${pid}`,
+ method: 'get',
+ })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+ return request({
+ url: '/meter/supplier/submit',
+ method: 'post',
+ data,
+ })
+}
+// 保存数据
+export function sourceSave(data: object) {
+ return request({
+ url: `${prefix}/supplier/save`,
+ method: 'post',
+ data,
+ })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+ return request({
+ url: `${prefix}/supplier/update`,
+ method: 'post',
+ data,
+ })
+}
+
+// 导出列表
+export function exportSourceList(data: { businessContent: string; supplierName: string; supplierNo: string; ids: string[] }) {
+ return request({
+ url: `${prefix}/supplier/listExport`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..e447f41
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+ return request({
+ url: `${prefix}/supplier/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+ return request({
+ url: `${prefix}/supplier/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+ return request({
+ url: `/sys/area/list?pid=${pid}`,
+ method: 'get',
+ })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+ return request({
+ url: '/meter/supplier/submit',
+ method: 'post',
+ data,
+ })
+}
+// 保存数据
+export function sourceSave(data: object) {
+ return request({
+ url: `${prefix}/supplier/save`,
+ method: 'post',
+ data,
+ })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+ return request({
+ url: `${prefix}/supplier/update`,
+ method: 'post',
+ data,
+ })
+}
+
+// 导出列表
+export function exportSourceList(data: { businessContent: string; supplierName: string; supplierNo: string; ids: string[] }) {
+ return request({
+ url: `${prefix}/supplier/listExport`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
- return request({
- url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
- return request({
- url: `${prefix}/supplier/delete`,
- method: 'post',
- data,
- })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
- return request({
- url: `${prefix}/supplier/detail`,
- method: 'post',
- data,
- })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
- return request({
- url: `/sys/area/list?pid=${pid}`,
- method: 'get',
- })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
- return request({
- url: `${prefix}/supplier/add`,
- method: 'post',
- data,
- })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
- return request({
- url: `${prefix}/supplier/update`,
- method: 'post',
- data,
- })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
- return request({
- url: `${prefix}/supplier/listExport`,
- method: 'post',
- responseType: 'blob',
- data,
- })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
- return request({
- url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..e447f41
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+ return request({
+ url: `${prefix}/supplier/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+ return request({
+ url: `${prefix}/supplier/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+ return request({
+ url: `/sys/area/list?pid=${pid}`,
+ method: 'get',
+ })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+ return request({
+ url: '/meter/supplier/submit',
+ method: 'post',
+ data,
+ })
+}
+// 保存数据
+export function sourceSave(data: object) {
+ return request({
+ url: `${prefix}/supplier/save`,
+ method: 'post',
+ data,
+ })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+ return request({
+ url: `${prefix}/supplier/update`,
+ method: 'post',
+ data,
+ })
+}
+
+// 导出列表
+export function exportSourceList(data: { businessContent: string; supplierName: string; supplierNo: string; ids: string[] }) {
+ return request({
+ url: `${prefix}/supplier/listExport`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
- return request({
- url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
- return request({
- url: `${prefix}/supplier/delete`,
- method: 'post',
- data,
- })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
- return request({
- url: `${prefix}/supplier/detail`,
- method: 'post',
- data,
- })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
- return request({
- url: `/sys/area/list?pid=${pid}`,
- method: 'get',
- })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
- return request({
- url: `${prefix}/supplier/add`,
- method: 'post',
- data,
- })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
- return request({
- url: `${prefix}/supplier/update`,
- method: 'post',
- data,
- })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
- return request({
- url: `${prefix}/supplier/listExport`,
- method: 'post',
- responseType: 'blob',
- data,
- })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
- return request({
- url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 0ea0555..8960267 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -122,3 +122,17 @@
.full-width-input {
width: 100% !important;
}
+
+// 详情页面输入框样式调整, 背景白,字体加深,悬停显示输入字符
+.detail-input.is-disabled .el-input__wrapper {
+ background-color: #fff;
+}
+
+.detail-input.is-disabled .el-input__inner {
+ color: var(--el-text-color-regular);
+ -webkit-text-fill-color: var(--el-text-color-regular);
+
+ &:hover {
+ cursor: text;
+ }
+}
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..e447f41
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+ return request({
+ url: `${prefix}/supplier/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+ return request({
+ url: `${prefix}/supplier/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+ return request({
+ url: `/sys/area/list?pid=${pid}`,
+ method: 'get',
+ })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+ return request({
+ url: '/meter/supplier/submit',
+ method: 'post',
+ data,
+ })
+}
+// 保存数据
+export function sourceSave(data: object) {
+ return request({
+ url: `${prefix}/supplier/save`,
+ method: 'post',
+ data,
+ })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+ return request({
+ url: `${prefix}/supplier/update`,
+ method: 'post',
+ data,
+ })
+}
+
+// 导出列表
+export function exportSourceList(data: { businessContent: string; supplierName: string; supplierNo: string; ids: string[] }) {
+ return request({
+ url: `${prefix}/supplier/listExport`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
- return request({
- url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
- return request({
- url: `${prefix}/supplier/delete`,
- method: 'post',
- data,
- })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
- return request({
- url: `${prefix}/supplier/detail`,
- method: 'post',
- data,
- })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
- return request({
- url: `/sys/area/list?pid=${pid}`,
- method: 'get',
- })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
- return request({
- url: `${prefix}/supplier/add`,
- method: 'post',
- data,
- })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
- return request({
- url: `${prefix}/supplier/update`,
- method: 'post',
- data,
- })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
- return request({
- url: `${prefix}/supplier/listExport`,
- method: 'post',
- responseType: 'blob',
- data,
- })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
- return request({
- url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 0ea0555..8960267 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -122,3 +122,17 @@
.full-width-input {
width: 100% !important;
}
+
+// 详情页面输入框样式调整, 背景白,字体加深,悬停显示输入字符
+.detail-input.is-disabled .el-input__wrapper {
+ background-color: #fff;
+}
+
+.detail-input.is-disabled .el-input__inner {
+ color: var(--el-text-color-regular);
+ -webkit-text-fill-color: var(--el-text-color-regular);
+
+ &:hover {
+ cursor: text;
+ }
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
- SelectTree: typeof import('./components/SelectTree/index.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..e447f41
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+ return request({
+ url: `${prefix}/supplier/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+ return request({
+ url: `${prefix}/supplier/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+ return request({
+ url: `/sys/area/list?pid=${pid}`,
+ method: 'get',
+ })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+ return request({
+ url: '/meter/supplier/submit',
+ method: 'post',
+ data,
+ })
+}
+// 保存数据
+export function sourceSave(data: object) {
+ return request({
+ url: `${prefix}/supplier/save`,
+ method: 'post',
+ data,
+ })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+ return request({
+ url: `${prefix}/supplier/update`,
+ method: 'post',
+ data,
+ })
+}
+
+// 导出列表
+export function exportSourceList(data: { businessContent: string; supplierName: string; supplierNo: string; ids: string[] }) {
+ return request({
+ url: `${prefix}/supplier/listExport`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
- return request({
- url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
- return request({
- url: `${prefix}/supplier/delete`,
- method: 'post',
- data,
- })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
- return request({
- url: `${prefix}/supplier/detail`,
- method: 'post',
- data,
- })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
- return request({
- url: `/sys/area/list?pid=${pid}`,
- method: 'get',
- })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
- return request({
- url: `${prefix}/supplier/add`,
- method: 'post',
- data,
- })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
- return request({
- url: `${prefix}/supplier/update`,
- method: 'post',
- data,
- })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
- return request({
- url: `${prefix}/supplier/listExport`,
- method: 'post',
- responseType: 'blob',
- data,
- })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
- return request({
- url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 0ea0555..8960267 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -122,3 +122,17 @@
.full-width-input {
width: 100% !important;
}
+
+// 详情页面输入框样式调整, 背景白,字体加深,悬停显示输入字符
+.detail-input.is-disabled .el-input__wrapper {
+ background-color: #fff;
+}
+
+.detail-input.is-disabled .el-input__inner {
+ color: var(--el-text-color-regular);
+ -webkit-text-fill-color: var(--el-text-color-regular);
+
+ &:hover {
+ cursor: text;
+ }
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
- SelectTree: typeof import('./components/SelectTree/index.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/QrDialog/index.vue b/src/components/QrDialog/index.vue
index 317927e..defb488 100644
--- a/src/components/QrDialog/index.vue
+++ b/src/components/QrDialog/index.vue
@@ -128,6 +128,9 @@
font-weight: bold;
font-size: 30px;
margin-top: 60px;
+ display: block;
+ height: auto;
+ overflow: hidden;
.canvas {
width: 50vw;
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..e447f41
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+ return request({
+ url: `${prefix}/supplier/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+ return request({
+ url: `${prefix}/supplier/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+ return request({
+ url: `/sys/area/list?pid=${pid}`,
+ method: 'get',
+ })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+ return request({
+ url: '/meter/supplier/submit',
+ method: 'post',
+ data,
+ })
+}
+// 保存数据
+export function sourceSave(data: object) {
+ return request({
+ url: `${prefix}/supplier/save`,
+ method: 'post',
+ data,
+ })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+ return request({
+ url: `${prefix}/supplier/update`,
+ method: 'post',
+ data,
+ })
+}
+
+// 导出列表
+export function exportSourceList(data: { businessContent: string; supplierName: string; supplierNo: string; ids: string[] }) {
+ return request({
+ url: `${prefix}/supplier/listExport`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
- return request({
- url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
- return request({
- url: `${prefix}/supplier/delete`,
- method: 'post',
- data,
- })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
- return request({
- url: `${prefix}/supplier/detail`,
- method: 'post',
- data,
- })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
- return request({
- url: `/sys/area/list?pid=${pid}`,
- method: 'get',
- })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
- return request({
- url: `${prefix}/supplier/add`,
- method: 'post',
- data,
- })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
- return request({
- url: `${prefix}/supplier/update`,
- method: 'post',
- data,
- })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
- return request({
- url: `${prefix}/supplier/listExport`,
- method: 'post',
- responseType: 'blob',
- data,
- })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
- return request({
- url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 0ea0555..8960267 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -122,3 +122,17 @@
.full-width-input {
width: 100% !important;
}
+
+// 详情页面输入框样式调整, 背景白,字体加深,悬停显示输入字符
+.detail-input.is-disabled .el-input__wrapper {
+ background-color: #fff;
+}
+
+.detail-input.is-disabled .el-input__inner {
+ color: var(--el-text-color-regular);
+ -webkit-text-fill-color: var(--el-text-color-regular);
+
+ &:hover {
+ cursor: text;
+ }
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
- SelectTree: typeof import('./components/SelectTree/index.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/QrDialog/index.vue b/src/components/QrDialog/index.vue
index 317927e..defb488 100644
--- a/src/components/QrDialog/index.vue
+++ b/src/components/QrDialog/index.vue
@@ -128,6 +128,9 @@
font-weight: bold;
font-size: 30px;
margin-top: 60px;
+ display: block;
+ height: auto;
+ overflow: hidden;
.canvas {
width: 50vw;
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
{
path: 'approve/:type/:id?',
name: 'ListpageSourceAdd',
- component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+ component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
meta: {
title: '溯源供方审批',
icon: 'ep:key',
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..e447f41
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+ return request({
+ url: `${prefix}/supplier/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+ return request({
+ url: `${prefix}/supplier/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+ return request({
+ url: `/sys/area/list?pid=${pid}`,
+ method: 'get',
+ })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+ return request({
+ url: '/meter/supplier/submit',
+ method: 'post',
+ data,
+ })
+}
+// 保存数据
+export function sourceSave(data: object) {
+ return request({
+ url: `${prefix}/supplier/save`,
+ method: 'post',
+ data,
+ })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+ return request({
+ url: `${prefix}/supplier/update`,
+ method: 'post',
+ data,
+ })
+}
+
+// 导出列表
+export function exportSourceList(data: { businessContent: string; supplierName: string; supplierNo: string; ids: string[] }) {
+ return request({
+ url: `${prefix}/supplier/listExport`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
- return request({
- url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
- return request({
- url: `${prefix}/supplier/delete`,
- method: 'post',
- data,
- })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
- return request({
- url: `${prefix}/supplier/detail`,
- method: 'post',
- data,
- })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
- return request({
- url: `/sys/area/list?pid=${pid}`,
- method: 'get',
- })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
- return request({
- url: `${prefix}/supplier/add`,
- method: 'post',
- data,
- })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
- return request({
- url: `${prefix}/supplier/update`,
- method: 'post',
- data,
- })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
- return request({
- url: `${prefix}/supplier/listExport`,
- method: 'post',
- responseType: 'blob',
- data,
- })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
- return request({
- url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 0ea0555..8960267 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -122,3 +122,17 @@
.full-width-input {
width: 100% !important;
}
+
+// 详情页面输入框样式调整, 背景白,字体加深,悬停显示输入字符
+.detail-input.is-disabled .el-input__wrapper {
+ background-color: #fff;
+}
+
+.detail-input.is-disabled .el-input__inner {
+ color: var(--el-text-color-regular);
+ -webkit-text-fill-color: var(--el-text-color-regular);
+
+ &:hover {
+ cursor: text;
+ }
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
- SelectTree: typeof import('./components/SelectTree/index.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/QrDialog/index.vue b/src/components/QrDialog/index.vue
index 317927e..defb488 100644
--- a/src/components/QrDialog/index.vue
+++ b/src/components/QrDialog/index.vue
@@ -128,6 +128,9 @@
font-weight: bold;
font-size: 30px;
margin-top: 60px;
+ display: block;
+ height: auto;
+ overflow: hidden;
.canvas {
width: 50vw;
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
{
path: 'approve/:type/:id?',
name: 'ListpageSourceAdd',
- component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+ component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
meta: {
title: '溯源供方审批',
icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
state: () => ({
allDeptList: [] as DeptTreeNode[], // 所有部门列表
companyList: [] as DeptTreeNode[], // 公司列表
+ approvalStatusList: {
+ 全部: '0',
+ 草稿箱: '1',
+ 待审批: '2',
+ 审批中: '3',
+ 已通过: '4',
+ 未通过: '5',
+ 已取消: '6',
+ }, // 审批状态
}),
getters: {
getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
getCompanyList: (state) => {
return state.companyList
},
+ getApprovalStatus: (state) => {
+ return state.approvalStatusList
+ },
},
actions: {
setAllDeptList(list: DeptTreeNode[]) {
diff --git a/package.json b/package.json
index 3a8ab01..f09aaa1 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.23",
+ "print-js": "^1.6.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"tinymce": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d7d6ec..f1b9176 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,7 @@
pinia: ^2.0.23
plop: ^3.1.1
postcss-html: ^1.5.0
+ print-js: ^1.6.0
qrcode: ^1.5.1
qs: ^6.11.0
sass: ^1.56.1
@@ -94,6 +95,7 @@
path-browserify: 1.0.1
path-to-regexp: 6.2.1
pinia: 2.0.23_d45o5shxrtvj6wh4y524t7cqnm
+ print-js: registry.npmmirror.com/print-js/1.6.0
qrcode: registry.npmmirror.com/qrcode/1.5.1
qs: 6.11.0
tinymce: 6.2.0
@@ -8769,6 +8771,12 @@
engines: {node: '>=10.13.0'}
dev: false
+ registry.npmmirror.com/print-js/1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz}
+ name: print-js
+ version: 1.6.0
+ dev: false
+
registry.npmmirror.com/qrcode/1.5.1:
resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz}
name: qrcode
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..e447f41
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+ return request({
+ url: `${prefix}/supplier/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+ return request({
+ url: `${prefix}/supplier/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+ return request({
+ url: `/sys/area/list?pid=${pid}`,
+ method: 'get',
+ })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+ return request({
+ url: '/meter/supplier/submit',
+ method: 'post',
+ data,
+ })
+}
+// 保存数据
+export function sourceSave(data: object) {
+ return request({
+ url: `${prefix}/supplier/save`,
+ method: 'post',
+ data,
+ })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+ return request({
+ url: `${prefix}/supplier/update`,
+ method: 'post',
+ data,
+ })
+}
+
+// 导出列表
+export function exportSourceList(data: { businessContent: string; supplierName: string; supplierNo: string; ids: string[] }) {
+ return request({
+ url: `${prefix}/supplier/listExport`,
+ method: 'post',
+ responseType: 'blob',
+ data,
+ })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+ return request({
+ url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
- return request({
- url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
- return request({
- url: `${prefix}/supplier/delete`,
- method: 'post',
- data,
- })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
- return request({
- url: `${prefix}/supplier/detail`,
- method: 'post',
- data,
- })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
- return request({
- url: `/sys/area/list?pid=${pid}`,
- method: 'get',
- })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
- return request({
- url: `${prefix}/supplier/add`,
- method: 'post',
- data,
- })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
- return request({
- url: `${prefix}/supplier/update`,
- method: 'post',
- data,
- })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
- return request({
- url: `${prefix}/supplier/listExport`,
- method: 'post',
- responseType: 'blob',
- data,
- })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
- return request({
- url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
- method: 'post',
- data,
- })
-}
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 0ea0555..8960267 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -122,3 +122,17 @@
.full-width-input {
width: 100% !important;
}
+
+// 详情页面输入框样式调整, 背景白,字体加深,悬停显示输入字符
+.detail-input.is-disabled .el-input__wrapper {
+ background-color: #fff;
+}
+
+.detail-input.is-disabled .el-input__inner {
+ color: var(--el-text-color-regular);
+ -webkit-text-fill-color: var(--el-text-color-regular);
+
+ &:hover {
+ cursor: text;
+ }
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
- SelectTree: typeof import('./components/SelectTree/index.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/QrDialog/index.vue b/src/components/QrDialog/index.vue
index 317927e..defb488 100644
--- a/src/components/QrDialog/index.vue
+++ b/src/components/QrDialog/index.vue
@@ -128,6 +128,9 @@
font-weight: bold;
font-size: 30px;
margin-top: 60px;
+ display: block;
+ height: auto;
+ overflow: hidden;
.canvas {
width: 50vw;
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
{
path: 'approve/:type/:id?',
name: 'ListpageSourceAdd',
- component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+ component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
meta: {
title: '溯源供方审批',
icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
state: () => ({
allDeptList: [] as DeptTreeNode[], // 所有部门列表
companyList: [] as DeptTreeNode[], // 公司列表
+ approvalStatusList: {
+ 全部: '0',
+ 草稿箱: '1',
+ 待审批: '2',
+ 审批中: '3',
+ 已通过: '4',
+ 未通过: '5',
+ 已取消: '6',
+ }, // 审批状态
}),
getters: {
getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
getCompanyList: (state) => {
return state.companyList
},
+ getApprovalStatus: (state) => {
+ return state.approvalStatusList
+ },
},
actions: {
setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/printUtils.ts b/src/utils/printUtils.ts
new file mode 100644
index 0000000..8c71409
--- /dev/null
+++ b/src/utils/printUtils.ts
@@ -0,0 +1,53 @@
+import printJS from 'print-js'
+// JSON表头配置项
+interface IJsonPropertie {
+ field: string // 字段名
+ displayName: string // 要显示的中文名
+ columnSize?: string // 列宽度,非必填
+}
+/**
+ * 打印HTML元素
+ * @param element 元素id
+ * @param header 打印标题
+ * @param style 打印样式
+ * @param ignoreElements 忽略元素id列表
+ */
+export function printHtml(element: string, header?: string, style?: string, ignoreElements?: string[]) {
+ printJS({
+ printable: element, // 标签元素id
+ type: 'html', // 打印类型
+ header: `
${header}
`, // '标题',
+ targetStyles: ['*'], // 默认情况下,库仅在打印 HTML 元素时处理某些样式。此选项允许您传递要处理的样式数组。例如:[‘padding-top’, ‘border-bottom’]
+ style: style || '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
+ ignoreElements: ignoreElements || [], // 传入打印父 html 元素时应忽略的 html id 数组。使其不打印。
+ })
+}
+
+export function printJSON(jsonData: Array