Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/constants/enumsName.ts

@@ -403,13 +403,13 @@ export function getOrderStatusName(type: number): string {
             result = "配对成功";
             break
         case 6:
-            result = "已撤销";
+            result = "已撤";
             break
         case 7:
-            result = "部分成交";
+            result = "部成";
             break
         case 8:
-            result = "已成交";
+            result = "已成";
             break
         case 9:
             result = "部成部撤";
@@ -418,7 +418,7 @@ export function getOrderStatusName(type: number): string {
             result = "成交失败";
             break
         case 11:
-            result = "已拒绝";
+            result = "委托拒绝";
             break
         case 12:
             result = "经过摘牌";
@@ -456,6 +456,18 @@ export function getOrderStatusName(type: number): string {
         case 23:
             result = "优惠券处理中";
             break
+        case 24:
+            result = "仓单生成失败";
+            break
+        case 25:
+            result = "首付扣款失败";
+            break
+        case 26:
+            result = "履约失";
+            break
+        case 27:
+            result = "撤单解冻贷款失";
+            break
     }
     return result
 }

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/delisting/index.vue

@@ -41,8 +41,7 @@
           <a-col :span="24"
                  v-if="isBargin()">
             <a-form-item label="摘牌价格"
-                         name="price"
-                         class="inputIconBox">
+                         name="price">
               <a-input-number class="commonInput"
                               style="width: 260px"
                               :min="0"
@@ -128,7 +127,7 @@
           <a-row :gutter="24">
             <a-col :span="24">
               <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
+                <span class="white ml8">{{getMargin()}}</span>
               </a-form-item>
             </a-col>
           </a-row>
@@ -221,10 +220,21 @@ export default defineComponent({
                 return '--';
             }
         }
+        // 履约保证金
+        function getMargin() {
+            const price = isBargin() ? formState.price : props.selectedRow.fixedprice;
+            const num = formState.num;
+            let result = 0;
+            const { marginvalue } = props.selectedRow;
+            if (price && num && marginvalue) {
+                result = (price * num * marginvalue) / 100;
+            }
+            return result ? result.toFixed(2) : '--';
+        }
         function getMaxNum() {
             const qty = props.selectedRow.orderqty;
             let result = 0;
-            if (isBuy()) {
+            if (!isBuy()) {
                 // 交易规则
                 const rules = getRules();
                 const { buymarginvalue } = rules.length ? rules[0] : { buymarginvalue: 0 };
@@ -278,7 +288,7 @@ export default defineComponent({
                 } else {
                     // 首先确定  这是仓单贸易的有仓单挂摘牌 HasWr = 1
                     // 其次判断  摘牌 1。摘买 （需要通过自己的仓单进行摘买）  2。摘卖 （不需要通过仓单）
-                    const param: HdWRDealOrderReq = {
+                    const param = {
                         UserID: getUserId(), // uint32 用户ID
                         AccountID: getSelectedAccountId(), // uint64 资金账号
                         RelatedWRTradeOrderID: props.selectedRow.wrtradeorderid, // uint64 关联委托单号(摘牌委托关联挂牌委托单ID)
@@ -291,7 +301,7 @@ export default defineComponent({
                         OperatorID: getUserId(), // uint64 操作员账号ID
                         BuyOrSell: 0, // uint32 买卖方向
                         ApplyID: 0, // uint64 申请ID
-                        // LadingBillId: 0, // uint64 提单id(wrholdlb的LadingBillId字段),卖的时候填写
+                        LadingBillId: 0, // uint64 提单id(wrholdlb的LadingBillId字段),卖的时候填写
                         SubNum: 0, // uint64 提单子单号(wrholdlb的SubNum字段),卖的时候填写
                         WRFactorTypeId: Long.fromString(props.selectedRow.wrfactortypeid), // uint64 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写
                         TradeDate: moment().format('YYYYMMDD'), // string 交易日
@@ -303,13 +313,13 @@ export default defineComponent({
                     // 摘买方向
                     if (isBuy()) {
                         param.BuyOrSell = BuyOrSell.sell;
-                    } else {
-                        param.BuyOrSell = BuyOrSell.buy;
-                        param.LadingBillId = res.LadingBillId;
+                        param.LadingBillId = Long.fromString(res.LadingBillId);
                         const item = wrHoldList.value.find((el) => el.id === res.LadingBillId);
                         if (item) {
                             param.SubNum = +item.subnum;
                         }
+                    } else {
+                        param.BuyOrSell = BuyOrSell.buy;
                     }
 
                     requestResultLoadingAndInfo(HdWRDealOrder, param, loading, ['摘牌成功', '摘牌失败:']).then(() => {
@@ -335,6 +345,7 @@ export default defineComponent({
             loading,
             getMaxNum,
             isCanpart,
+            getMargin,
         };
     },
 });

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/delisting/index.vue

@@ -41,8 +41,7 @@
           <a-col :span="24"
                  v-if="isBargin()">
             <a-form-item label="摘牌价格"
-                         name="price"
-                         class="inputIconBox">
+                         name="price">
               <a-input-number class="commonInput"
                               style="width: 260px"
                               :min="0"
@@ -128,7 +127,7 @@
           <a-row :gutter="24">
             <a-col :span="24">
               <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
+                <span class="white ml8">{{getMargin()}}</span>
               </a-form-item>
             </a-col>
           </a-row>
@@ -221,10 +220,21 @@ export default defineComponent({
                 return '--';
             }
         }
+        // 履约保证金
+        function getMargin() {
+            const price = isBargin() ? formState.price : props.selectedRow.fixedprice;
+            const num = formState.num;
+            let result = 0;
+            const { marginvalue } = props.selectedRow;
+            if (price && num && marginvalue) {
+                result = (price * num * marginvalue) / 100;
+            }
+            return result ? result.toFixed(2) : '--';
+        }
         function getMaxNum() {
             const qty = props.selectedRow.orderqty;
             let result = 0;
-            if (isBuy()) {
+            if (!isBuy()) {
                 // 交易规则
                 const rules = getRules();
                 const { buymarginvalue } = rules.length ? rules[0] : { buymarginvalue: 0 };
@@ -278,7 +288,7 @@ export default defineComponent({
                 } else {
                     // 首先确定  这是仓单贸易的有仓单挂摘牌 HasWr = 1
                     // 其次判断  摘牌 1。摘买 （需要通过自己的仓单进行摘买）  2。摘卖 （不需要通过仓单）
-                    const param: HdWRDealOrderReq = {
+                    const param = {
                         UserID: getUserId(), // uint32 用户ID
                         AccountID: getSelectedAccountId(), // uint64 资金账号
                         RelatedWRTradeOrderID: props.selectedRow.wrtradeorderid, // uint64 关联委托单号(摘牌委托关联挂牌委托单ID)
@@ -291,7 +301,7 @@ export default defineComponent({
                         OperatorID: getUserId(), // uint64 操作员账号ID
                         BuyOrSell: 0, // uint32 买卖方向
                         ApplyID: 0, // uint64 申请ID
-                        // LadingBillId: 0, // uint64 提单id(wrholdlb的LadingBillId字段),卖的时候填写
+                        LadingBillId: 0, // uint64 提单id(wrholdlb的LadingBillId字段),卖的时候填写
                         SubNum: 0, // uint64 提单子单号(wrholdlb的SubNum字段),卖的时候填写
                         WRFactorTypeId: Long.fromString(props.selectedRow.wrfactortypeid), // uint64 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写
                         TradeDate: moment().format('YYYYMMDD'), // string 交易日
@@ -303,13 +313,13 @@ export default defineComponent({
                     // 摘买方向
                     if (isBuy()) {
                         param.BuyOrSell = BuyOrSell.sell;
-                    } else {
-                        param.BuyOrSell = BuyOrSell.buy;
-                        param.LadingBillId = res.LadingBillId;
+                        param.LadingBillId = Long.fromString(res.LadingBillId);
                         const item = wrHoldList.value.find((el) => el.id === res.LadingBillId);
                         if (item) {
                             param.SubNum = +item.subnum;
                         }
+                    } else {
+                        param.BuyOrSell = BuyOrSell.buy;
                     }
 
                     requestResultLoadingAndInfo(HdWRDealOrder, param, loading, ['摘牌成功', '摘牌失败:']).then(() => {
@@ -335,6 +345,7 @@ export default defineComponent({
             loading,
             getMaxNum,
             isCanpart,
+            getMargin,
         };
     },
 });