diff --git a/.env.development b/.env.development index d895fee..621b6ca 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ ENV = 'development' # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ # VITE_ADMIN_PROXY_PATH = http://localhost:9999/ -VITE_ADMIN_PROXY_PATH = http://192.168.101.139:9999/ # 邓-本地 +VITE_ADMIN_PROXY_PATH = http://192.168.101.150:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上 # 图片访问基础地址 @@ -20,7 +20,7 @@ VITE_ADMIN_PROXY_PATH = http://192.168.101.139:9999/ # 邓-本地 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://localhost:9999 -VITE_IMAGE_BASE_PATH = http://192.168.101.139:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://192.168.101.150:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 # 代码生成服务地址 diff --git a/package.json b/package.json index c9ff9f0..6db2dfa 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "element-plus": "2.5.5", "form-designer-plus": "^0.1.5", "highlight.js": "^11.7.0", + "html-to-image": "^1.11.13", "js-base64": "^3.7.7", "js-cookie": "^3.0.1", "json-editor-vue3": "^1.1.1", @@ -43,6 +44,7 @@ "nprogress": "^0.2.0", "pinia": "2.0.32", "postcss": "8.4.40", + "print-js": "^1.6.0", "qrcode": "1.5.1", "qs": "^6.11.0", "screenfull": "^6.0.2", @@ -116,4 +118,4 @@ "type": "git", "url": "https://gitee.com/log4j/pig" } -} \ No newline at end of file +} diff --git a/src/api/admin/dept.ts b/src/api/admin/dept.ts index e170e8a..2c07649 100644 --- a/src/api/admin/dept.ts +++ b/src/api/admin/dept.ts @@ -8,6 +8,14 @@ export const deptTree = (params?: Object) => { }) } +export const deptTreeSelect = (params?: Object) => { + return request({ + url: "/admin/dept/tree-select", + method: "get", + params, + }) +} + export const addObj = (obj: Object) => { return request({ url: "/admin/dept", diff --git a/src/api/wallet/wallet-recharge-apply.ts b/src/api/wallet/wallet-recharge-apply.ts index 5107fce..bdca851 100644 --- a/src/api/wallet/wallet-recharge-apply.ts +++ b/src/api/wallet/wallet-recharge-apply.ts @@ -1,5 +1,13 @@ import request from "/@/utils/request" +export function saveTopup(data?: Object) { + return request({ + url: "/wallet/wallet-recharge-apply/save-topup", + method: "post", + data: data, + }) +} + export function apply(query?: Object) { return request({ url: "/wallet/wallet-recharge-apply/apply", diff --git a/src/api/wallet/wallet-recharge-invoice.ts b/src/api/wallet/wallet-recharge-invoice.ts new file mode 100644 index 0000000..862bc04 --- /dev/null +++ b/src/api/wallet/wallet-recharge-invoice.ts @@ -0,0 +1,75 @@ +import request from "/@/utils/request" + +/** + * 根据申请id获取发票详情 + * @param id 申请id + */ +export function invoiceSelect(query: any) { + return request({ + url: "/wallet/walletRechargeInvoice/select", + method: "get", + params: query, + }) +} + +/** + * 根据申请id获取发票详情 + * @param id 申请id + */ +export function getInvoice(query: any) { + return request({ + url: "/wallet/walletRechargeInvoice/get-invoice", + method: "get", + params: query, + }) +} + +/** + * 绑定发票 + */ +export function bindInvoice(data: any) { + return request({ + url: "/wallet/walletRechargeInvoice/bind-invoice", + method: "post", + data: data, + }) +} + +export function fetchList(query?: Object) { + return request({ + url: "/wallet/walletRechargeInvoice/page", + method: "get", + params: query, + }) +} + +export function addObj(obj?: Object) { + return request({ + url: "/wallet/walletRechargeInvoice", + method: "post", + data: obj, + }) +} + +export function getObj(id?: string) { + return request({ + url: "/wallet/walletRechargeInvoice/" + id, + method: "get", + }) +} + +export function delObjs(ids?: Object) { + return request({ + url: "/wallet/walletRechargeInvoice", + method: "delete", + data: ids, + }) +} + +export function putObj(obj?: Object) { + return request({ + url: "/wallet/walletRechargeInvoice", + method: "put", + data: obj, + }) +} diff --git a/src/assets/receiptStamp.png b/src/assets/receiptStamp.png new file mode 100644 index 0000000..6c15885 Binary files /dev/null and b/src/assets/receiptStamp.png differ diff --git a/src/components/Select/SelectDept.vue b/src/components/Select/SelectDept.vue index 9cfb397..86756b9 100644 --- a/src/components/Select/SelectDept.vue +++ b/src/components/Select/SelectDept.vue @@ -1,30 +1,28 @@ diff --git a/src/components/index.ts b/src/components/index.ts index 27ac25a..500b525 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -35,6 +35,7 @@ import SelectRole from "/@/components/Select/SelectRole.vue" import SelectCabinet from "/@/components/Select/SelectCabinet.vue" import SelectMchCatory from "/@/components/Select/SelectMchCatory.vue" import SelectCanteenSupplier from "/@/components/Select/SelectCanteenSupplier.vue" +import SelectWalletInvoice from "/@/components/Select/SelectWalletInvoice.vue" // 第三方组件 import ElementPlus from "element-plus" @@ -91,6 +92,7 @@ export default { app.component("SelectRole", SelectRole) app.component("SelectCabinet", SelectCabinet) app.component("SelectCanteenSupplier", SelectCanteenSupplier) + app.component("SelectWalletInvoice", SelectWalletInvoice) // 导入全部的elmenet-plus的图标 for (const [key, component] of Object.entries(ElementPlusIconsVue)) { diff --git a/src/views/admin/system/dept/form.vue b/src/views/admin/system/dept/form.vue index 6c03a0a..6a3194c 100644 --- a/src/views/admin/system/dept/form.vue +++ b/src/views/admin/system/dept/form.vue @@ -1,17 +1,10 @@ diff --git a/src/views/admin/system/dept/tree-view.vue b/src/views/admin/system/dept/tree-view.vue index a03849e..63f5d85 100644 --- a/src/views/admin/system/dept/tree-view.vue +++ b/src/views/admin/system/dept/tree-view.vue @@ -1,23 +1,9 @@ diff --git a/src/views/admin/system/role/form.vue b/src/views/admin/system/role/form.vue index 3a086d5..7fa24f1 100644 --- a/src/views/admin/system/role/form.vue +++ b/src/views/admin/system/role/form.vue @@ -1,20 +1,18 @@