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

src/common/constants/enumsName.ts

@@ -841,6 +841,62 @@ export function getApplyStatusFinanceName(type: number) {
     return result
 }
 
+//:预约成功 1:待初审 2:初审通过 3:初审拒绝 4:初审失败 5复审通过 6:复审拒绝 7:复审失败 8:已撤销
+export function getPickUpTypeName(type: number) {
+    let result = "--"
+    switch (type) {
+        case 0:
+            result = "预约成功"
+            break;
+        case 1:
+            result = '待审核'
+            break
+        case 2:
+            result = '初审通过'
+            break
+        case 3:
+            result = '初审拒绝'
+            break
+        case 4:
+            result = '初审失败'
+            break
+        case 5:
+            result = '复审通过'
+            break
+        case 6:
+            result = '复审拒绝'
+            break
+        case 7:
+            result = '复审失败'
+            break
+        case 8:
+            result = '已撤销'
+            break
+    }
+    return result
+}
+
+//申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销
+export function getPickUpStatusName(type: number) {
+    let result = "--"
+    switch (type) {
+        case 1:
+            result = '预约入库'
+            break
+        case 2:
+            result = '预约出库'
+            break
+        case 3:
+            result = '入库注册'
+            break
+        case 4:
+            result = '出库注销'
+            break
+    }
+    return result
+}
+
+
 /**
  * //合同状态 - 1:待确认 2:已确认 3:确认拒绝 4:已支付保证金 5:已激活 6:已违约 7:到期结束 8:延期结束 9:违约结束 1number;
  //:已注销 11:已关闭 99:未提交

src/views/order/financing_manager/components/financing_manager_contract/components/buyback/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 付款-->
+  <!-- 回购仓单 -->
   <Drawer :title="'回购仓单'"
           :placement="'right'"
           :visible="visible"
@@ -29,17 +29,17 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="购买数量">
-                <span class="white ml10">1000吨</span>
+                <span class="white ml10">{{ selectedRow.wrqty + " " + selectedRow.enumdicname }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="已回购数量">
-                <span class="white ml10">1000吨</span>
+                <span class="white ml10">{{ selectedRow.buybackwrpositionqty + " " + selectedRow.enumdicname }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="待回购数量">
-                <span class="white ml10">1000吨</span>
+                <span class="white ml10">{{ selectedRow.remainwrpositionqty + " " + selectedRow.enumdicname }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -52,17 +52,19 @@
                                 style="width: 200px" />
 
                 <div class="day">吨</div>
-                <div class="tip">本次可回购数量30吨</div>
+                  <!-- 本次可回购数量=min{资金方对应仓单头寸可用数量，融资合同剩余待回购数量} -->
+                <div class="tip">{{ "本次可回购数量" + selectedRow.remainwrpositionqty + " " + selectedRow.enumdicname }}</div>
               </a-form-item>
             </a-col>
             <a-col :span="12">
+                <!--（回购数量/合同剩余数量） * 合同剩余金额 -->
               <a-form-item label="本次回购金额">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ (((formState.num ===  0 ? 1 : formState.num) * selectedRow.remainamount) / selectedRow.remainwrpositionqty).toFixed(2) + " 元" }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="剩余保证金">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ selectedRow.initmargin + " 元" }}</span>
               </a-form-item>
             </a-col>
           </a-row>

src/views/order/financing_manager/components/financing_manager_contract/components/pay/index.vue

@@ -12,22 +12,22 @@
           <a-row :gutter="24">
             <a-col :span="12">
               <a-form-item label="借款金额">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ selectedRow.lenderamount + " 元"}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="剩余金额">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ selectedRow.remainamount + " 元"}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="已计费用">
-                <span class="white ml10">100.00</span>
+                <span class="white ml10">{{ selectedRow.totalinterest + " 元"}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="费用欠款">
-                <span class="red ml10">100.00</span>
+                <span class="red ml10">{{ selectedRow.interestdebt + " 元"}}</span>
               </a-form-item>
             </a-col>
           </a-row>

src/views/order/spot_warran/components/spot_warrant_in_and_out_warehouse/index.vue

@@ -19,6 +19,17 @@
                  class="btn-list-sticky"
                  @click="openComponent" />
       </template>
+
+        <!-- applytype 类型-->
+        <template #applytype="{ record }">
+            <span>{{ getPickUpStatusName(record.applytype) }}</span>
+        </template>
+
+        <!-- applystatus 状态 -->
+        <template #applystatus="{ record }">
+            <span>{{ getPickUpTypeName(record.applystatus) }}</span>
+        </template>
+
     </a-table>
     <component :is="componentId"
                v-if="componentId"
@@ -37,6 +48,7 @@ import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { BtnList as BtnListType } from '@/common/components/btnList/interface';
+import {getPickUpStatusName, getPickUpTypeName} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_in_and_out_warehouse,
@@ -74,6 +86,8 @@ export default defineComponent({
             tableList,
             expandIcon,
             handleBtnList,
+            getPickUpStatusName,
+            getPickUpTypeName
         };
     },
 });