Merge remote-tracking branch 'origin/master'

src/layout/components/main.vue

@@ -1,21 +1,20 @@
 <template>
-    <div class="exposure">
-        <div class="first-menu">
-            <a-menu
-                class="a-menu_container"
-                theme="dark"
-                v-model:selectedKeys="selectedKey"
-                @click="selectMenu"
-                mode="horizontal"
-            >
-                <a-menu-item :key="String(index)" v-for="(item, index) in list">{{ item.title}}</a-menu-item>
-            </a-menu>
-            <div class="menu_right">
-                <!-- <slot></slot> -->
-            </div>
-        </div>
-        <router-view />
+  <div class="exposure">
+    <div class="first-menu">
+      <a-menu class="a-menu_container"
+              theme="dark"
+              v-model:selectedKeys="selectedKey"
+              @click="selectMenu"
+              mode="horizontal">
+        <a-menu-item :key="String(index)"
+                     v-for="(item, index) in list">{{ item.title}}</a-menu-item>
+      </a-menu>
+      <div class="menu_right">
+        <!-- <slot></slot> -->
+      </div>
     </div>
+    <router-view />
+  </div>
 </template>
 
 <script lang="ts">
@@ -32,10 +31,10 @@ export default defineComponent({
         const selectedKey = inject('index');
         // 切换路由
         function selectMenu(value: any) {
-            const index = +value.key;
-            console.log(router);
-
-            router.push({ name: list.value[index].code });
+            if (((selectedKey as unknown) as any).value[0] !== value.key) {
+                const index = +value.key;
+                router.push({ name: list.value[index].code });
+            }
         }
         return { selectMenu, list, selectedKey };
     },

src/services/bus/index.ts

@@ -5,7 +5,7 @@ import { checkTokenLoop, handleTokenCheck } from '@/services/bus/token';
 import { getAllEnums, GetPCMenus, getServerTime, queryErrorInfos, QueryTableDefine } from '@/services/go/commonService/index';
 import { getAppConfig, getCommonApiUrl } from '@/services/go/config';
 import { LoginQuery } from '@/services/go/useInfo/index';
-import { handleOem, setServiceURL } from '@/services/request/serviceURL';
+import { handleOem, serviceURL, setServiceURL } from '@/services/request/serviceURL';
 import ProtobufCtr from '@/services/socket/protobuf/index';
 import { localStorageUtil } from '@/utils/storage';
 import { message } from 'ant-design-vue';
@@ -81,6 +81,9 @@ function setIcon() {
     }
     Object.assign(link, obj)
     document.title = 'WebPC'
+    if (serviceURL.oem === 'yrdz') {
+        document.title = '云融'
+    }
     document.getElementsByTagName('head')[0].appendChild(link);
 }
 /**

src/views/information/custom/compoments/add/setup.ts

@@ -10,7 +10,7 @@ import { FormState } from './interface';
 
 /**
  * 获取证件类型
- * @returns 
+ * @returns
  */
 export function getCardType() {
     const arr = [2, 4, 18, 21];
@@ -27,6 +27,7 @@ export function handleForm() {
     const rules = {
         userinfotype: [{ required: true, message: '请选择客户类型', trigger: 'change' }],
         customername: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
+        mobilephone: [{ required: true, message: '请输入联系人手机号', trigger: 'blur' }],
         nickname: [{ required: true, message: '请输入企业简称', trigger: 'blur' }],
         cardtype: [{ required: true, validator: v_cardtype, trigger: 'change' }],
     };
@@ -35,7 +36,7 @@ export function handleForm() {
 
 /**
  * 初始化表单数据
- * @returns 
+ * @returns
  */
 export function initFormState(): FormState {
     return {

src/views/market/spot_trade/components/buy-sell-market/components/buy/index.vue

@@ -95,8 +95,11 @@ export default defineComponent({
             isDetail: false,
         };
         function handleColumn(columns: ColumnType[]) {
-            const item = columns[1];
-            delete item.width;
+            columns.forEach((item) => {
+                if (item.dataIndex !== 'index') {
+                    delete item.width;
+                }
+            });
             return columns;
         }
         function handleBtnList() {}

src/views/market/spot_trade/components/buy-sell-market/components/sell/index.vue

@@ -97,8 +97,11 @@ export default defineComponent({
             isDetail: false,
         };
         function handleColumn(columns: ColumnType[]) {
-            const item = columns[1];
-            delete item.width;
+            columns.forEach((item) => {
+                if (item.dataIndex !== 'index') {
+                    delete item.width;
+                }
+            });
             return columns;
         }
         return {

src/views/market/spot_trade/components/buy-sell-market/index.vue

@@ -189,11 +189,11 @@ export default defineComponent({
             TimerUtils.clearInterval('buyAndSellMartet');
             TimerUtils.clearTimeout('debounce');
         });
-        const { childRef: buyRef, loadChildComponentData: loadBuyData } = handleChildComponentMethod();
-        const { childRef: sellRef, loadChildComponentData: loadSellData } = handleChildComponentMethod();
+        const buyRef = ref<null | { queryTableAction: Function }>(null);
+        const sellRef = ref<null | { queryTableAction: Function }>(null);
         const queryFn = () => {
-            loadBuyData();
-            loadSellData();
+            buyRef.value?.queryTableAction();
+            sellRef.value?.queryTableAction();
         };
         const { componentId, closeComponent, openComponent } = handleModalComponent(queryFn, ref({}));
         const { hasFinacing } = handleFinacing(loading, props.selectedRow.wrfactortypeid);
@@ -215,14 +215,13 @@ export default defineComponent({
         }
         TimerUtils.setInterval(
             () => {
-                loadBuyData();
-                loadSellData();
+                queryFn();
             },
             10 * 1000,
             'buyAndSellMartet'
         );
         // 单据挂牌成功 通知买大厅刷新数据
-        Bus.$on('spotTrade', loadSellData);
+        Bus.$on('spotTrade', queryFn);
 
         return {
             time,

src/views/market/spot_trade/components/buy-sell-market/setup.ts

@@ -104,6 +104,7 @@ export function handleChildComponentMethod() {
 const rules = ref<WrMarketTradeConfig[]>([])
 export function handlePriceRule(loading: Ref<boolean>, marketid: number) {
     queryResultLoadingAndInfo(queryWrMarketTradeConfig, loading, { marketid }).then(res => {
+
         rules.value = res;
         console.log('rules', res)
     })