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

src/services/proto/accountinfo/interface.ts

@@ -66,15 +66,15 @@ export interface LoginTaaccount {
 
 // 期货账户设置请求 0 29 149
 export interface 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 所属机构
+    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 所属机构
 }
 // 期货账户设置响应 0 29 150
 export interface ErmcpBizGroupRsp {

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

@@ -73,6 +73,10 @@ 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 {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";
 
 export default defineComponent({
     name: 'add-custom',
@@ -80,7 +84,7 @@ export default defineComponent({
     setup() {
         // 控制关闭弹窗
         const { visible, cancel } = closeModal('account_info_manager_btn_add');
-
+        const loading = ref<boolean>(false);
         // 证件类型
         // const cardTypeList = ref<AllEnums[]>(getCardType());
         // // 表单
@@ -97,18 +101,39 @@ export default defineComponent({
         // function isPersonal(): boolean {
         //     return formState.userinfotype === '1';
         // }
-        // function submit() {
-        //     formRef.value
-        //         .validate()
-        //         .then(() => {
-        //             const param = toRaw(formState);
-        //             applyAction(param);
-        //             console.log('values', formState);
-        //         })
-        //         .catch((error: ValidateErrorEntity<FormState>) => {
-        //             console.log('error', error);
-        //         });
-        // }
+
+
+        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 所属机构
+            }
+
+            requestResultLoadingAndInfo(bizGroupReq, 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,

src/views/information/account_info/compoments/interface.ts

@@ -1,7 +1,7 @@
 export interface BusinessFormState {
     logincode: string // 登录账号
     accountname: string // 账户名称
-    password: string // 登录密码（明文）
+    password?: string // 登录密码（明文）
     mobile?: string // 手机号码（明文）
     roleids: number[]; // uint64 账号角色
 }

src/views/information/account_info/compoments/modify-business/index.vue

@@ -39,7 +39,7 @@
                        name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
@@ -49,7 +49,7 @@
             <a-input class="dialogInput"
                      style="width: 200px"
                      readonly
-                     v-model:value="formState.accountname"
+                     v-model:value="formState.logincode"
                      placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>
@@ -77,6 +77,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'add-custom',
@@ -106,10 +107,14 @@ export default defineComponent({
                     const param = toRaw(formState);
                     const reqParam = {
                         operatetype: 2,
+                        userid: props.selectedData.userid,
+                        loginid: props.selectedData.loginid,
+                        areauserid: Number(getUserId()),
+                        password: "",
+                        logintaaccounts: []
                     };
                     Object.assign(reqParam, param);
                     console.log('reqParam', reqParam);
-
                     requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['修改账户成功', '修改账户失败:']).then(() => {
                         cancel();
                         context.emit('refresh');

src/views/information/account_info/compoments/setup.ts

@@ -11,7 +11,6 @@ export function handleBusinessForm() {
     const formState: UnwrapRef<BusinessFormState> = reactive({
         logincode: '',
         accountname: '',
-        password: '',
         mobile: '',
         roleids: [],
     })

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

@@ -24,7 +24,62 @@
                 @click="refuse">审核拒绝
       </a-button>
     </template>
-
+      <a-form class="inlineForm">
+          <fieldset class="formFieldSet">
+              <legend>合同基本信息</legend>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="合同编号">
+                          <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="点价类型">
+                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="销售方">
+                          <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="现货品种">
+                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+          </fieldset>
+          <fieldset class="formFieldSet">
+              <legend>待审核登记信息</legend>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="款项类型">
+                          <span class="white">{{ kxtypeName(selectedRow.kxtype) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="登记金额">
+                          <span class="white">{{ formatValue(selectedRow.payamount) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="登记时间">
+                          <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="登记人">
+                          <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+          </fieldset>
+      </a-form>
   </a-modal>
 </template>
 
@@ -40,6 +95,9 @@ import { Modal } from 'ant-design-vue';
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import Long from 'long';
 import { financeControl } from '@/views/manage/finance-review/components/setup';
+import {kxtypeName} from "@/views/manage/finance-review/setup";
+import {getContractTypeName} from "@/views/information/spot-contract/setup";
+import {getPriceTypeName} from "@/views/business/purchase/setup";
 
 export default defineComponent({
     name: 'finance_review_funds_audit',
@@ -116,6 +174,9 @@ export default defineComponent({
             loading,
             formatValue,
             getStatusName,
+            kxtypeName,
+            getPriceTypeName,
+            getContractTypeName,
             maskClosableFlag,
         };
     },

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

@@ -20,7 +20,62 @@
                   @click="back">撤销
         </a-button>
     </template>
-
+      <a-form class="inlineForm">
+          <fieldset class="formFieldSet">
+              <legend>合同基本信息</legend>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="合同编号">
+                          <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="点价类型">
+                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="销售方">
+                          <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="现货品种">
+                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+          </fieldset>
+          <fieldset class="formFieldSet">
+              <legend>待审核登记信息</legend>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="款项类型">
+                          <span class="white">{{ kxtypeName(selectedRow.kxtype) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="登记金额">
+                          <span class="white">{{ formatValue(selectedRow.payamount) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="登记时间">
+                          <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="登记人">
+                          <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+          </fieldset>
+      </a-form>
   </a-modal>
 </template>
 
@@ -36,6 +91,9 @@ import {ContractOperateApplyReq} from "@/services/proto/contract/interface";
 import Long from "long";
 import {financeControl} from "@/views/manage/finance-review/components/setup";
 import {QryBussinessKxRsp} from "@/services/go/ermcp/finance-review/interface";
+import {kxtypeName} from "@/views/manage/finance-review/setup";
+import {getPriceTypeName} from "@/views/business/purchase/setup";
+import {getContractTypeName} from "@/views/information/spot-contract/setup";
 
 export default defineComponent({
     name: 'finance_review_funds_cancel',
@@ -89,6 +147,9 @@ export default defineComponent({
             formatValue,
             getStatusName,
             maskClosableFlag,
+            kxtypeName,
+            getPriceTypeName,
+            getContractTypeName,
             back,
         };
     },