From 50fbefd6a124915a1aef6b16326bcf751b6b3976 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 21 Jun 2024 20:27:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invest/creditcard/index.vue |  4 ++--
 src/views/invest/futures/index.vue    | 34 +++++++++++++--------------
 src/views/invest/lend/index.vue       |  1 +
 src/views/invest/posmachine/index.vue | 30 +++++++++++------------
 src/views/invest/stocks/index.vue     | 12 +++++-----
 5 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/views/invest/creditcard/index.vue b/src/views/invest/creditcard/index.vue
index ec7106f..372b0cf 100644
--- a/src/views/invest/creditcard/index.vue
+++ b/src/views/invest/creditcard/index.vue
@@ -157,8 +157,8 @@ const data = reactive({
     code: [{ required: true, message: '信用卡卡号不能为空', trigger: 'blur' }],
     billDate: [{ required: true, message: '账单日不能为空', trigger: 'blur' }],
     payDate: [{ required: true, message: '还款日不能为空', trigger: 'blur' }],
-    creditLimit: [{ required: true, message: '信用卡额度不能为空', trigger: 'blur' }],
-    cvv: [{ required: true, message: '信用卡安全码不能为空', trigger: 'blur' }]
+    creditLimit: [{ required: true, message: '信用卡额度不能为空', trigger: 'blur' }]
+    // cvv: [{ required: true, message: '信用卡安全码不能为空', trigger: 'blur' }]
   }
 })
 
diff --git a/src/views/invest/futures/index.vue b/src/views/invest/futures/index.vue
index 30f42f8..3806d64 100644
--- a/src/views/invest/futures/index.vue
+++ b/src/views/invest/futures/index.vue
@@ -28,7 +28,7 @@
           <el-table-column label="账号" align="center" prop="code" />
           <el-table-column label="期货交易中心账号" align="center" prop="tradingCenterCode" />
           <el-table-column label="手续费" align="center" prop="commission" />
-          <el-table-column label="保证金" align="center" prop="bond" />
+          <el-table-column label="保证金比例" align="center" prop="bond" />
           <el-table-column label="关联储蓄卡" align="center" prop="bankNameCode" />
           <el-table-column label="开户日期" align="center" prop="activationDate" width="180">
             <template #default="scope">
@@ -50,8 +50,8 @@
       </div>
     </div>
     <!-- 添加或修改期货对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="futureStocksRef" :model="form" :rules="rules" label-width="140px">
+    <el-dialog :title="title" v-model="open" width="900px" append-to-body>
+      <el-form ref="futureStocksRef" :model="form" :inline="true" :rules="rules" label-width="130px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入名称" />
         </el-form-item>
@@ -61,17 +61,17 @@
         <el-form-item label="密码" prop="password">
           <el-input v-model="form.password" placeholder="请输入密码" />
         </el-form-item>
+        <el-form-item label="关联储蓄卡" prop="debitCard">
+          <el-select v-model="form.debitCard" placeholder="请选择关联储蓄卡" clearable>
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="期货交易中心账号" prop="tradingCenterCode">
           <el-input v-model="form.tradingCenterCode" placeholder="请输入期货交易中心账号" />
         </el-form-item>
         <el-form-item label="期货交易中心密码" prop="tradingCenterPassword">
           <el-input v-model="form.tradingCenterPassword" placeholder="请输入期货交易中心密码" />
         </el-form-item>
-        <el-form-item label="关联储蓄卡" prop="debitCard">
-          <el-select v-model="form.debitCard" placeholder="请选择关联储蓄卡" clearable>
-            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
-          </el-select>
-        </el-form-item>
         <el-form-item label="资金密码" prop="fundPassword">
           <el-input v-model="form.fundPassword" placeholder="请输入资金密码" />
         </el-form-item>
@@ -81,10 +81,10 @@
         <el-form-item label="手续费" prop="commission">
           <el-input v-model="form.commission" placeholder="请输入手续费" />
         </el-form-item>
-        <el-form-item label="保证金" prop="bond">
-          <el-input v-model="form.bond" placeholder="请输入保证金" />
+        <el-form-item label="保证金比例" prop="bond">
+          <el-input v-model="form.bond" placeholder="请输入保证金比例" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="备注" style="width: 812px" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
@@ -136,15 +136,15 @@ const data = reactive({
   },
   rules: {
     name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-    code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
-    password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
-    tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }],
-    tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }],
-    fundPassword: [{ required: true, message: '资金密码不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '账号不能为空', trigger: 'blur' }]
+    // password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
+    // tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }],
+    // tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }],
+    // fundPassword: [{ required: true, message: '资金密码不能为空', trigger: 'blur' }],
     // debitCard: [
     //   { required: true, message: '关联储蓄卡不能为空', trigger: 'blur' }
     // ],
-    activationDate: [{ required: true, message: '开户日期不能为空', trigger: 'blur' }]
+    // activationDate: [{ required: true, message: '开户日期不能为空', trigger: 'blur' }]
   }
 })
 
