update

src/assets/styles/symbol_color/iconfont.json

@@ -6,6 +6,69 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "14033442",
+      "name": "敲定",
+      "font_class": "qiaoding",
+      "unicode": "e750",
+      "unicode_decimal": 59216
+    },
+    {
+      "icon_id": "14033467",
+      "name": "查询",
+      "font_class": "chaxun",
+      "unicode": "e767",
+      "unicode_decimal": 59239
+    },
+    {
+      "icon_id": "14033589",
+      "name": "数据图",
+      "font_class": "shujutu",
+      "unicode": "e7b9",
+      "unicode_decimal": 59321
+    },
+    {
+      "icon_id": "14033474",
+      "name": "交易记录",
+      "font_class": "jiaoyijilu",
+      "unicode": "e76e",
+      "unicode_decimal": 59246
+    },
+    {
+      "icon_id": "14033479",
+      "name": "账单2",
+      "font_class": "zhangdan2",
+      "unicode": "e773",
+      "unicode_decimal": 59251
+    },
+    {
+      "icon_id": "14033405",
+      "name": "首页",
+      "font_class": "shouye",
+      "unicode": "e730",
+      "unicode_decimal": 59184
+    },
+    {
+      "icon_id": "9554944",
+      "name": "暂无数据 ",
+      "font_class": "zanwushuju",
+      "unicode": "e71f",
+      "unicode_decimal": 59167
+    },
+    {
+      "icon_id": "14033478",
+      "name": "名片",
+      "font_class": "mingpian",
+      "unicode": "e772",
+      "unicode_decimal": 59250
+    },
+    {
+      "icon_id": "14033440",
+      "name": "金条",
+      "font_class": "jintiao",
+      "unicode": "e74e",
+      "unicode_decimal": 59214
+    },
+    {
       "icon_id": "14033391",
       "name": "账单",
       "font_class": "zhangdan",

src/layout/components/menu.vue

@@ -25,97 +25,95 @@ import { getHasBottom } from '@/common/setup/order/orderData';
 import { useRoute } from 'vue-router';
 
 function handleMenu(context: SetupContext) {
-    const selectedKeys = ref<string[]>(['1-1']);
-    const openKeys = ref<string[]>(['1']);
-    const preOpenKeys = ref<string[]>(['1']);
-    const menuList = APP.getRef('menus');
-    function menuClick(value: any) {
-        const arr = value.keyPath;
-        if (arr.length > 1 && arr[1] !== selectedKeys.value[0]) {
-            const first = menuList.value.find((e: OperationTabMenu) => {
-                return e.code === arr[0];
-            });
-            if (first) {
-                const seconde = first.children.find((e: OperationTabMenu) => e.code === arr[1]);
-                seconde && context.emit('chooseMenu', seconde);
-            }
-        }
+  const selectedKeys = ref<string[]>(['1-1']);
+  const openKeys = ref<string[]>(['1']);
+  const preOpenKeys = ref<string[]>(['1']);
+  const menuList = APP.getRef('menus');
+  function menuClick(value: any) {
+    const arr = value.keyPath;
+    if (arr.length > 1 && arr[1] !== selectedKeys.value[0]) {
+      const first = menuList.value.find((e: OperationTabMenu) => {
+        return e.code === arr[0];
+      });
+      if (first) {
+        const seconde = first.children.find((e: OperationTabMenu) => e.code === arr[1]);
+        seconde && context.emit('chooseMenu', seconde);
+      }
     }
-    // 一级菜单图标
-    function fontIcon(code: string): string {
-        let result = 'icon-jinrongfenxi';
-        switch (code) {
-            case 'market':
-                result = 'icon-jinrongfenxi';
-                break;
-            case 'info':
-                result = 'icon-zhangdan';
-                break;
-            case 'business':
-                result = 'icon-renwu';
-                break;
-            case 'manage':
-                result = 'icon-quanxian';
-                break;
-            case 'search':
-                result = 'icon-chazhaojilu';
-                break;
-            case 'report':
-                result = 'icon-bingtu';
-                break;
-        }
-        return '#' + result;
+  }
+  // 一级菜单图标
+  function fontIcon(code: string): string {
+    switch (code) {
+      case 'info':
+        return '#icon-xitong';
+      case 'business':
+        return '#icon-zhangdan';
+      case 'riskmanage':
+        return '#icon-quanxian';
+      case 'riskreview':
+        return '#icon-chazhaojilu';
+      case 'spotreview':
+        return '#icon-jiaoyijilu';
+      case 'inventory':
+        return '#icon-jintiao';
+      case 'financereview':
+        return '#icon-zhangdan2';
+      case 'report':
+        return '#icon-bingtu';
+      default:
+        return '#icon-jinrongfenxi'
     }
-    return { selectedKeys, menuList, openKeys, preOpenKeys, menuClick, fontIcon };
+  }
+  return { selectedKeys, menuList, openKeys, preOpenKeys, menuClick, fontIcon };
 }
 
 export default defineComponent({
-    props: {
-        collapsed: {
-            default: true,
-            type: Boolean,
-        },
+  props: {
+    collapsed: {
+      default: true,
+      type: Boolean,
     },
-    setup(props, context) {
-        const isBottom = getHasBottom();
-        const { selectedKeys, openKeys, menuList, menuClick, preOpenKeys, fontIcon } = handleMenu(context);
-        watchEffect(() => {
-            if (props.collapsed) {
-                preOpenKeys.value = openKeys.value;
-                openKeys.value = [];
-            } else {
-                openKeys.value = preOpenKeys.value;
+  },
+  setup(props, context) {
+    const isBottom = getHasBottom();
+    const { selectedKeys, openKeys, menuList, menuClick, preOpenKeys, fontIcon } = handleMenu(context);
+    watchEffect(() => {
+      if (props.collapsed) {
+        preOpenKeys.value = openKeys.value;
+        openKeys.value = [];
+      } else {
+        openKeys.value = preOpenKeys.value;
+      }
+    });
+    const filterMenu = () => menuList.value.filter((e: OperationTabMenu) => e.path);
+    const route = useRoute();
+    initData(() => {
+      // 处理路由跳转到菜单栏里第一个对应的页面
+      const list = filterMenu();
+      if (list.length && list[0].children && list[0].children.length) {
+        const matched = route.matched;
+        // 处理修改具体某个菜单栏，主要处理页面刷新
+        let firstIndex = 0,
+          secondeIndex = 0;
+        for (let i = 0; i < list.length; i++) {
+          for (let j = 0; j < list[i].children.length; j++) {
+            if (matched[1].name === list[i].children[j].code) {
+              firstIndex = i;
+              secondeIndex = j;
+              break;
             }
-        });
-        const filterMenu = () => menuList.value.filter((e: OperationTabMenu) => e.path);
-        const route = useRoute();
-        initData(() => {
-            // 处理路由跳转到菜单栏里第一个对应的页面
-            const list = filterMenu();
-            if (list.length && list[0].children && list[0].children.length) {
-                const matched = route.matched;
-                // 处理修改具体某个菜单栏，主要处理页面刷新
-                let firstIndex = 0,
-                    secondeIndex = 0;
-                for (let i = 0; i < list.length; i++) {
-                    for (let j = 0; j < list[i].children.length; j++) {
-                        if (matched[1].name === list[i].children[j].code) {
-                            firstIndex = i;
-                            secondeIndex = j;
-                            break;
-                        }
-                    }
-                }
-                const temp = list[firstIndex].children[secondeIndex];
-                const code = temp.code;
-                // warn: Set operation on key "default" failed: target is readonly
-                selectedKeys.value = [code];
-                openKeys.value = [list[firstIndex].code];
-                context.emit('chooseMenu', temp);
-            }
-        });
-        return { selectedKeys, openKeys, filterMenu, menuClick, fontIcon, isBottom };
-    },
+          }
+        }
+        const temp = list[firstIndex].children[secondeIndex];
+        const code = temp.code;
+        // warn: Set operation on key "default" failed: target is readonly
+        selectedKeys.value = [code];
+        openKeys.value = [list[firstIndex].code];
+        context.emit('chooseMenu', temp);
+      }
+    });
+    return { selectedKeys, openKeys, filterMenu, menuClick, fontIcon, isBottom };
+  },
 });
 </script>
 <style lang="less">

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

@@ -95,7 +95,7 @@ export default defineComponent({
       if (goodsId) {
         queryResultLoadingAndInfo(QueryExposureHedgePositionDetail, loading, { goodsId }).then((res) => {
           // 日期降序排序
-          detailTableList.value = res.sort((a, b) => moment(b.ts).valueOf() - moment(a.ts).valueOf());
+          detailTableList.value = res.sort((a, b) => moment(b.tradetime).valueOf() - moment(a.tradetime).valueOf());
         });
       }
     }

src/views/information/spot-contract/components/modify/index.vue

@@ -320,13 +320,16 @@ export default defineComponent({
     mergeTwoObj(formState, props.selectedRow);
     isSell.value = formState.ContractType === 1 ? false : true;
 
-    const { deliverygoodsid, qty, price, wrstandardid, spotcontractid, spotgoodsbrandid, currencyid, attachment, deliverystartdate, deliveryenddate, startdate, enddate, meruserid, tradeuserid } = props.selectedRow;
+    const { deliverygoodsid, goodsid, qty, price, wrstandardid, spotcontractid, spotgoodsbrandid, currencyid, attachment, deliverystartdate, deliveryenddate, startdate, enddate, meruserid, tradeuserid, convertfactor } = props.selectedRow;
     if (deliverygoodsid) {
-      deliveryGoodsChange(deliverygoodsid);
-      if (wrstandardid) {
-        WrStandardChange(wrstandardid);
+      deliveryGoodsChange(deliverygoodsid).then(() => {
+        formState.GoodsID = goodsid;
         formState.WrStandardID = wrstandardid;
         formState.SpotGoodsBrandID = spotgoodsbrandid;
+        formState.ConvertFactor = convertfactor;
+      });
+      if (wrstandardid) {
+        WrStandardChange(wrstandardid);
       }
     }
     formState.Qty = qty.toString();

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

@@ -244,7 +244,7 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
     // 现货品种列表
     const deliveryGoodsList = ref<Ermcp3DeliveryGoodsDetail[]>([]);
 
-    GetDeliveryGoodsDetail().then((res) => {
+    const request = GetDeliveryGoodsDetail().then((res) => {
         deliveryGoodsList.value = res;
     }).catch(err => {
         message.error(err);
@@ -259,16 +259,16 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
 
 
     // 切换现货商品
-    function deliveryGoodsChange(value: number | undefined) {
+    async function deliveryGoodsChange(value: number | undefined) {
+        await request;
         const deliveryGoods = deliveryGoodsList.value.find((e) => e.deliverygoodsid === value);
         if (deliveryGoods) {
-            barandList.value = deliveryGoods.bdlst.filter((e) => e.isvalid); // 显示有效记录
+            barandList.value = deliveryGoods.bdlst.filter((e_1) => e_1.isvalid); // 显示有效记录
             wrstandardList.value = deliveryGoods.wdlst;
         } else {
             barandList.value = [];
             wrstandardList.value = [];
         }
-
         goodsList.value = [];
         formState.GoodsID = undefined;
         formState.WrStandardID = undefined;
@@ -279,7 +279,8 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
     const numberUnit = ref<string>('')
 
     // 选择现货商品
-    function WrStandardChange(value: number) {
+    async function WrStandardChange(value: number) {
+        await request;
         const wrstandard = wrstandardList.value.find((e) => e.wrstandardid === value);
         if (wrstandard) {
             // 单位
@@ -290,8 +291,8 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
                 // 期货品种列表
                 middlegoods.GPLST.forEach((item) => {
                     goodsList.value.push(...item.GDLST);
-                })
-            })
+                });
+            });
         }
     }
 

src/views/manage/finance-review/components/invoiceDetail/index.vue

@@ -21,7 +21,7 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item :label="selectedRow.contracttype ? '销售方' : '采购方'">
+            <a-form-item :label="selectedRow.contracttype === 1 ? '销售方' : '采购方'">
               <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
             </a-form-item>
           </a-col>