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

src/common/components/drawer/index.vue

@@ -1,26 +1,25 @@
 <template>
-    <a-drawer
-        :placement="placement"
-        :closable="false"
-        :visible="visible"
-        :destroyOnClose="true"
-        class="bottomListed"
-        height="405px"
-    >
-        <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
-        <div class="collapse" @click="cancel">
-            <DoubleRightOutlined />
-        </div>
-        <div class="collapseCont">
-            <div class="title">{{ title }}</div>
-            <div class="content highContent">
-                <!-- <Listed></Listed> -->
-                <!-- <Delisting></Delisting> -->
-                <slot></slot>
-                <!-- <Trade></Trade> -->
-            </div>
-        </div>
-    </a-drawer>
+  <a-drawer :placement="placement"
+            :closable="false"
+            :visible="visible"
+            :destroyOnClose="true"
+            class="bottomListed"
+            height="405px">
+    <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
+    <div class="collapse"
+         @click="cancel">
+      <DoubleRightOutlined />
+    </div>
+    <div class="collapseCont">
+      <div class="title">{{ title }}</div>
+      <div class="content highContent">
+        <!-- <Listed></Listed> -->
+        <!-- <Delisting></Delisting> -->
+        <slot></slot>
+        <!-- <Trade></Trade> -->
+      </div>
+    </div>
+  </a-drawer>
 </template>
 
 <script lang="ts">

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_settlement/index.vue

@@ -39,7 +39,7 @@
                   </div>
                   <div class="middle">
                     <div>{{item.pricemove}}</div>
-                    <div>{{item.avalidqty}}{{item.enumdicname}}</div>
+                    <div>{{toFixed0(item.avalidqty)}}{{item.enumdicname}}</div>
                   </div>
                   <div class="right">
                     <template class="inputNumberBlock"
@@ -48,7 +48,7 @@
                                       v-model:value="item.num"
                                       style="width: 130px !important; height: 34px;"
                                       :disabled="!isChecked(item.ladingbillid)"
-                                      :max="item.avalidqty"
+                                      :max="toFixed0(item.avalidqty)"
                                       :min="0"></a-input-number>
                       <MinusOutlined @click="decrease(item)" />
                       <PlusOutlined @click="increase(item)" />
@@ -68,13 +68,13 @@
                 <span>，需合约数量</span>
                 <span class="white">{{getNeedContractNum()}}</span>
               </div>
-              <div class="yellow">升贴水1100</div>
+              <div class="yellow">升贴水{{selected ? selected.pricemove : '--'}}</div>
             </div>
             <div class="line2"
                  v-if="isBaseSpread()">
               <div>点价合约</div>
               <div class="right">
-                <div>{{selectedRow.goodscode}}</div>
+                <div>{{selected.pgoodscode ? selected.pgoodscode : ''}}</div>
                 <div>{{getDeliveryGoodsPrice()}}</div>
               </div>
             </div>
@@ -140,6 +140,8 @@ export default defineComponent({
         // 各种计算
         const { getStepValue, getCanSettlementNum, getNeedContractNum, getEstimatedPayment, XQty, PQty, getDeliveryGoodsPrice, increase, decrease, selctedNum } = handleCalculation(props.selectedRow);
 
+        const toFixed0 = (value: number) => +value.toFixed(0);
+
         function submit() {
             if (!selected.value) {
                 message.warn('请选择合约');
@@ -182,10 +184,12 @@ export default defineComponent({
                 console.log('param', param);
                 DeliveryOrder(param)
                     .then((res) => {
+                        console.log('res', res);
                         message.success('提交成功');
                     })
                     .catch((err) => {
                         console.log('err', err);
+                        message.error(err);
                     })
                     .finally(() => {
                         loading.value = false;
@@ -213,6 +217,8 @@ export default defineComponent({
             increase,
             decrease,
             selctedNum,
+            selected,
+            toFixed0,
         };
     },
 });
@@ -276,6 +282,7 @@ export default defineComponent({
                 .rounded-corners(5px);
                 .line1 {
                     display: inline-flex;
+                    user-select: none;
                     width: 100%;
                     height: 40px;
                     line-height: 40px;
@@ -295,6 +302,7 @@ export default defineComponent({
                 }
                 .line2 {
                     width: 100%;
+                    user-select: none;
                     padding: 12px 0 14px 0;
                     display: inline-flex;
                     > div {

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_settlement/setup.ts

@@ -74,7 +74,7 @@ export function handleCalculation(selectedRow: QueryTradePositionRsp) {
     // 商品合约单位
     const { agreeunit, goodscode, decimalplace, enableqty } = selectedRow
     function selctedNum() {
-        return selected.value ? selected.value.num : '--'
+        return selected.value ? selected.value.num.toFixed(0) : '--'
     }
     // 选中数量的 最小变动值 = 合约单位 * 最小交割系数 * 仓单商品的单位r2
     function getStepValue() {
@@ -90,7 +90,7 @@ export function handleCalculation(selectedRow: QueryTradePositionRsp) {
         if (deliveryGoods.value) {
             const { rratio1, rratio2, mindeliveryqty } = deliveryGoods.value
             const result = enableqty * agreeunit * mindeliveryqty * (rratio2 / rratio1)
-            return result.toFixed(2)
+            return result.toFixed(0)
         } else {
             return '--'
         }
@@ -120,7 +120,7 @@ export function handleCalculation(selectedRow: QueryTradePositionRsp) {
     // 需要合约手数 = (选中的数量 / (合约单位 * 最小交割系数 * (仓单商品的单位r2/合约商品的单位r1))) / (p1合约系数 / x合约系数)
     function getNeedContractNum() {
         const result = PQty()
-        return result ? result.toFixed(decimalplace) : '--'
+        return result ? result.toFixed(0) : '--'
     }
     // 预估货款 = 需要合约手数  * 合约交割价 * 合约单位 + 升贴水
     function getEstimatedPayment() {
@@ -145,6 +145,8 @@ export function handleCalculation(selectedRow: QueryTradePositionRsp) {
      * 所有权(X): 不取交割价，默认设为0，不影响交割流程
      */
     function getDeliveryGoodsPrice() {
+        const goodscode = selected.value?.pgoodscode
+        if (!goodscode) return '--'
         const item = getQuoteDayInfoByCode(goodscode);
         const has = (value: any) => value && value !== '--'
         let result = 0