huangbin 4 years ago
parent
commit
f0ad12a843

+ 1 - 1
public/config/app.config.json

@@ -1,3 +1,3 @@
 {
 {
-    "apiUrl": "http://192.168.31.139:8080/cfg?key=test_139"
+    "apiUrl": "http://192.168.31.135:8080/cfg?key=test_135"
 }
 }

+ 1 - 1
src/hooks/form/verify.ts

@@ -1,6 +1,6 @@
-import { RuleObject } from "ant-design-vue/lib/form/interface";
 import { getGoodsById, getQuoteDayInfoByCode } from '@/services/bus/goods';
 import { getGoodsById, getQuoteDayInfoByCode } from '@/services/bus/goods';
 import { getRules } from '@/services/bus/rules';
 import { getRules } from '@/services/bus/rules';
+import { RuleObject } from "ant-design-vue/lib/form/interface";
 
 
 // 验证 挂牌数量
 // 验证 挂牌数量
 /**
 /**

+ 7 - 3
src/views/market/spot_trade/components/post_buying/setup.ts

@@ -1,10 +1,12 @@
 import { BuyOrSell } from "@/common/constants/enumCommon";
 import { BuyOrSell } from "@/common/constants/enumCommon";
 import { EnumRouterName } from "@/common/constants/enumRouterName";
 import { EnumRouterName } from "@/common/constants/enumRouterName";
-import { useVerifyListingNum, useVerifyListingBasis } from '@/hooks/form/verify';
+import { validateCommon } from "@/common/setup/validate";
+import { useVerifyListingBasis, useVerifyListingNum } from '@/hooks/form/verify';
 import { getAccountTypeList, getCanUseMoney } from "@/services/bus/account";
 import { getAccountTypeList, getCanUseMoney } from "@/services/bus/account";
 import { getRules } from '@/services/bus/rules';
 import { getRules } from '@/services/bus/rules';
 import { AccountListItem } from "@/services/dataCenter/interafce/account";
 import { AccountListItem } from "@/services/dataCenter/interafce/account";
 import { WrOrderQuote } from "@/services/go/wrtrade/interface";
 import { WrOrderQuote } from "@/services/go/wrtrade/interface";
+import { RuleObject } from "ant-design-vue/lib/form/interface";
 import moment from "moment";
 import moment from "moment";
 import { onBeforeUnmount, reactive, ref, UnwrapRef } from "vue";
 import { onBeforeUnmount, reactive, ref, UnwrapRef } from "vue";
 import { getGoodsPrice, handleIs } from "../buy-sell-market/setup";
 import { getGoodsPrice, handleIs } from "../buy-sell-market/setup";
@@ -27,9 +29,11 @@ export function handleForm(selectedRow: TempWrOrderQuoteDetail) {
 
 
     const { v_num } = useVerifyListingNum<FormParam, 'DelistMinQty'>(formState, 'DelistMinQty', selectedRow.minivalue);
     const { v_num } = useVerifyListingNum<FormParam, 'DelistMinQty'>(formState, 'DelistMinQty', selectedRow.minivalue);
     const { v_basis } = useVerifyListingBasis(selectedRow, 'goodsid');
     const { v_basis } = useVerifyListingBasis(selectedRow, 'goodsid');
-
+    const v_price = async (rule: RuleObject, value: number) => {
+        return validateCommon(value, '请输入挂牌价格');
+    };
     const rules = {
     const rules = {
-        FixedPrice: [{ required: true, message: '请输入挂牌价格', trigger: 'blur', type: 'number', }],
+        FixedPrice: [{ required: true, validator: v_price, trigger: 'blur', type: 'number', }],
         OrderQty: [{ required: true, validator: v_num, trigger: 'change', type: 'number' }],
         OrderQty: [{ required: true, validator: v_num, trigger: 'change', type: 'number' }],
         PriceMove: [{ required: true, validator: v_basis, trigger: 'blur', type: 'number', }],
         PriceMove: [{ required: true, validator: v_basis, trigger: 'blur', type: 'number', }],
         accountid: [{ required: true, message: '请输入交易账号' }],
         accountid: [{ required: true, message: '请输入交易账号' }],

+ 0 - 1
src/views/order/funding_information/components/funding_information_funding_summary/index.vue

@@ -123,7 +123,6 @@ export default defineComponent({
         // 签约银行
         // 签约银行
         const { hasSignBank } = useSignBank();
         const { hasSignBank } = useSignBank();
         function openComponentAction(item: BtnListType, record: Taaccount) {
         function openComponentAction(item: BtnListType, record: Taaccount) {
-            debugger;
             if (hasSignBank()) {
             if (hasSignBank()) {
                 openComponent(item, record);
                 openComponent(item, record);
             } else {
             } else {