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

src/services/go/ermcp/goodsInfo/index.ts

@@ -127,9 +127,9 @@ export function GetErmcpGoods(lastUpdateTime?: string): Promise<string> {
  * @param middlegoodsid 套保品种id
  * @constructor
  */
-export function QueryMiddleGoodsChange(middlegoodsid: number): Promise<ErmcpMiddleGoodsChangeLog[]>{
+export function QueryMiddleGoodsChange(middlegoodsid: number): Promise<ErmcpMiddleGoodsChangeLog[]> {
     const userid = getUserId(); // 用户id
-    return commonSearch_go('/Ermcp/QueryMiddleGoodsChangeLog', {userid, middlegoodsid}).catch((err) => {
+    return commonSearch_go('/Ermcp/QueryMiddleGoodsChangeLog', { userid, middlegoodsid }).catch((err) => {
         throw new Error(`查询套保品种详情(套保品种/商品详情): ${err.message}`);
     });
 }

src/views/information/account_info/compoments/add-child-futures/index.vue

@@ -26,30 +26,46 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="账户名称"
-                       name="">
+                       name="accountname">
             <a-input class="dialogInput"
+                     v-model:value="formState.accountname"
                      style="width: 200px"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="期货保证金"
-                       name="">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入期货保证金" />
+                       name="trademargintmpid">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.trademargintmpid"
+                      placeholder="请选择保证金模板">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="期货手续费"
-                       name="">
+                       name="tradefeetmpid">
             <a-select class="inlineFormSelect"
                       style="width: 200px"
+                      v-model:value="formState.tradefeetmpid"
                       placeholder="请选择期货手续费">
               <a-select-option value="权限一">权限一</a-select-option>
             </a-select>
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="指定交易用户"
+                       name="traderUserId">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.traderUserId"
+                      placeholder="请选择交易用户">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
       </a-row>
     </a-form>
   </a-modal>
@@ -57,14 +73,13 @@
 
 <script lang="ts">
 import { closeModal } from '@/common/setup/modal/index';
-import { initData } from '@/common/methods/index';
-import { defineComponent, ref, reactive, toRaw, UnwrapRef, watchEffect } from 'vue';
-import { AllEnums } from '@/services/go/commonService/interface';
-import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
+import { defineComponent, ref } from 'vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { bizGroupReq, loginAccountOperate } from '@/services/proto/accountinfo';
-import { ErmcpBizGroupReq, ErmcpBizGroupTAAccount } from '@/services/proto/accountinfo/interface';
-import { ErmcpBizGroupSpotGoods } from '@/services/go/ermcp/account/interface';
+import { ErmcpBizGroupReq } from '@/services/proto/accountinfo/interface';
+import { validateAction } from '@/common/setup/form';
+import { FormState } from './interface';
+import { handleBusinessForm } from './setup';
+import { hedgeOutMainReq } from '@/services/proto/accountinfo';
 
 export default defineComponent({
     name: 'account_info_futures_btn_add',
@@ -73,56 +88,32 @@ export default defineComponent({
         // 控制关闭弹窗
         const { visible, cancel } = closeModal('account_info_futures_btn_child_add');
         const loading = ref<boolean>(false);
-        // 证件类型
-        // const cardTypeList = ref<AllEnums[]>(getCardType());
-        // // 表单
-        // const formRef = ref();
-        // const formState: UnwrapRef<FormState> = reactive(initFormState());
-        // const rules = {
-        //     userinfotype: [{ required: true, message: '请选择客户类型', trigger: 'change' }],
-        //     customername: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
-        //     nickname: [{ required: true, message: '请输入企业简称', trigger: 'blur' }],
-        //     cardtype: [{ required: true, message: '请选择证件类型', trigger: 'change' }],
-        // };
-        // // 下单方法
-        // const { loading, applyAction } = handleApply();
-        // function isPersonal(): boolean {
-        //     return formState.userinfotype === '1';
-        // }
+        const { rules, formState, formRef } = handleBusinessForm();
 
         function submit() {
-            let reqParam: ErmcpBizGroupReq = {
-                // BizGroupID: number; // uint64 分组ID（修改/删除必填）
-                // BizType: number; // int32 业务类型 - 1:套保 2:套利
-                // Remark: string; // string 新增/修改备注
-                // ApplySrc: number; // int32 新增/修改来源 - 1:管理端 2:终端
-                // ApplyId: number; // uint64 新增/修改人
-                // SpotGoods: ErmcpBizGroupSpotGoods[]; // ErmcpBizGroupSpotGoods 期货账户分组商品
-                // TAAccount: ErmcpBizGroupTAAccount[]; // ErmcpBizGroupTAAccount 期货账户分组账户
-                // OptType: number; // int32 操作类型 - 1:新增 2:修改 3:删除
-                // AreaUserID: number; // uint64 所属机构
-            };
+            validateAction<FormState>(formRef, formState).then((res) => {
+                let reqParam: ErmcpBizGroupReq = {
+                    // BizGroupID: number; // uint64 分组ID（修改/删除必填）
+                    // BizType: number; // int32 业务类型 - 1:套保 2:套利
+                    // Remark: string; // string 新增/修改备注
+                    // ApplySrc: number; // int32 新增/修改来源 - 1:管理端 2:终端
+                    // ApplyId: number; // uint64 新增/修改人
+                    // SpotGoods: ErmcpBizGroupSpotGoods[]; // ErmcpBizGroupSpotGoods 期货账户分组商品
+                    // TAAccount: ErmcpBizGroupTAAccount[]; // ErmcpBizGroupTAAccount 期货账户分组账户
+                    // OptType: number; // int32 操作类型 - 1:新增 2:修改 3:删除
+                    // AreaUserID: number; // uint64 所属机构
+                };
 
-            requestResultLoadingAndInfo(bizGroupReq, reqParam, loading, ['新增账户成功', '新增账户失败:']).then(() => {
-                cancel();
-                // context.emit('refresh');
+                requestResultLoadingAndInfo(hedgeOutMainReq, reqParam, loading, ['新增账户成功', '新增账户失败:']).then(() => {
+                    cancel();
+                    // context.emit('refresh');
+                });
             });
-
-            // formRef.value
-            //     .validate()
-            //     .then(() => {
-            //         const param = toRaw(formState);
-            //         applyAction(param);
-            //         console.log('values', formState);
-            //     })
-            //     .catch((error: ValidateErrorEntity<FormState>) => {
-            //         console.log('error', error);
-            //     });
         }
         return {
-            // formState,
-            // rules,
-            // formRef,
+            formState,
+            rules,
+            formRef,
             // cardTypeList,
             // isPersonal,
             visible,

src/views/information/account_info/compoments/add-child-futures/interface.ts

@@ -0,0 +1,6 @@
+export interface FormState {
+    accountname: string; // string 账户名称accountname1（Taaccount）
+    trademargintmpid: number | undefined; // uint64 保证金模板id（TAACCOUNTCONFIG）
+    tradefeetmpid: number | undefined; // uint64 手续费模板ID（TAACCOUNTCONFIG）
+    traderUserId: number | undefined;
+}

src/views/information/account_info/compoments/add-child-futures/setup.ts

@@ -0,0 +1,22 @@
+import { reactive, ref, UnwrapRef } from "vue";
+import { FormState } from './interface';
+/**
+ * 表单
+ * @returns 
+ */
+export function handleBusinessForm() {
+    const formRef = ref();
+    const formState: UnwrapRef<FormState> = reactive({
+        accountname: '',
+        trademargintmpid: undefined,
+        tradefeetmpid: undefined,
+        traderUserId: undefined,
+    })
+    const rules = {
+        accountname: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
+        trademargintmpid: [{ required: true, message: '请选择保证金模板' }],
+        tradefeetmpid: [{ required: true, message: '请选择期货手续费' }],
+        traderUserId: [{ required: true, message: '请选择交易用户' }],
+    }
+    return { rules, formState, formRef }
+}

src/views/information/goods/components/add/index.vue

@@ -285,7 +285,6 @@ import { RuleObject } from 'ant-design-vue/es/form/interface';
 import { FormState, WRSConvertDetailEx } from './interface';
 import { validateCommon } from '@/common/setup/validate';
 import { getGoodsUnitEnumList } from '@/common/constants/enumsList';
-import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { DeliveryGoodsApplyReq } from '@/services/proto/delivery/interface';
 import { addDeliveryGoodsApply } from '@/services/proto/delivery';
@@ -350,6 +349,8 @@ export default defineComponent({
                     }),
                 };
                 requestResultLoadingAndInfo(addDeliveryGoodsApply, reqParam, loading, ['新增现货品种成功', '新增现货品种失败:']).then(() => {
+                    // 清空数据
+                    Object.assign(formState, initFormData());
                     cancel();
                     context.emit('refresh');
                 });
@@ -358,7 +359,7 @@ export default defineComponent({
 
         // 表单
         const formRef = ref();
-        const { formState, addOne, deleteOne } = handleFromState();
+        const { formState, initFormData, addOne, deleteOne } = handleFromState();
         const rules = {
             deliverygoodsname: [{ required: true, message: '请输入现货品种名称', trigger: 'blur' }],
             // unitid: [{ required: true, message: '请选择单位', trigger: 'change' }],
@@ -383,7 +384,7 @@ export default defineComponent({
         function middleChange(id: number, value: WRSConvertDetailEx) {
             const obj = goodsGroup.value.find((e) => e.groupcategroyid === id);
             if (obj) {
-                value.unitidName = getGoodsUnitEnumItemName(obj.agreeunit);
+                value.unitidName = obj.enumdicname;
                 value.unitid = obj.agreeunit;
             }
         }

src/views/information/goods/components/add/setup.ts

@@ -9,23 +9,26 @@ import { FormState } from './interface';
  * @returns 
  */
 export function handleFromState() {
-    const formState: UnwrapRef<FormState> = reactive({
-        deliverygoodscode: '', // string 交割商品代码(新增时有值)
-        deliverygoodsname: '', // string 交割商品名称(新增时有值) // 可能没值  有值不能为中文
-        deliverygoodsid: 0,// uint64 交割商品id(修改时有值)
-        unitid: undefined, // uint64 单位ID
-        type: 1,// int32 类型 1 新增 2 修改
-        remark: '', // string 备注
-        gldwrstandards: [
-            { wrstandardname: '', unitid: undefined, convertfactor: null, }
-        ], //        GLDWRStandardEx 现货商品型号数据
-        glddgfactoryItems: [
-            { dgfactoryitemvalue: '', }
-        ], //   GLDDGFactoryItemEx 现货商品品牌数据
-        wrsconvertdetails: [
-            { middlegoodsid: undefined, unitid: null, unitidName: '', convertratio: null, }
-        ], // WRSConvertDetailEx 现货商品折算配置明细数据
-    });
+    function initFormData() {
+        return {
+            deliverygoodscode: '', // string 交割商品代码(新增时有值)
+            deliverygoodsname: '', // string 交割商品名称(新增时有值) // 可能没值  有值不能为中文
+            deliverygoodsid: 0,// uint64 交割商品id(修改时有值)
+            unitid: undefined, // uint64 单位ID
+            type: 1,// int32 类型 1 新增 2 修改
+            remark: '', // string 备注
+            gldwrstandards: [
+                { wrstandardname: '', unitid: undefined, convertfactor: null, }
+            ], //        GLDWRStandardEx 现货商品型号数据
+            glddgfactoryItems: [
+                { dgfactoryitemvalue: '', }
+            ], //   GLDDGFactoryItemEx 现货商品品牌数据
+            wrsconvertdetails: [
+                { middlegoodsid: undefined, unitid: null, unitidName: '', convertratio: null, }
+            ], // WRSConvertDetailEx 现货商品折算配置明细数据
+        }
+    }
+    const formState: UnwrapRef<FormState> = reactive(initFormData());
     type Key = 'gldwrstandards' | 'glddgfactoryItems' | 'wrsconvertdetails'
     /**
      *  向动态表单里添加一条数据
@@ -48,7 +51,7 @@ export function handleFromState() {
     function deleteOne(key: Key, i: number): void {
         formState[key].splice(i, 1)
     }
-    return { formState, addOne, deleteOne }
+    return { formState, addOne, deleteOne, initFormData }
 }
 
 /**

src/views/information/goods/components/rightSpot/index.vue

@@ -7,7 +7,7 @@
                aria-hidden="true">
             <use xlink:href="#icon-shuzhuangtu"></use>
           </svg>
-          {{selctedDeliveryGoods.data.deliverygoodsname}}（{{getGoodsUnitEnumItemName(selctedDeliveryGoods.data.agreeunit)}}）
+          {{selctedDeliveryGoods.data.deliverygoodsname}}（{{selctedDeliveryGoods.data.enumdicname}}）
         </span>
         <span class="green ml10">{{selctedDeliveryGoods.data.dgstatus ? '正常' : '停用'}}</span>
       </div>
@@ -112,9 +112,11 @@
         </a-collapse-panel>
       </a-collapse>
     </div>
-    <Modify :selctedDeliveryGoods="selctedDeliveryGoods" />
-    <Disable :selectedRow="selctedDeliveryGoods" />
-    <SpotDetail  :selectedRow="selctedDeliveryGoods" />
+    <Modify :selctedDeliveryGoods="selctedDeliveryGoods"
+            @refresh="refresh" />
+    <Disable :selectedRow="selctedDeliveryGoods"
+             @refresh="refresh" />
+    <SpotDetail :selectedRow="selctedDeliveryGoods" />
   </div>
 </template>
 
@@ -129,7 +131,6 @@ import Disable from '../disable/index.vue';
 import { getThirdMenuData, handleBtnList } from '@/common/setup/table/button';
 import { BtnList } from '@/common/export/table';
 import SpotDetail from '../spotDetail/index.vue';
-import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'rightSpot',
@@ -158,8 +159,11 @@ export default defineComponent({
         }
 
         const { forDataBtn } = handleBtnList(list, 'goods_info_spot_normal', true);
+        function refresh() {
+            context.emit('refresh');
+        }
         initData(() => {});
-        return { getGoodsUnitEnumItemName, forDataBtn };
+        return { forDataBtn, refresh };
     },
 });
 </script>

src/views/information/goods/list/spot-variety/index.vue

@@ -15,11 +15,12 @@
       </div>
       <div class="rightCont">
         <rightSpot :selctedDeliveryGoods="selctedDeliveryGoods"
+                   @refresh="updateDG"
                    :isNormal="isNormal"></rightSpot>
       </div>
     </div>
     <!-- 新增商品 -->
-    <AddGoods @refresh="queryDG" />
+    <AddGoods @refresh="updateDG" />
 
   </div>
 </template>
@@ -45,13 +46,13 @@ export default defineComponent({
     setup() {
         // 控制弹窗
         const { openAction: addAction } = openModal('goods_info_spot_normal_add');
-        const { loading, selctedDeliveryGoods, chooseDG, isNormal, menuList, queryDG } = handleDG();
+        const { loading, selctedDeliveryGoods, chooseDG, isNormal, menuList, queryDG, updateDG } = handleDG();
 
         initData(() => {
             // 加载数据在这里
             queryDG();
         });
-        return { addAction, loading, selctedDeliveryGoods, chooseDG, isNormal, menuList };
+        return { addAction, loading, selctedDeliveryGoods, chooseDG, isNormal, menuList, updateDG };
     },
 });
 </script>

src/views/information/goods/list/spot-variety/setup.ts

@@ -1,4 +1,5 @@
 import APP from '@/services';
+import { QueryDeliveryGoodsDetail } from '@/services/go/ermcp/goodsInfo';
 import { ErmcpDeliveryGoodsDetailEx, MenuList } from '@/services/go/ermcp/goodsInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { reactive, Ref, ref } from 'vue';
@@ -53,8 +54,12 @@ export function handleDG() {
     // 选中的具体某一天现货品种数据
     const selctedDeliveryGoods = reactive<ErmcpDeliveryGoodsDetailEx>(initDG())
     const isNormal = ref<boolean>(true) // true => 正常； false => 停用
-    // 获取现货品种数据
-    function queryDG() {
+    function classfiyDG() {
+        menuList.value.forEach(el => {
+            if (el.children) {
+                el.children.length = 0
+            }
+        });
         const res = APP.get('DeliveryGoodsList') as ErmcpDeliveryGoodsDetailEx[]
         deliveryGoodsList.value = res;
         res.forEach(e => {
@@ -75,6 +80,9 @@ export function handleDG() {
                 }
             }
         })
+    }
+    function queryDG() {
+        classfiyDG()
         // 获取默认第一条数据
         if (menuList.value[0].children?.length) {
             chooseDG({ key: menuList.value[0].children[0].key, is: true })
@@ -95,6 +103,14 @@ export function handleDG() {
             console.log('selctedDeliveryGoods', selctedDeliveryGoods);
         }
     }
-    return { loading, deliveryGoodsList, menuList, queryDG, isNormal, selctedDeliveryGoods, chooseDG }
+    /**
+     * 更新数据
+     */
+    function updateDG() {
+        QueryDeliveryGoodsDetail().then(() => {
+            classfiyDG()
+        })
+    }
+    return { loading, deliveryGoodsList, menuList, queryDG, updateDG, isNormal, selctedDeliveryGoods, chooseDG }
 }
 

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

@@ -75,7 +75,7 @@
                   <a-select-option :value="item.userid"
                                    v-for="item in customList"
                                    :key="item.userid">
-                    {{item.customername}}
+                    {{item.nickname}}
                   </a-select-option>
                 </a-select>
               </a-form-item>
@@ -103,7 +103,7 @@
                   <a-select-option :value="item.userid"
                                    v-for="item in customList"
                                    :key="item.userid">
-                    {{item.customername}}
+                    {{item.nickname}}
                   </a-select-option>
                 </a-select>
               </a-form-item>
@@ -441,7 +441,7 @@ export default defineComponent({
 
         // 表单
         const formRef = ref();
-        const { formState, businessType } = handleFromState();
+        const { formState, businessType, initFormData } = handleFromState();
         const { rules } = handleFormRule(formState);
         // 合同类型
         const { contractType, isSell, contractChange, customList, queryCustomList } = handleContract(formState);
@@ -484,6 +484,8 @@ export default defineComponent({
                 }
                 sendReq(param, loading, OperateType)
                     .then((res) => {
+                        //清空添加成功后的数据，确保在此新增打开是个空数据
+                        Object.assign(formState, initFormData());
                         context.emit('refresh');
                         cancel();
                     })

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

@@ -132,48 +132,52 @@ export function handleAccountManager() {
     return { traderList, businesserList, merchandiserList, getRoleList, getBusinesserList }
 }
 
+
 /**
  * 新增和修改的表单数据
  * @returns 
  */
 export function handleFromState() {
-    const formState: UnwrapRef<FormState> = reactive({
-        ContractNo: '', // 现货合同编号
-        ContractType: 1, // int32 现货合同类型-1:采购-1:销售
-        BizType: 1, // uint32 业务类型 - 1:套保 2:套利
-        BuyUserID: undefined, // uint64 采购方ID
-        SellUserID: undefined,// uint64 客户ID
-        ContractAttachment: new Uint8Array(),// bytes 合同附件
-        DeliveryGoodsID: undefined, // 现货品种ID
-        WrStandardID: undefined,  // uint64 现货商品ID
-        SpotGoodsBrandID: undefined, // uint64 现货品牌ID
-        ConvertFactor: undefined,// double 标仓系数
-        SpotGoodsDesc: '', // string 商品型号
-        PriceType: 1, // uint32 定价类型-1:一口价2:点价3:暂定价
-        Qty: '', // double 数量
-        Price: '',// double 价格暂定价[1:一口价、3:暂定价]
-        Amount: null, // double 金额[1:一口价、3:暂定价]
-        DeliveryStartDate: '', // string 交收期(开始)
-        DeliveryEndDate: '', // string 交收期(结束)
-        ContractMargin: null, // double 合同保证金
-        SaleUserID: undefined, // uint64 业务员ID
-        MerUserID: undefined, // uint64 跟单员ID
-        AccountID: undefined, // uint64 期货账户ID
-        Remark: '', // string 合同备注
-        CurrencyID: undefined, // 结算币种ID
-        GoodsID: undefined, // uint64 点价合约ID-0:为现货，其它为期货商品合约ID[2:点价3:暂定价]
-        PriceMove: null,// double 升贴水[2:点价3:暂定价]
-        StartDate: '', //                       点价开始时间
-        EndDate: '', //                           点价结束时间
-        TradeUserID: undefined, //           交易员ID
-    })
+    function initFormData() {
+        return {
+            ContractNo: '', // 现货合同编号
+            ContractType: 1, // int32 现货合同类型-1:采购-1:销售
+            BizType: 1, // uint32 业务类型 - 1:套保 2:套利
+            BuyUserID: undefined, // uint64 采购方ID
+            SellUserID: undefined,// uint64 客户ID
+            ContractAttachment: new Uint8Array(),// bytes 合同附件
+            DeliveryGoodsID: undefined, // 现货品种ID
+            WrStandardID: undefined,  // uint64 现货商品ID
+            SpotGoodsBrandID: undefined, // uint64 现货品牌ID
+            ConvertFactor: undefined,// double 标仓系数
+            SpotGoodsDesc: '', // string 商品型号
+            PriceType: 1, // uint32 定价类型-1:一口价2:点价3:暂定价
+            Qty: '', // double 数量
+            Price: '',// double 价格暂定价[1:一口价、3:暂定价]
+            Amount: null, // double 金额[1:一口价、3:暂定价]
+            DeliveryStartDate: '', // string 交收期(开始)
+            DeliveryEndDate: '', // string 交收期(结束)
+            ContractMargin: null, // double 合同保证金
+            SaleUserID: undefined, // uint64 业务员ID
+            MerUserID: undefined, // uint64 跟单员ID
+            AccountID: undefined, // uint64 期货账户ID
+            Remark: '', // string 合同备注
+            CurrencyID: undefined, // 结算币种ID
+            GoodsID: undefined, // uint64 点价合约ID-0:为现货，其它为期货商品合约ID[2:点价3:暂定价]
+            PriceMove: null,// double 升贴水[2:点价3:暂定价]
+            StartDate: '', //                       点价开始时间
+            EndDate: '', //                           点价结束时间
+            TradeUserID: undefined, //           交易员ID
+        }
+    }
+    const formState: UnwrapRef<FormState> = reactive(initFormData())
     // 业务类型
     const businessType = [
         { key: 1, value: '套保' },
         { key: 2, value: '套利' },
     ];
 
-    return { formState, businessType }
+    return { formState, businessType, initFormData }
 }
 
 /**
@@ -280,7 +284,7 @@ export function handleContract(formState: UnwrapRef<FormState>) {
     function queryCustomList() {
         QueryCustomInfo(3)
             .then((res) => {
-                customList.value = res
+                customList.value = res.filter(e => e.status === 4)
                 console.log('客户资料', customList);
             })
             .catch((err) => {
@@ -321,6 +325,9 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
             gblist.value.length = 0
             gmlist.value.length = 0
         }
+        formState.WrStandardID = undefined;
+        formState.SpotGoodsBrandID = undefined;
+        formState.ConvertFactor = undefined;
     }
 
     // 查询现货商品详情