diff --git a/src/views/invest/lend/index.vue b/src/views/invest/lend/index.vue
index 0d0e597..ef89d78 100644
--- a/src/views/invest/lend/index.vue
+++ b/src/views/invest/lend/index.vue
@@ -104,6 +104,7 @@ const data = reactive({
   },
   rules: {
     name: [{ required: true, message: '借贷名称不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
     lendType: [{ required: true, message: '类型不能为空', trigger: 'blur' }]
   }
 })
diff --git a/src/views/invest/posmachine/index.vue b/src/views/invest/posmachine/index.vue
index ff92cb2..e60b7e1 100644
--- a/src/views/invest/posmachine/index.vue
+++ b/src/views/invest/posmachine/index.vue
@@ -73,28 +73,28 @@
             <el-option v-for="dict in pos_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="编号" prop="code">
-          <el-input v-model="form.code" placeholder="请输入编号" />
+        <el-form-item label="商户名称" prop="merchantName">
+          <el-input v-model="form.merchantName" placeholder="请输入商户名称" />
         </el-form-item>
         <el-form-item label="结算卡" prop="debitCard">
           <el-select v-model="form.debitCard" placeholder="请选择结算卡" clearable>
             <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="刷卡费率" prop="rate">
+          <el-input v-model="form.rate" placeholder="请输入刷卡费率" />
+        </el-form-item>
+        <el-form-item label="费率+" prop="ratePlus">
+          <el-input v-model="form.ratePlus" placeholder="请输入费率+" />
+        </el-form-item>
         <el-form-item label="厂商" prop="manufacture">
           <el-input v-model="form.manufacture" placeholder="请输入厂商" />
         </el-form-item>
         <el-form-item label="支付公司" prop="payCompany">
           <el-input v-model="form.payCompany" placeholder="请输入支付公司" />
         </el-form-item>
-        <el-form-item label="商户名称" prop="merchantName">
-          <el-input v-model="form.merchantName" placeholder="请输入商户名称" />
-        </el-form-item>
-        <el-form-item label="刷卡费率" prop="rate">
-          <el-input v-model="form.rate" placeholder="请输入刷卡费率" />
-        </el-form-item>
-        <el-form-item label="费率+" prop="ratePlus">
-          <el-input v-model="form.ratePlus" placeholder="请输入费率+" />
+        <el-form-item label="编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入编号" />
         </el-form-item>
         <el-form-item label="商户类型" prop="merchantType">
           <el-select v-model="form.merchantType" placeholder="请选择商户类型">
@@ -160,15 +160,15 @@ const data = reactive({
   },
   rules: {
     name: [{ required: true, message: 'pos机名称不能为空', trigger: 'blur' }],
-    code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
-    payCompany: [{ required: true, message: '支付公司不能为空', trigger: 'blur' }],
+    // code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+    // payCompany: [{ required: true, message: '支付公司不能为空', trigger: 'blur' }],
     type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
-    manufacture: [{ required: true, message: '厂商不能为空', trigger: 'blur' }],
+    // manufacture: [{ required: true, message: '厂商不能为空', trigger: 'blur' }],
     merchantName: [{ required: true, message: '商户名称不能为空', trigger: 'blur' }],
     rate: [{ required: true, message: '刷卡费率不能为空', trigger: 'blur' }],
     ratePlus: [{ required: true, message: '费率+不能为空', trigger: 'blur' }],
-    debitCard: [{ required: true, message: '结算卡不能为空', trigger: 'blur' }],
-    merchantType: [{ required: true, message: '商户类型不能为空', trigger: 'change' }]
+    debitCard: [{ required: true, message: '结算卡不能为空', trigger: 'blur' }]
+    // merchantType: [{ required: true, message: '商户类型不能为空', trigger: 'change' }]
   }
 })
 
diff --git a/src/views/invest/stocks/index.vue b/src/views/invest/stocks/index.vue
index a685184..72aa93f 100644
--- a/src/views/invest/stocks/index.vue
+++ b/src/views/invest/stocks/index.vue
@@ -56,14 +56,14 @@
         <el-form-item label="账号" prop="code">
           <el-input v-model="form.code" placeholder="请输入账号" />
         </el-form-item>
-        <el-form-item label="密码" prop="password">
-          <el-input v-model="form.password" placeholder="请输入密码" />
-        </el-form-item>
         <el-form-item label="关联储蓄卡" prop="debitCard">
           <el-select v-model="form.debitCard" placeholder="请选择关联储蓄卡" clearable>
             <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input v-model="form.password" placeholder="请输入密码" />
+        </el-form-item>
         <el-form-item label="开户日期" prop="activationDate">
           <el-date-picker clearable v-model="form.activationDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择开户日期"> </el-date-picker>
         </el-form-item>
@@ -123,12 +123,12 @@ const data = reactive({
   rules: {
     name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
     code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
-    password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
+    // password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
     tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }],
     tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }],
     fundPassword: [{ required: true, message: '资金密码不能为空', trigger: 'blur' }],
-    debitCard: [{ required: true, message: '关联储蓄卡不能为空', trigger: 'blur' }],
-    activationDate: [{ required: true, message: '开户日期不能为空', trigger: 'blur' }]
+    debitCard: [{ required: true, message: '关联储蓄卡不能为空', trigger: 'blur' }]
+    // activationDate: [{ required: true, message: '开户日期不能为空', trigger: 'blur' }]
   }
 })