From 670d81415d2c867db02153b9cd6404cea039d473 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 13 Jan 2025 10:57:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E6=89=B9=E9=87=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wallet/wallet-recharge-apply.ts | 8 + src/api/wallet/wallet-transaction.ts | 99 ++++--- src/views/wallet/wallet-foreign/index.vue | 4 +- src/views/wallet/wallet-freeze/index.vue | 254 ++++++++++-------- .../wallet/wallet-recharge-apply/index.vue | 4 +- .../wallet-recharge-apply/preview-excel.vue | 136 +++++++--- src/views/wallet/wallet-stride/index.vue | 4 +- 7 files changed, 311 insertions(+), 198 deletions(-) diff --git a/src/api/wallet/wallet-recharge-apply.ts b/src/api/wallet/wallet-recharge-apply.ts index f86a271..5107fce 100644 --- a/src/api/wallet/wallet-recharge-apply.ts +++ b/src/api/wallet/wallet-recharge-apply.ts @@ -8,6 +8,14 @@ export function apply(query?: Object) { }) } +export function comparePageJoin(obj?: Object) { + return request({ + url: "/wallet/wallet-recharge-apply/compare-page-join", + method: "get", + params: obj, + }) +} + export function pageJoin(query?: Object) { return request({ url: "/wallet/wallet-recharge-apply/page-join", diff --git a/src/api/wallet/wallet-transaction.ts b/src/api/wallet/wallet-transaction.ts index 9be40fb..71717d9 100644 --- a/src/api/wallet/wallet-transaction.ts +++ b/src/api/wallet/wallet-transaction.ts @@ -1,81 +1,80 @@ import request from "/@/utils/request" export function pageCz(obj?: Object) { - return request({ - url: '/wallet/wallet-transaction/page-cz', - method: 'get', - params: obj - }) + return request({ + url: "/wallet/wallet-transaction/page-cz", + method: "get", + params: obj, + }) } export function pageXf(obj?: Object) { - return request({ - url: '/wallet/wallet-transaction/page-xf', - method: 'get', - params: obj - }) + return request({ + url: "/wallet/wallet-transaction/page-xf", + method: "get", + params: obj, + }) } export function pageTk(obj?: Object) { - return request({ - url: '/wallet/wallet-transaction/page-tk', - method: 'get', - params: obj - }) + return request({ + url: "/wallet/wallet-transaction/page-tk", + method: "get", + params: obj, + }) } export function updateBalance(obj?: Object) { - return request({ - url: '/wallet/wallet-transaction/update-balance', - method: 'put', - data: obj - }) + return request({ + url: "/wallet/wallet-transaction/update-balance", + method: "put", + data: obj, + }) } export function fetchList(query?: Object) { - return request({ - url: '/wallet/wallet-transaction/page', - method: 'get', - params: query - }) + return request({ + url: "/wallet/wallet-transaction/page", + method: "get", + params: query, + }) } export function pageJoin(query?: Object) { - return request({ - url: '/wallet/wallet-transaction/page-join', - method: 'get', - params: query - }) + return request({ + url: "/wallet/wallet-transaction/page-join", + method: "get", + params: query, + }) } export function addObj(obj?: Object) { - return request({ - url: '/wallet/wallet-transaction', - method: 'post', - data: obj - }) + return request({ + url: "/wallet/wallet-transaction", + method: "post", + data: obj, + }) } export function getObj(id?: string) { - return request({ - url: '/wallet/wallet-transaction/' + id, - method: 'get' - }) + return request({ + url: "/wallet/wallet-transaction/" + id, + method: "get", + }) } export function delObjs(ids?: Object) { - return request({ - url: '/wallet/wallet-transaction', - method: 'delete', - data: ids - }) + return request({ + url: "/wallet/wallet-transaction", + method: "delete", + data: ids, + }) } export function putObj(obj?: Object) { - return request({ - url: '/wallet/wallet-transaction', - method: 'put', - data: obj - }) + return request({ + url: "/wallet/wallet-transaction", + method: "put", + data: obj, + }) } - diff --git a/src/views/wallet/wallet-foreign/index.vue b/src/views/wallet/wallet-foreign/index.vue index 996401c..c5fafea 100644 --- a/src/views/wallet/wallet-foreign/index.vue +++ b/src/views/wallet/wallet-foreign/index.vue @@ -75,12 +75,10 @@ \ No newline at end of file + try { + await delObjs(ids) + getDataList() + useMessage().success("删除成功") + } catch (err: any) { + useMessage().error(err.msg) + } +} + diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue index 85c9ad0..36e05fa 100644 --- a/src/views/wallet/wallet-recharge-apply/index.vue +++ b/src/views/wallet/wallet-recharge-apply/index.vue @@ -95,8 +95,8 @@ @click="doInfo(row)" >数据 - 申请 编辑 -
-
- -
- -
- - - - - - - - - - - -
-
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + +
+
\ No newline at end of file +const currentChangeHandle = (e: any) => { + state.pagination.current = e + getList() +} + +/** 查询列表 */ +const getList = async () => { + state.loading = true + try { + const { data: pageData } = await walletRechargeApplyApi.comparePageJoin(state.queryForm) + data.list = pageData.page.records + data.total = pageData.page.total + data.tableList = pageData.tableList + data.tableListStr = pageData.tableListStr + state.pagination.total = pageData.page.total + } finally { + state.loading = false + } +} + diff --git a/src/views/wallet/wallet-stride/index.vue b/src/views/wallet/wallet-stride/index.vue index 6cf98ba..1df0a4d 100644 --- a/src/views/wallet/wallet-stride/index.vue +++ b/src/views/wallet/wallet-stride/index.vue @@ -86,12 +86,10 @@ @click="handleDelete([row.id])" >删除 + 查看审批 使用情况 - - 查看审批 - From a094b6964715555b8bd7f1f590f264010876f8f6 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 13 Jan 2025 10:59:27 +0800 Subject: [PATCH 2/3] 1 --- .env.development | 23 ----------------------- .prettierrc.js | 39 --------------------------------------- 2 files changed, 62 deletions(-) delete mode 100644 .env.development delete mode 100644 .prettierrc.js diff --git a/.env.development b/.env.development deleted file mode 100644 index e1223e0..0000000 --- a/.env.development +++ /dev/null @@ -1,23 +0,0 @@ -# port 端口号 -VITE_PORT = 8888 - -#浏览器自动打开 -VITE_OPEN = true - -# 本地环境 -ENV = 'development' - -# ADMIN 服务地址 -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.29: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.29:9999 # 邓-本地 - -# 代码生成服务地址 -VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index cff490a..0000000 --- a/.prettierrc.js +++ /dev/null @@ -1,39 +0,0 @@ -module.exports = { - // 一行最多多少个字符 - printWidth: 150, - // 指定每个缩进级别的空格数 - tabWidth: 2, - // 使用制表符而不是空格缩进行 - useTabs: true, - // 在语句末尾打印分号 - semi: true, - // 使用单引号而不是双引号 - singleQuote: true, - // 更改引用对象属性的时间 可选值"" - quoteProps: 'as-needed', - // 在JSX中使用单引号而不是双引号 - jsxSingleQuote: false, - // 多行时尽可能打印尾随逗号。（例如，单行数组永远不会出现逗号结尾。） 可选值""，默认none - trailingComma: 'es5', - // 在对象文字中的括号之间打印空格 - bracketSpacing: true, - // jsx 标签的反尖括号需要换行 - jsxBracketSameLine: false, - // 在单独的箭头函数参数周围包括括号 always：(x) => x \ avoid：x => x - arrowParens: 'always', - // 这两个选项可用于格式化以给定字符偏移量（分别包括和不包括）开始和结束的代码 - rangeStart: 0, - rangeEnd: Infinity, - // 指定要使用的解析器，不需要写文件开头的 @prettier - requirePragma: false, - // 不需要自动在文件开头插入 @prettier - insertPragma: false, - // 使用默认的折行标准 always\never\preserve - proseWrap: 'preserve', - // 指定HTML文件的全局空格敏感度 css\strict\ignore - htmlWhitespaceSensitivity: 'css', - // Vue文件脚本和样式标签缩进 - vueIndentScriptAndStyle: false, - // 换行符使用 lf 结尾是 可选值"" - endOfLine: 'lf', -}; From 6ceaa905cb9b5c3d3c9882cb9ab8615c47c646ff Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 13 Jan 2025 15:48:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarketSpu/components/supermarketUnit/form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue index 215e507..b86ee44 100644 --- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue +++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue @@ -100,7 +100,7 @@ const dataRules = ref({ packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }], // purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }], retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }], - promotionPrice: [{ required: true, message: '促销价不能为空', trigger: 'blur' }], + // promotionPrice: [{ required: true, message: '促销价不能为空', trigger: 'blur' }], }); // 打开弹窗