From 53fec7ea0479af692900a22dec0def9dd3097031 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 3 Dec 2022 13:43:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E9=92=B1=E5=8C=85=E6=97=A5=E5=BF=97,=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=92=8C=E8=A7=92=E8=89=B2=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E6=BA=90=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7,=20eslint=20=E8=A7=84=E5=88=99=E5=BE=AE=E8=B0=83,=20?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8Dsass=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                  |  1 +
 package.json                                  |  3 +-
 .../RoleSelectModal/BRoleSelectModal.vue      | 44 +++++------
 .../UserSelectModal/BUserSelectModal.vue      | 17 +++--
 .../modules/bpm/model/BpmModelNodeEdit.vue    |  2 +-
 .../modules/payment/wallet/list/Wallet.api.ts | 10 +++
 .../payment/wallet/list/WalletList.vue        |  9 ++-
 .../payment/wallet/list/WalletLog.api.ts      | 47 ++++++++++++
 .../payment/wallet/list/WalletLogList.vue     | 76 +++++++++++++++++++
 .../modules/system/dict/DictItemList.vue      |  4 +-
 yarn.lock                                     | 10 +--
 11 files changed, 182 insertions(+), 41 deletions(-)
 create mode 100644 src/views/modules/payment/wallet/list/WalletLog.api.ts
 create mode 100644 src/views/modules/payment/wallet/list/WalletLogList.vue

