Merge remote-tracking branch 'origin/master'

src/common/setup/table/button.ts

@@ -12,14 +12,19 @@ import { BtnClassName, BtnList, ButtonListKey } from './interface';
  */
 function getClassName(val: string): BtnClassName {
     let result: BtnClassName = 'btnDeafault'
-    if (val.includes('disable') || val.includes('cancle') || val.includes('delete')) {
-        result = 'btnDanger'
-    } else if (val === '') {
-        result = 'btnDeafault'
-    } else if (val.includes('add')) {
-        result = 'operBtn'
-    } else {
-        result = 'btnPrimary'
+    const btnDanger = ['disable', 'cancle', 'cancel', 'delete', 'logout', 'locked']
+    const operBtn = ['add', 'modify', 'reset', 'credit']
+    const map = new Map<BtnClassName, string[]>([
+        ['btnDanger', btnDanger],
+        ['operBtn', operBtn],
+    ])
+    for (const [key, value] of map) {
+        for (const item of value) {
+            if (val.includes(item)) {
+                result = key
+                break;
+            }
+        }
     }
     return result
 }

src/views/business/purchase/components/settlement/index.vue

@@ -323,20 +323,45 @@ export default defineComponent({
             const wrapEl = unref(formRef);
             wrapEl.validate().then((nameList:any) => {
                 delete nameList.IsChecked;
-                loading.value = true;
-                const params: SettlementReq = checkedObj.value.adjustMargin === 1?{
-                    ReckonRealQty: formState.ReckonRealQty!, // 交收量
-                    ReckonOtherAmount: formState.ReckonOtherAmount!, // 其它费用
-                    AddMargin: formState.AddMargin!, // 追加保证金
-                    ReckonAdjustAmount: checkedObj.value.adjustAmount === 1 ? formState.ReckonRealQty! : -1*formState.ReckonRealQty!, // 调整金额 +-代表增减
-                }:{
-                    ReckonRealQty: formState.ReckonRealQty!, // 交收量
-                    ReckonOtherAmount: formState.ReckonOtherAmount!, // 其它费用
-                    DecMargin: formState.DecMargin!, // 减少保证金
-                    ReckonAdjustAmount: checkedObj.value.adjustAmount === 1 ? formState.ReckonRealQty! : -1*formState.ReckonRealQty!, // 调整金额 +-代表增减
-                };
+                const param: SettlementReq =  {};
+                const {ReckonRealQty, ReckonOtherAmount, AddMargin, ReckonAdjustAmount, DecMargin, Remark } = formState
+                // 交收量
+                if(ReckonRealQty) {
+                  param.ReckonRealQty = ReckonRealQty
+                }
+                 // 其它费用
+                if(ReckonOtherAmount) {
+                  param.ReckonOtherAmount = ReckonOtherAmount
+                }
+                // 追加保证金
+                if(AddMargin) {
+                  param.AddMargin = AddMargin
+                }
+                // 减少保证金
+                if(DecMargin) {
+                  param.DecMargin = DecMargin
+                }
+                // 调整金额 
+                if(ReckonAdjustAmount) {
+                  const temp = checkedObj.value.adjustAmount === 1 ? 1  : -1
+                  param.ReckonAdjustAmount = ReckonAdjustAmount * temp
+                }
+                if(Remark) {
+                  param.Remark = Remark
+                }
+                // const params: SettlementReq = checkedObj.value.adjustMargin === 1?{
+                //     ReckonRealQty: formState.ReckonRealQty!, // 交收量
+                //     ReckonOtherAmount: formState.ReckonOtherAmount!, // 其它费用
+                //     AddMargin: formState.AddMargin!, // 追加保证金
+                //     ReckonAdjustAmount: checkedObj.value.adjustAmount === 1 ? formState.ReckonRealQty! : -1*formState.ReckonRealQty!, // 调整金额 +-代表增减
+                // }:{
+                //     ReckonRealQty: formState.ReckonRealQty!, // 交收量
+                //     ReckonOtherAmount: formState.ReckonOtherAmount!, // 其它费用
+                //     DecMargin: formState.DecMargin!, // 减少保证金
+                //     ReckonAdjustAmount: checkedObj.value.adjustAmount === 1 ? formState.ReckonRealQty! : -1*formState.ReckonRealQty!, // 调整金额 +-代表增减
+                // };
                 // 发出交收请求
-                settlementReq(props.selectedRow.spotcontractid, params, loading)
+                settlementReq(props.selectedRow.spotcontractid, param, loading)
                     .then(() => {
                         cancel();
                         context.emit('refresh');

src/views/information/account_info/compoments/credit-futures/index.vue

@@ -22,27 +22,35 @@
     <a-form class="inlineForm">
       <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="账户权限"
+          <a-form-item label="账户名称"
                        name="userid">
-            <span class="white">{{selectedData.rolename}}</span>
+            <span class="white">王二5001</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="账户名称"
-                       name="logincode">
-            <span class="white">{{selectedData.logincode}}</span>
+          <a-form-item label="资金账号"
+                       name="">
+            <span class="white">250000000017</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="授信总额"
+                       name="">
+            <span class="white"> 请输入授信金额</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="登录账号"
-                       name="accountname">
-            <span class="white">{{selectedData.loginname}}</span>
+          <a-form-item label="子账户当前余额"
+                       name="">
+            <span class="white">10000.00</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="手机号码"
-                       name="mobile">
-            <span class="white">{{selectedData.mobile}}</span>
+          <a-form-item label="授信金额"
+                       class="relative"
+                       name="">
+            <a-input class="dialogInput" style="width: 200px" placeholder="请输入授信金额"></a-input>
+            <div class="tip">正数为增加，负数为减少</div>
           </a-form-item>
         </a-col>
       </a-row>

src/views/information/account_info/compoments/modify-futures/index.vue

@@ -108,9 +108,11 @@ export default defineComponent({
         const { rules, formState, formRef, initFormData } = handleAddOrModifyFuturesForm();
         watchEffect(() => {
             if (visible.value) {
+              console.log(props.selectedData);
+              
                 mergeTwoObj(formState, props.selectedData?.mainAcc);
                 if(props.selectedData?.mainAcc) {
-                  formState.accountid = props.selectedData.mainAcc.accountid.toString()
+                  formState.accountid = props.selectedData.mainAcc.hedgeaccountcode
                 }
                 queryResultLoadingAndInfo(QueryFuturesCompany, loading).then((res) => {
                     companyList.value = res;

src/views/information/spot-contract/list/checkpending/index.vue

@@ -13,7 +13,7 @@
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                :data-source="tableList"
-               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 153px)' }">
+               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />

src/views/information/spot-contract/list/finished/index.vue

@@ -13,7 +13,7 @@
                :customRow="Rowclick"
                rowKey="key"
                :data-source="tableList"
-               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 153px)' }">
+               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />

src/views/information/spot-contract/list/performance/index.vue

@@ -13,7 +13,7 @@
                :customRow="Rowclick"
                rowKey="key"
                :data-source="tableList"
-               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 153px)' }">
+               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -13,7 +13,7 @@
                :customRow="Rowclick"
                rowKey="key"
                :data-source="tableList"
-               :scroll="{ x: '100%', y: 'calc(100vh - 153px)' }">
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />