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

src/common/methods/request/resultInfo.ts

@@ -36,70 +36,6 @@ export function commonResultInfo(fn: Promise<any>, sign: ResultInfo, loading: Re
         })
 }
 
-/**
- * 控制 请求接口 打开与关闭loading
- * @param fn 请求接口 函数
- * @param param 请求接口 参数
- * @param loading
- * @returns
- */
-export async function controlLoading(fn: Function, loading: Ref<boolean>, param?: any,): Promise<any> {
-    console.log('请求接口参数: ', param);
-    loading.value = true;
-    try {
-        const result = await (param ? fn(param) : fn())
-        loading.value = false;
-        return result;
-    } catch (err) {
-        loading.value = false;
-        Promise.resolve(err)
-    }
-}
-
-/**
- * 控制服务请求成功和失败的弹窗提示
- * @param fn 请求接口 函数
- * @param msgInfo [成功结果， 失败结果]
- * @returns
- */
-export function controlResultInfo(fn: Promise<any>, msgInfo: [string, string] = ['成功', '失败']) {
-    const [sucInfo, errInfo] = msgInfo
-    return fn.then(res => {
-        message.success(sucInfo)
-        return res;
-    }).catch(err => {
-        console.warn(`${fn}调用失败： ${err}`);
-        const result = errInfo + err
-        message.error(result)
-        Promise.reject(result)
-    })
-}
-
-/**
- * 用户查询数据，成功返回数据，失败提示
- * @param fn
- * @returns
- */
-export function controlResultErrInfo(fn: Promise<any>) {
-    return fn.then(res => {
-        let result = res
-        if (Array.isArray(res)) {
-            // 列表数据需要一个key，要不然会报错，统一处理
-            result = res.map((e: any, i: number) => {
-                if (e.hasOwnProperty('key')) {
-                    return e
-                } else {
-                    return { ...e, key: String(i) };
-                }
-            })
-        }
-        console.log('查询数据成功：', result)
-        return result
-    }).catch(err => {
-        console.error('查询数据失败：', err)
-        message.error(err.message)
-    })
-}
 
 /**
  * 处理服务请求时候的loading和 成功和失败提示
@@ -109,8 +45,32 @@ export function controlResultErrInfo(fn: Promise<any>) {
  * @param messageInfo
  * @returns
  */
