From 451674dd4dd784fa0725b4ba052d94449d892712 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sat, 28 Sep 2024 15:12:16 +0800
Subject: [PATCH] Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin into 6-29印度股票

---
 src/views/userlist/components/editCapitaluserdialog.vue |   65 ++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/views/userlist/components/editCapitaluserdialog.vue b/src/views/userlist/components/editCapitaluserdialog.vue
index c993441..afc2b1a 100644
--- a/src/views/userlist/components/editCapitaluserdialog.vue
+++ b/src/views/userlist/components/editCapitaluserdialog.vue
@@ -26,12 +26,11 @@
             <a-select-option value="1">扣款</a-select-option>
             <a-select-option value="0">入款</a-select-option>
             <a-select-option value="2">充值</a-select-option>
-            <a-select-option value="3">提币</a-select-option>
+            <!-- <a-select-option value="3">提币</a-select-option> -->
           </a-select>
         </a-form-item>
         <a-form-item label="账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select
-            disabled
             placeholder="请选择账户"
             v-decorator="['accectType', { rules: [{ required: true, message: '请选择账户' }] }]"
           >
@@ -51,20 +50,21 @@
   components: {},
   filters: {
     formatDate(value) {
-      // switch (value.accectType) {
-      //   case 'US':
-      //     return `美元(${value.symbol} ${value.availableBalance})`
-      //   case 'MAS':
-      //     return `马来西亚(${value.symbol} ${value.availableBalance})`
-      //   case 'HK':
-      //     return `香港(${value.symbol} ${value.availableBalance})`
-      //   case 'IN':
-      //     return `印度(${value.symbol} ${value.availableBalance})`
-
-      //   default:
-      //     break
-      // }
-      return `印度(${value.symbol} ${value.availableBalance})`
+      switch (value.accectType) {
+        case 'US':
+          return `美元(${value.symbol} ${value.availableBalance})`
+        case 'MAS':
+          return `马来西亚(${value.symbol} ${value.availableBalance})`
+        case 'HK':
+          return `香港(${value.symbol} ${value.availableBalance})`
+        case 'IN':
+          return `印度(${value.symbol} ${value.availableBalance})`
+        case 'SGP':
+          return `新加坡(${value.symbol} ${value.availableBalance})`
+        default:
+          break
+      }
+      // return `印度(${value.symbol} ${value.availableBalance})`
     },
   },
   props: {
@@ -111,22 +111,29 @@
     OkeditUserdialog() {
       const form = this.$refs.editUserform.form
       form.validateFields((errors, values) => {
-        console.log(values, 'from')
+        console.log(values, 'from', !errors)
         const arr = this.activeArr.filter((item) => item.accectType === values.accectType)
-        const amt = values.direction == '1' ? 0 - Number(values.amt) : Number(values.amt)
+        const amt = values.amt
+
+        console.log(arr)
         if (!errors) {
           this.editUserDialogloading = true
-          updateMoney({ id: arr[0].id, amt: amt }).then((res) => {
-            if (res.status == 0) {
-              this.editUserdialog = false
-              this.$message.success(res.msg)
-              form.resetFields()
-              this.getinit()
-            } else {
-              this.$message.error({ content: res.msg || '划转成功' })
-            }
-            this.editUserDialogloading = false
-          })
+          console.log({ id: arr[0].id, amt: amt, type: this.direction })
+          updateMoney({ id: arr[0].id, amt: amt, type: values.direction })
+            .then((res) => {
+              if (res.status == 0) {
+                this.editUserdialog = false
+                this.$message.success(res.msg)
+                form.resetFields()
+                this.getinit()
+              } else {
+                this.$message.error({ content: res.msg || '划转成功' })
+              }
+              this.editUserDialogloading = false
+            })
+            .catch((res) => {
+              this.editUserDialogloading = false
+            })
         } else {
           console.log(3333)
         }

--
Gitblit v1.9.3