diff --git a/.eslintrc.js b/.eslintrc.js
index b3f325b56..b8ac43a11 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -54,6 +54,7 @@ module.exports = {
     'vue/singleline-html-element-content-newline': 'off',
     'vue/attribute-hyphenation': 'off',
     'vue/require-default-prop': 'off',
+    'vue/no-setup-props-destructure': 'off',
     'vue/require-explicit-emits': 'off',
     'vue/html-self-closing': [
       'error',
diff --git a/package.json b/package.json
index 5e2054a64..ac12e6766 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^8.6.0",
+    "eslint-plugin-vue": "^8.7.1",
     "esno": "^0.14.1",
     "fs-extra": "^10.1.0",
     "husky": "^7.0.4",
@@ -126,6 +126,7 @@
     "rollup": "^2.70.2",
     "rollup-plugin-visualizer": "^5.6.0",
     "stylelint": "^14.7.1",
+    "sass": "^1.56.1",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recommended": "^7.0.0",
     "stylelint-config-recommended-vue": "^1.4.0",
diff --git a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
index b67f6bf70..c7a2e5292 100644
--- a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
+++ b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
@@ -60,23 +60,23 @@
 
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
 
-  const props = withDefaults(
-    defineProps<{
-      // 名称
-      title: string
-      // 是否是查询看状态
-      multiple: boolean
-      // 宽度
-      width?: number | string
-    }>(),
-    {
-      title: '选择角色',
-      multiple: false,
-      width: 640,
-    },
-  )
-  const emits = defineEmits(['ok'])
+  const {
+    title = '选择角色',
+    multiple = false,
+    width = 640,
+    dataSource = page,
+  } = defineProps<{
+    // 名称
+    title: string
+    // 是否是查询看状态
+    multiple: boolean
+    // 宽度
+    width?: number | string
+    // 数据源
+    dataSource?: Function
+  }>()
 
+  const emits = defineEmits(['ok'])
   let visible = $ref(false)
   let selectRoleIds = $ref<string[]>([])
   let selectRoleId = $ref<string>()
@@ -86,7 +86,7 @@
     { field: 'code', type: STRING, name: '编号', placeholder: '请输入角色编号' },
   ]
   const checkboxConfig = computed(() => {
-    return props.multiple
+    return multiple
       ? {
           reserve: true,
           checkMethod: banCheckbox,
@@ -94,7 +94,7 @@
       : {}
   })
   const radioConfig = computed(() => {
-    return !props.multiple
+    return !multiple
       ? {
           reserve: true,
           checkRowKey: selectRoleId,
@@ -108,7 +108,7 @@
    */
   function init(param) {
     visible = true
-    if (props.multiple) {
+    if (multiple) {
       selectRoleIds = param || selectRoleId
     } else {
       selectRoleId = param || selectRoleId
@@ -121,7 +121,7 @@
    */
   function queryPage() {
     loading.value = true
-    page({
+    dataSource({
       ...model.queryParam,
       ...pages,
     }).then(({ data }) => {
@@ -132,7 +132,7 @@
    * 选中确定回调
    */
   function handleOk() {
-    if (props.multiple) {
+    if (multiple) {
       checkboxCallback()
     } else {
       radioCallback()
@@ -175,7 +175,7 @@
    * 禁止选中的行 复选
    */
   function banCheckbox({ row }) {
-    return !selectUserIds.includes(row.id)
+    return !selectRoleIds.includes(row.id)
   }
   defineExpose({ init })
 </script>
diff --git a/src/components/Bootx/UserSelectModal/BUserSelectModal.vue b/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
index 962640cc5..3838e3e5a 100644
--- a/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
+++ b/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
@@ -70,11 +70,14 @@
     multiple: boolean
     // 宽度
     width?: number | string
+    // 数据源
+    dataSource?: Function
   }
   const props = withDefaults(defineProps<Props>(), {
     title: '选择用户',
     multiple: false,
     width: 640,
+    dataSource: page,
   })
   const emits = defineEmits(['ok'])
 
@@ -125,12 +128,14 @@
    */
   function queryPage() {
     loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
+    props
+      .dataSource({
+        ...model.queryParam,
+        ...pages,
+      })
+      .then(({ data }) => {
+        pageQueryResHandel(data)
+      })
   }
   /**
    * 选中确定回调
diff --git a/src/views/modules/bpm/model/BpmModelNodeEdit.vue b/src/views/modules/bpm/model/BpmModelNodeEdit.vue
index f8ffd6e03..d169f4707 100644
--- a/src/views/modules/bpm/model/BpmModelNodeEdit.vue
+++ b/src/views/modules/bpm/model/BpmModelNodeEdit.vue
@@ -99,7 +99,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, nextTick, reactive } from 'vue'
+  import { computed, nextTick } from 'vue'
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
   import { add, get, update, BpmModelNode } from './ModelNode.api'
diff --git a/src/views/modules/payment/wallet/list/Wallet.api.ts b/src/views/modules/payment/wallet/list/Wallet.api.ts
index a8b8b676a..a74858c03 100644
--- a/src/views/modules/payment/wallet/list/Wallet.api.ts
+++ b/src/views/modules/payment/wallet/list/Wallet.api.ts
@@ -12,6 +12,16 @@ export function page(params) {
   })
 }
 
+/**
+ * 分页(未开通钱包的用户)
+ */
+export function pageByNotWallet(params) {
+  return defHttp.get<Result<PageResult<Wallet>>>({
+    url: '/wallet/pageByNotWallet',
+    params: params,
+  })
+}
+
 /**
  * 查询全部
  */
diff --git a/src/views/modules/payment/wallet/list/WalletList.vue b/src/views/modules/payment/wallet/list/WalletList.vue
index 8518378e4..047de32d5 100644
--- a/src/views/modules/payment/wallet/list/WalletList.vue
+++ b/src/views/modules/payment/wallet/list/WalletList.vue
@@ -57,7 +57,8 @@
         @page-change="handleTableChange"
       />
       <wallet-info ref="walletInfo" />
-      <b-user-select-modal ref="userSelectModal" multiple @ok="createBatchWallet" />
+      <wallet-log-list ref="walletLogList" />
+      <b-user-select-modal ref="userSelectModal" multiple :data-source="pageByNotWallet" @ok="createBatchWallet" />
     </div>
   </div>
 </template>
@@ -65,7 +66,7 @@
 <script lang="ts" setup>
   import { onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { createWalletBatch, del, lock, page, unlock } from './Wallet.api'
+  import { createWalletBatch, del, lock, page, pageByNotWallet, unlock } from './Wallet.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import WalletInfo from './WalletInfo.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -73,8 +74,8 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   import { QueryField, STRING } from '/@/components/Bootx/Query/Query'
   import { useDict } from '/@/hooks/bootx/useDict'
-  import BUserSelectModal from "/@/components/Bootx/UserSelectModal/BUserSelectModal.vue";
-
+  import BUserSelectModal from '/@/components/Bootx/UserSelectModal/BUserSelectModal.vue'
+  import WalletLogList from "/@/views/modules/payment/wallet/list/WalletLogList.vue";
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
   const { notification, createMessage, createConfirm } = useMessage()
diff --git a/src/views/modules/payment/wallet/list/WalletLog.api.ts b/src/views/modules/payment/wallet/list/WalletLog.api.ts
new file mode 100644
index 000000000..dbce9e778
--- /dev/null
+++ b/src/views/modules/payment/wallet/list/WalletLog.api.ts
@@ -0,0 +1,47 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 分页
+ */
+export function pageByWalletId(params) {
+  return defHttp.get<Result<PageResult<WalletLog>>>({
+    url: '/wallet/log/pageByWalletId',
+    params,
+  })
+}
+
+/**
+ * 获取单条
+ */
+export function get(id) {
+  return defHttp.get<Result<WalletLog>>({
+    url: '/wallet/log/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 钱包日志
+ */
+export interface WalletLog extends BaseEntity {
+  // 钱包id
+  walletId?: string
+  // 用户id
+  userId?: string
+  // 类型
+  type?: number
+  // 交易记录ID
+  paymentId?: string
+  // 操作终端ip
+  clientIp?: string
+  // 备注
+  remark?: string
+  // 业务ID
+  businessId?: string
+  // 操作源
+  operationSource?: number
+  // 金额
+  amount?: number
+}
diff --git a/src/views/modules/payment/wallet/list/WalletLogList.vue b/src/views/modules/payment/wallet/list/WalletLogList.vue
new file mode 100644
index 000000000..1a9362c7e
--- /dev/null
+++ b/src/views/modules/payment/wallet/list/WalletLogList.vue
@@ -0,0 +1,76 @@
+<template>
+  <basic-drawer forceRender showFooter v-bind="$attrs" title="钱包日志列表" width="60%" :visible="visible" @close="visible = false">
+    <vxe-toolbar ref="xToolbar" custom :refresh="{ query: queryPage }" />
+    <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+      <vxe-column type="seq" title="序号" width="60" />
+      <vxe-column field="type" title="类型">
+        <template #default="{ row }">
+          {{ dictConvert('WalletLogType', row.type) }}
+        </template>
+      </vxe-column>
+      <vxe-column field="amount" title="金额" />
+      <vxe-column field="operationSource" title="操作类型">
+        <template #default="{ row }">
+          {{ dictConvert('WalletLogOperation', row.operationSource) }}
+        </template>
+      </vxe-column>
+      <vxe-column field="remark" title="备注" />
+    </vxe-table>
+    <vxe-pager
+      size="medium"
+      :loading="loading"
+      :current-page="pagination.current"
+      :page-size="pagination.size"
+      :total="pagination.total"
+      @page-change="handleTableChange"
+    />
+  </basic-drawer>
+</template>
+
+<script lang="ts" setup>
+  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
+  import useTablePage from '/@/hooks/bootx/useTablePage'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import { QueryField } from '/@/components/Bootx/Query/Query'
+  import { $ref } from 'vue/macros'
+  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import { nextTick } from 'vue'
+  import { pageByWalletId } from '/@/views/modules/payment/wallet/list/WalletLog.api'
+  import { useDict } from '/@/hooks/bootx/useDict'
+
+  // 使用hooks
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
+  const { notification, createMessage } = useMessage()
+  const { dictConvert } = useDict()
+
+  // 查询条件
+  const fields = [] as QueryField[]
+  let visible = $ref(false)
+  let walletId = $ref<string>()
+
+  const xTable = $ref<VxeTableInstance>()
+  const xToolbar = $ref<VxeToolbarInstance>()
+
+  nextTick(() => {
+    xTable?.connect(xToolbar as VxeToolbarInstance)
+  })
+
+  function init(id) {
+    visible = true
+    walletId = id
+    queryPage()
+  }
+  // 分页查询
+  function queryPage() {
+    pageByWalletId({
+      ...model.queryParam,
+      ...pages,
+      walletId,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+  }
+  defineExpose({ init })
+</script>
+
+<style scoped></style>
diff --git a/src/views/modules/system/dict/DictItemList.vue b/src/views/modules/system/dict/DictItemList.vue
index 41b8b545d..08bfdc098 100644
--- a/src/views/modules/system/dict/DictItemList.vue
+++ b/src/views/modules/system/dict/DictItemList.vue
@@ -57,7 +57,7 @@
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
-  const { notification, createWarningModal, createMessage } = useMessage()
+  const { notification, createMessage } = useMessage()
 
   // 查询条件
   const fields = [] as QueryField[]
@@ -84,7 +84,7 @@
     page({
       ...model.queryParam,
       ...pages,
-      dictId: dictInfo.id,
+      dictId: dictInfo?.id,
     }).then(({ data }) => {
       pageQueryResHandel(data)
     })
diff --git a/yarn.lock b/yarn.lock
index c85a8b12c..51fef3177 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4451,7 +4451,7 @@ eslint-plugin-prettier@^4.0.0:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-vue@^8.6.0:
+eslint-plugin-vue@^8.7.1:
   version "8.7.1"
   resolved "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz#f13c53547a0c9d64588a675cc5ecc6ccaf63703f"
   integrity sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==
@@ -8294,10 +8294,10 @@ safe-regex@^1.1.0:
   resolved "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@^1.55.0:
-  version "1.55.0"
-  resolved "https://registry.npmmirror.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c"
-  integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==
+sass@^1.56.1:
+  version "1.56.1"
+  resolved "https://registry.npmmirror.com/sass/-/sass-1.56.1.tgz#94d3910cd468fd075fa87f5bb17437a0b617d8a7"
+  integrity sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"