Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

src/packages/pc/views/account/receipt/components/edit/index.vue

@@ -60,10 +60,10 @@ const formRules: FormRules = {
     ReceiptType: [{ required: true, message: '请选择发票类型' }],
     UserName: [{ required: true, message: '请输入发票抬头', trigger: 'blur' }],
     TaxpayerID: [{ required: true, message: '请输入税号', trigger: 'blur' }],
-    ReceiptBank: [{ required: true, message: '请输入开户银行', trigger: 'blur' }],
-    ReceiptAccount: [{ required: true, message: '请输入银行账号', trigger: 'blur' }],
-    Address: [{ required: true, message: '请输入企业地址', trigger: 'blur' }],
-    ContactInfo: [{ required: true, message: '请输入企业电话', trigger: 'blur' }],
+    // ReceiptBank: [{ required: true, message: '请输入开户银行', trigger: 'blur' }],
+    // ReceiptAccount: [{ required: true, message: '请输入银行账号', trigger: 'blur' }],
+    // Address: [{ required: true, message: '请输入企业地址', trigger: 'blur' }],
+    // ContactInfo: [{ required: true, message: '请输入企业电话', trigger: 'blur' }],
 }
 
 const onCancel = (isRefresh = false) => {

src/packages/pc/views/footer/capital/summary/index.vue

@@ -10,10 +10,6 @@
         <template #balance>
             {{ accountInfo.balance?.toFixed(2) }}
         </template>
-        <!-- 持仓市值 -->
-        <template #curamount>
-            {{ accountInfo.curamount?.toFixed(2) }}
-        </template>
         <!-- 占用资金 -->
         <template #oriusedmargin>
             {{ accountInfo.oriusedmargin?.toFixed(2) }}
@@ -26,6 +22,14 @@
         <template #freezeMargin>
             {{ freezeMargin.toFixed(2) }}
         </template>
+        <!-- 今日入金 -->
+        <template #inamount="{ value }">
+            {{ value.toFixed(2) }}
+        </template>
+        <!-- 今日出金 -->
+        <template #outamount="{ value }">
+            {{ value.toFixed(2) }}
+        </template>
         <!-- 状态 -->
         <template #tradestatus="{ value }">
             {{ getTradeStatusName(value) }}
@@ -66,12 +70,13 @@ const { accountInfo, freezeMargin, avaiableMoney } = accountStore.$toRefs()
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'accountid', label: '资金账号' },
-    { prop: 'balance', label: '净值' },
-    { prop: 'curamount', label: '持仓市值' },
-    { prop: 'currentbalance', label: '余额' },
+    { prop: 'balance', label: '期初余额' },
+    { prop: 'currentbalance', label: '期末余额' },
     { prop: 'avaiableMoney', label: '可用资金' },
-    { prop: 'freezeMargin', label: '冻结资金' },
     { prop: 'oriusedmargin', label: '占用资金' },
+    { prop: 'freezeMargin', label: '冻结资金' },
+    { prop: 'inamount', label: '今日入金' },
+    { prop: 'outamount', label: '今日出金' },
     { prop: 'tradestatus', label: '状态' },
 ])
 </script>

src/packages/pc/views/footer/goods/position/index.vue

@@ -11,7 +11,7 @@
         </template>
         <!-- 浮动盈亏-->
         <template #closepl="{ row }">
-            <span :class="lastColor(row.goodscode)">{{ closepl(row) }}</span>
+            <span :class="lastColor(row.goodscode)">{{ closepl(row).toFixed(2) }}</span>
         </template>
          <!-- 展开行 -->
          <template #expand>
@@ -83,7 +83,6 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'last', label: '现价' },
     { prop: 'curholderamount', label: '持仓金额' },
     { prop: 'usedmargin', label: '占用保证金' },
-    { prop: 'marketamount', label: '市值' },
     { prop: 'closepl', label: '浮动盈亏' },
 ])
 

src/packages/pc/views/query/trade/goods/history/index.vue

@@ -32,6 +32,7 @@ import { useRequest } from '@/hooks/request'
 import { queryHisTradeDetail } from '@/services/api/order'
 import { getBuildTypeName, getBuyOrSellName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
+import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { filterOptons, getQueryParams } = useDataFilter<Model.HisTradeDetailReq>()
 const filterDate = shallowRef<string[]>([])