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

src/services/go/wrtrade/interface.ts

@@ -163,6 +163,7 @@ export interface WrPosition {
     freezeqty: number;//总冻结数量
     modifytime: string;//修改时间(过户时间)
     optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    minivalue: number;
     pledgeqty: number;//质押数量
     querytype: number;//查询类型 1-现货汇总 2-库存汇总(订单汇总) 3-现货明细
     sellexcuteqty: number;//销售履约中数量
@@ -881,30 +882,30 @@ export interface QueryWrOutInApplyReq {
 }
 
 
-export interface WrOutInApply{
-    applyid	:string;//申请单id
-    applystatus	:number;//申请状态 - number;
-//:预约成功 1:待初审 2:初审通过 3:初审拒绝 4:初审失败 5复审通过 6:复审拒绝 7:复审失败 8:已撤销
-    applytime	:string;//申请时间
-    applytype	:number;//申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销
-    deliverygoodscode	:string;//品种代码
-    deliverygoodsid	:number;//品种ID
-    deliverygoodsname	:string;//品种名称
-    enumdicname	:string;//单位名称
-    expresscompany	:string;//物流公司
-    expressnum	:string;//物流单号
-    minivalue	:number;//现货商品最小变动值
-    optioncompare	:string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
-    qty	:number;//数量
-    userid	:number;//用户id
-    warehouseid	:number;//仓库ID
-    warehousename	:string;//仓库名称
-    wrfactortypeid	:string;//仓单要素类型ID(212+Unix秒时间戳(1number;
-//位)+xxxxxx)
-    wrfactortypename	:string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
-    wrstandardcode	:string;//现货商品代码
-    wrstandardid	:number;//现货商品ID
-    wrstandardname	:string;//商品名称
-    wrtypename	:string;//商品
+export interface WrOutInApply {
+    applyid: string;//申请单id
+    applystatus: number;//申请状态 - number;
+    //:预约成功 1:待初审 2:初审通过 3:初审拒绝 4:初审失败 5复审通过 6:复审拒绝 7:复审失败 8:已撤销
+    applytime: string;//申请时间
+    applytype: number;//申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销
+    deliverygoodscode: string;//品种代码
+    deliverygoodsid: number;//品种ID
+    deliverygoodsname: string;//品种名称
+    enumdicname: string;//单位名称
+    expresscompany: string;//物流公司
+    expressnum: string;//物流单号
+    minivalue: number;//现货商品最小变动值
+    optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    qty: number;//数量
+    userid: number;//用户id
+    warehouseid: number;//仓库ID
+    warehousename: string;//仓库名称
+    wrfactortypeid: string;//仓单要素类型ID(212+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypename: string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+    wrstandardcode: string;//现货商品代码
+    wrstandardid: number;//现货商品ID
+    wrstandardname: string;//商品名称
+    wrtypename: string;//商品
 }
 

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/index.vue

@@ -71,7 +71,7 @@
                                 v-model:value="formState.DelistMinQty"
                                 style="width: 140px" />
                 <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-                <div class="tip">最小单位：1{{selectedRow.enumdicname}}</div>
+                <div class="tip">最小单位：{{selectedRow.minivalue}}{{selectedRow.enumdicname}}</div>
               </a-form-item>
             </a-col>
           </a-row>

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/setup.ts

@@ -92,10 +92,10 @@ export function handleNumAndPrice() {
     // 履约保证金
     function getMargin() {
         if (hasRules()) {
-            const { sellmarginvalue, buymarginalgorithm } = getRules()[0]
-            // 浮动价 履约保证金=估算总额*买方履约保证金比例
-            // 一口价 履约保证金=挂牌金额*买方履约保证金比例
-            const margin = buymarginalgorithm === 1 ? getMoney() * sellmarginvalue : getMoney() + sellmarginvalue
+            const { sellmarginvalue2, sellmarginalgorithm } = getRules()[0]
+            // 浮动价 履约保证金=估算总额*卖方履约保证金比例
+            // 一口价 履约保证金=挂牌金额*卖方履约保证金比例
+            const margin = sellmarginalgorithm === 1 ? getMoney() * sellmarginvalue2 : getMoney() + sellmarginvalue2
             return Number(margin.toFixed(2))
         } else {
             return 0

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/index.vue

@@ -173,7 +173,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, PropType, ref } from 'vue';
+import { defineComponent, onBeforeUnmount, onMounted, onUnmounted, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
 import { QueryWrPositionReq, WrHoldLB, WrPosition } from '@/services/go/wrtrade/interface';

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/setup.ts

@@ -5,7 +5,7 @@ import { getRules } from '@/services/bus/rules';
 import { Goods } from "@/services/go/ermcp/goodsInfo/interface";
 import { WrHoldLB } from "@/services/go/wrtrade/interface";
 import { RuleObject } from 'ant-design-vue/lib/form/interface';
-import { reactive, ref, UnwrapRef } from "vue";
+import { onBeforeUnmount, reactive, ref, UnwrapRef } from "vue";
 import { ListingForm } from "./interface";
 
 const formState: UnwrapRef<ListingForm> = reactive({
@@ -47,6 +47,9 @@ export function handleForm(data: WrHoldLB) {
         PriceMove: [{ required: true, message: '请输入升贴水', trigger: 'blur', type: 'number', }],
         goodsid: [{ required: true, validator: v_group, }],
     }
+    onBeforeUnmount(() => {
+        formRef.value.resetFields();
+    });
     return { rules, formState, formRef }
 }