-export function requestResultLoadingAndInfo(fn: Function, param: any, loading: Ref<boolean>, messageInfo: [string, string] = ['成功', '失败']) {
-    return controlResultInfo(controlLoading(fn, loading, param), messageInfo)
+export async function requestResultLoadingAndInfo(fn: any, param: any, loading: Ref<boolean>, messageInfo: [string, string] = ['成功', '失败'], isDefaultMsg = false) {
+    console.log('请求接口参数: ', param);
+    const [sucInfo, errInfo] = messageInfo
+    loading.value = true;
+    return new Promise((resolve, reject) => {
+        const tempFN = param ? fn(param) : fn()
+        tempFN.then((res: any) => {
+            // 处理同一个请求，根据不同场景提现不同消息
+            const msg = isDefaultMsg ? res : sucInfo
+            message.success(msg)
+            loading.value = false;
+            resolve(res);
+        }).catch((err: string) => {
+            loading.value = false;
+            const msg = '您的申请已提交，请稍后查询结果！'
+            if (err === msg) {
+                message.success(msg)
+                resolve('ok');
+            } else {
+                console.warn(`${fn}调用失败： ${err}`);
+                const temp = errInfo + err
+                message.error(temp)
+                reject(temp)
+            }
+        })
+    })
 }
 
 /**
@@ -120,7 +80,30 @@ export function requestResultLoadingAndInfo(fn: Function, param: any, loading: R
  * @param param
  * @returns
  */
-export function queryResultLoadingAndInfo(fn: Function, loading: Ref<boolean>, param?: any) {
-    return controlResultErrInfo(controlLoading(fn, loading, param))
-}
-
+export async function queryResultLoadingAndInfo(fn: Function, loading: Ref<boolean>, param?: any): Promise<any[]> {
+    loading.value = true;
+    return new Promise((resolve, reject) => {
+        const tempFN = param ? fn(param) : fn()
+        tempFN.then((res: any) => {
+            let result = res
+            if (Array.isArray(res)) {
+                // 列表数据需要一个key，要不然会报错，统一处理
+                result = res.map((e: any, i: number) => {
+                    if (e.hasOwnProperty('key')) {
+                        return e
+                    } else {
+                        return { ...e, key: String(i) };
+                    }
+                })
+            }
+            console.log('查询数据成功：', result)
+            loading.value = false;
+            resolve(result as any[]);
+        }).catch((err: { message: string }) => {
+            loading.value = false;
+            console.error('查询数据失败：', err)
+            message.error(err.message)
+            reject(err)
+        })
+    })
+}

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

@@ -51,9 +51,14 @@ export function handleSpotWarrant(enumName: EnumRouterName, buyOrSell: BuyOrSell
         if (isWR()) {
             queryResultLoadingAndInfo(queryHoldLB, loading).then(res => {
                 allWR.value = res;
-                wrHoldList.value = res.filter((e: WrHoldLB) => e.wrfactortypeid === String(selectedRow.wrfactortypeid)).map((e: WrHoldLB) => {
-                    const { wrholdeno, enableqty, ladingbillid, enumdicname, subnum } = e
-                    return { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）`, subnum }
+                wrHoldList.value = []
+                wrHoldList.value.length = 0
+                res.forEach(e => {
+                    if (e.wrfactortypeid === String(selectedRow.wrfactortypeid)) {
+                        const { wrholdeno, enableqty, ladingbillid, enumdicname, subnum } = e
+                        const result = { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）`, subnum }
+                        wrHoldList.value.push(result)
+                    }
                 })
             })
         }

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

@@ -56,9 +56,13 @@ export function handleSpotWarrant(enumName: EnumRouterName, buyOrSell: BuyOrSell
         if (isWR()) {
             queryResultLoadingAndInfo(queryHoldLB, loading).then(res => {
                 allWR.value = res;
-                wrHoldList.value = res.filter((e: WrHoldLB) => e.wrfactortypeid === String(selectedRow.wrfactortypeid)).map((e: WrHoldLB) => {
-                    const { wrholdeno, enableqty, ladingbillid, enumdicname, subnum } = e
-                    return { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）`, subnum }
+                wrHoldList.value.length = 0
+                res.forEach(e => {
+                    if (e.wrfactortypeid === String(selectedRow.wrfactortypeid)) {
+                        const { wrholdeno, enableqty, ladingbillid, enumdicname, subnum } = e
+                        const result = { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）`, subnum }
+                        wrHoldList.value.push(result)
+                    }
                 })
             })
         }

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/delisting/setup.ts

@@ -39,9 +39,13 @@ export function handleSpotWarrant(buyOrSell: BuyOrSell, selectedRow: QueryOrderQ
     if (buyOrSell === BuyOrSell.buy) {
         queryResultLoadingAndInfo(queryHoldLB, loading).then(res => {
             allWrHoldList.value = res
-            wrHoldList.value = res.filter((e: WrHoldLB) => e.wrfactortypeid === String(selectedRow.wrfactortypeid)).map((e: WrHoldLB) => {
-                const { wrholdeno, enableqty, ladingbillid, enumdicname, subnum } = e
-                return { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）`, subnum }
+            wrHoldList.value.length = 0
+            res.forEach(e => {
+                if (e.wrfactortypeid === String(selectedRow.wrfactortypeid)) {
+                    const { wrholdeno, enableqty, ladingbillid, enumdicname, subnum } = e
+                    const result = { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）`, subnum }
+                    wrHoldList.value.push(result)
+                }
             })
         })
     }

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/delisting/setup.ts

@@ -41,9 +41,13 @@ export function handleSpotWarrant(buyOrSell: BuyOrSell, selectedRow: QueryOrderQ
     if (buyOrSell === BuyOrSell.buy) {
         queryResultLoadingAndInfo(queryHoldLB, loading).then(res => {
             allWrHoldList.value = res
-            wrHoldList.value = res.filter((e: WrHoldLB) => e.wrfactortypeid === String(selectedRow.wrfactortypeid)).map((e: WrHoldLB) => {
-                const { wrholdeno, enableqty, ladingbillid, enumdicname, subnum } = e
-                return { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）`, subnum }
+            wrHoldList.value.length = 0
+            res.forEach(e => {
+                if (e.wrfactortypeid === String(selectedRow.wrfactortypeid)) {
+                    const { wrholdeno, enableqty, ladingbillid, enumdicname, subnum } = e
+                    const result = { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）`, subnum }
+                    wrHoldList.value.push(result)
+                }
             })
         })
     }