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

src/common/components/filter/index.vue

@@ -85,7 +85,7 @@ ant-btn operBtn
     .ant-select-single:not(.ant-select-customize-input) + .ant-select-single:not(.ant-select-customize-input),
     .ant-select + .ant-space.ant-space-vertical {
         margin-left: 10px;
-        margin-top: 12px;
+        margin-top: 0px;
     }
     .ant-select-single:not(.ant-select-customize-input) {
         height: 26px;

src/views/business/exposure/list/history/index.vue

@@ -1,12 +1,12 @@
 <template>
     <!-- 采购: 历史敞口-->
     <div class="purchase-history">
-        <div class="chart-main" id="main"></div>
+        <div ref="chart" class="chart-main" id="main"></div>
     </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent, onMounted, ref } from 'vue';
 import { initData } from '@/common/methods';
 import * as echarts from 'echarts/core';
 import {
@@ -34,14 +34,13 @@ export default defineComponent({
     name: 'purchase-history',
     components: {},
     setup() {
+        const chart = ref();
         const option = {
             xAxis: {
                 type: 'category',
                 data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
             },
-            yAxis: {
-                type: 'value',
-            },
+            yAxis: {},
             series: [
                 {
                     data: [820, 932, 901, 934, 1290, 1330, 1320],
@@ -51,14 +50,18 @@ export default defineComponent({
             ],
         };
         onMounted(() => {
-            const ele = document.getElementById('main') as HTMLElement;
-            const myChart = echarts.init(ele);
-            myChart.setOption(option);
+            setTimeout(() => {
+                const ele = chart.value as HTMLElement;
+                const myChart = echarts.init(ele);
+                myChart.setOption(option);
+            }, 0);
         });
         initData(() => {
             option;
         });
-        return {};
+        return {
+            chart,
+        };
     },
 });
 </script>

src/views/business/exposure/list/realTime/index.vue

@@ -27,6 +27,9 @@
                 <template #middlegoodsname="{ record }" v-if="!isPingAnOem()">
                     <span>{{ record.middlegoodsname + '/' + record.middlegoodscode }}</span>
                 </template>
+                <template #convertfactor="{record}">
+                    <span>{{record.convertratio}}</span>
+                </template>
                 <template #goodsname="{ record }" v-if="!isPingAnOem()">
                     <span>{{ record.goodsname + '/' + record.goodscode }}</span>
                 </template>

src/views/information/spot-contract/components/check/setup.ts

@@ -12,10 +12,6 @@ export function handleForm() {
         SaleUserID: undefined, // uint64 业务员ID
         Remark: ''
     })
-    // 验证跟单员
-    async function v_MerUser(rule: RuleObject, value: number) {
-        return validateCommon(value, '请选择跟单员')
-    }
     // 验证交易员
     async function v_TradeUser(rule: RuleObject, value: number) {
         return validateCommon(value, '请选择交易用户')
@@ -25,7 +21,6 @@ export function handleForm() {
         return validateCommon(value, '请选择业务员')
     }
     const rules = {
-        MerUserID: [{ required: true, validator: v_MerUser, trigger: 'blur' }],
         TradeUserID: [{ required: true, validator: v_TradeUser, trigger: 'blur' }],
         SaleUserID: [{ required: true, validator: v_SaleUser, trigger: 'blur' }],
     }

src/views/manage/business-review/components/somepriceDetail/index.vue

@@ -43,26 +43,26 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="点价价格">
-                            <span class="white">{{ formatValue(selectedRow.pricedPrice) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.pricedPrice)+'元/吨' }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>
                 <a-row :gutter="24">
                     <a-col :span="12">
                         <a-form-item label="升贴水">
-                            <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.pricemove)+'元/吨' }}</span>
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="点价数量">
-                            <span class="white">{{ formatValue(selectedRow.pricedQty) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.pricedQty)+'吨' }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>
                 <a-row :gutter="24">
                     <a-col :span="12">
                         <a-form-item label="点价金额">
-                            <span class="white">{{ formatValue(selectedRow.amount) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.amount)+'元' }}</span>
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">

src/views/manage/business-review/list/someprice/index.vue

@@ -69,13 +69,17 @@ export default defineComponent({
             switch (routeName) {
                 case 'someprice_checkpending':
                     queryTable(QueryBusinessDj, { applystatus: '1' }).then(res => {
-                        tableList.value = sortTime<QryBusinessDjRsp>(res, 'audittime', false);
+                        tableList.value.sort((a,b)=>{
+                            return moment(b.audittime).valueOf()-moment(a.audittime).valueOf()
+                        })
                     });
                     break;
                 case 'someprice_performance':
                     queryTable(QueryBusinessDj, { applystatus: '2' }).then(res => {
-                        tableList.value = sortTime<QryBusinessDjRsp>(res, 'audittime', false);
-                    });;
+                        tableList.value.sort((a,b)=>{
+                            return moment(b.audittime).valueOf()-moment(a.audittime).valueOf()
+                        })
+                    });
             }
         };
 
@@ -128,7 +132,6 @@ export default defineComponent({
                 return [];
             }
         }
-
         return {
             ...handleComposeTable<QryBusinessDjRsp>(param),
             handlePermissionBtn,

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_swap/index.vue

@@ -183,6 +183,7 @@ export default defineComponent({
         height: 26px !important;
         border: 1px solid @m-grey46 !important;
         .ant-calendar-picker-input.ant-input {
+
             height: 26px;
             line-height: 26px;
             &::placeholder {