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

src/common/constants/buttonType.ts

@@ -33,6 +33,10 @@ export interface ButtonType {
 
     account_info_trade_btn_add: string; // 交易账户 新增
     account_info_trade_btn_modify: string; // 交易账户 修改
+    account_info_trade_btn_locked: string; // 交易账户 锁定
+    account_info_trade_btn_unlocked: string; // 交易账户 解锁
+    account_info_trade_btn_reset: string; // 交易账户 重置密码
+    account_info_trade_btn_logout: string; // 业务账户 注销
 
     account_info_manager_btn_add: string; // 管理账户 新增
     account_info_manager_btn_modify: string; // 管理账户 修改

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

@@ -85,12 +85,12 @@
 <script lang="ts">
 import { closeModal } from '@/common/setup/modal/index';
 import { defineComponent, ref, PropType, watchEffect } from 'vue';
-import { ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/ermcp/account/interface';
-import { queryTableList } from '../../list/account_info_futures/setup';
+import { ErmcpLoginUserEx, ErmcpTaAccount, ErmcpTaAccountEx } from '@/services/go/ermcp/account/interface';
 import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { handleBusinessForm } from '../setup';
 import { validateAction } from '@/common/setup/form';
 import { BusinessFormState } from '../interface';
+import { QueryAccMgrTaaccount } from '@/services/go/ermcp/account';
 
 export default defineComponent({
     name: 'account_info_trade_btn_add',
@@ -101,8 +101,8 @@ export default defineComponent({
             type: Object as PropType<ErmcpLoginUserEx>,
         },
     },
-    setup(props) {
-        const { loading, tableList, queryTable } = queryTableList();
+    setup() {
+        const loading = ref<boolean>(false);
         const accountList = ref<ErmcpTaAccount[]>([]);
         // 控制关闭弹窗
         const { visible, cancel } = closeModal('account_info_trade_btn_add');
@@ -110,9 +110,10 @@ export default defineComponent({
         watchEffect(() => {
             if (visible.value) {
                 // 处理授权期货账户
-                queryResultLoadingAndInfo(queryTable, loading).then(() => {
+                queryResultLoadingAndInfo(QueryAccMgrTaaccount, loading).then((res) => {
                     accountList.value.length = 0;
-                    tableList.value.forEach(({ mainAcc, subacclist }) => {
+                    res.forEach((el: ErmcpTaAccountEx) => {
+                        const { mainAcc, subacclist } = el;
                         accountList.value.push(mainAcc);
                         subacclist.forEach((e) => accountList.value.push(e));
                     });

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

@@ -1,169 +0,0 @@
-<template>
-  <!-- 新增账户 -->
-  <a-modal class="commonModal add-account-info"
-           title="新增账户"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           :maskClosable="false"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="账户角色"
-                       name="userinfotype">
-            <a-checkbox-group class="commonCheckboxGroup" v-model:value="formState.warehousetype">
-              <a-row>
-                <a-col :span="12">
-                  <a-checkbox value="A">业务员</a-checkbox>
-                </a-col>
-                <a-col :span="12">
-                  <a-checkbox value="B">跟单员</a-checkbox>
-                </a-col>
-              </a-row>
-            </a-checkbox-group>
-          </a-form-item>
-        </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="customername">
-              <a-input class="dialogInput"
-                       v-model:value="formState.customername"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录账号"
-                         name="nickname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.nickname"
-                       placeholder="请输入登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="cardtype">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      v-model:value="formState.legalpersonname" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="手机号码"
-                         name="legalpersonname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.legalpersonname"
-                       placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
-</template>
-
-<script lang="ts">
-import { closeModal } from '@/common/setup/modal/index';
-import { initData } from '@/common/methods/index';
-import { defineComponent, ref, reactive, toRaw, UnwrapRef } from 'vue';
-import { getCardType, initFormState, handleApply } from './setup';
-import { AllEnums } from '@/services/go/commonService/interface';
-import { FormState } from './interface';
-import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
-import {AddUserInfoApplyReq} from "@/services/go/ermcp/customInfo/interface";
-import {getUserId} from "@/services/bus/account";
-
-export default defineComponent({
-    name: 'add-custom',
-    components: {},
-    setup() {
-        // 控制关闭弹窗
-        const { visible, cancel } = closeModal('custom_info_btn_add');
-        // 证件类型
-        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';
-        }
-        function submit() {
-            formRef.value
-                .validate()
-                .then(() => {
-                    const param = toRaw(formState);
-
-                    const paramReq: AddUserInfoApplyReq = {
-                        customername: param.customername,   // 必填
-                        userid: 1,  // 写死 必填
-                        memberareaid: getUserId(),
-                        userinfotype: Number(param.userinfotype),
-                        username: param.customername,
-                        userstate: 1, // 1： 保存草稿 2： 新增
-
-                        // 以上必填
-                        cardtype: param.cardtype, // 证件类型
-                        cardnum: param.cardnum, // 证件号码
-                        nickname: param.nickname, // 昵称
-                        remark: param.remark, // 备注
-                        mobilephone: param.mobilephone, //  手机号码
-                        telphone: param.telphone, // 电话
-                        cardfrontphotourl: param.cardfrontphotourl, // 正面照片
-                        cardaddress: param.cardaddress,  // 证件地址
-                        cityid: param.cityid, //
-                        districtid: param.districtid, // 地区
-                        // countryid: param.,
-                        provinceid: param.provinceid, //省
-                        contactname: param.contactname,  // 联系人
-                        legalpersonname: param.legalpersonname,  // 法人姓名(企业)
-                        taxpayernum: param.taxpayernum, // 纳税人识别号
-                        email: param.email,  // email
-                    }
-                    applyAction(paramReq);
-                    console.log('values', formState);
-                })
-                .catch((error: ValidateErrorEntity<FormState>) => {
-                    console.log('error', error);
-                });
-        }
-        initData(() => {});
-        return {
-            formState,
-            rules,
-            formRef,
-            cardTypeList,
-            isPersonal,
-            visible,
-            cancel,
-            submit,
-            loading,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.add-account-info {
-}
-</style
->;

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 注销业务账户 -->
+  <!-- 注销交易账户 -->
   <a-modal class="add-custom"
-           title="注销业务账户"
+           title="注销交易账户"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/cancel-trader/index.vue

@@ -0,0 +1,146 @@
+<template>
+  <!-- 注销业务账户 -->
+  <a-modal class="add-custom"
+           title="注销业务账户"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">取消
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">注销
+      </a-button>
+    </template>
+    <a-form class="inlineForm"
+            :model="formState">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <span class="white">{{formState.accountname}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <span class="white">{{formState.logincode}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              value="2323423"
+                              v-model:value="formState.password"
+                              readonly />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="手机号码"
+                       name="">
+            <span class="white">{{formState.mobile}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="账户角色"
+                       name="userinfotype">
+            <a-checkbox-group class="commonCheckboxGroup"
+                              v-model:value="formState.roleids">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox :value="22">业务员</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox :value="23">跟单员</a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref, PropType, watchEffect } from 'vue';
+import { Modal } from 'ant-design-vue';
+import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { loginAccountOperate } from '@/services/proto/accountinfo';
+import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+import { handleBusinessForm } from '../setup';
+import { mergeTwoObj } from '@/utils/objHandle';
+
+export default defineComponent({
+    name: 'account_info_trade_btn_logout',
+    components: {},
+    props: {
+        selectedData: {
+            default: {},
+            type: Object as PropType<ErmcpLoginUser>,
+        },
+    },
+    setup(props, context) {
+        // 控制关闭弹窗
+        const { visible, cancel } = closeModal('account_info_trade_btn_logout');
+        const loading = ref<boolean>(false);
+        const { formState } = handleBusinessForm();
+        watchEffect(() => {
+            if (visible.value) {
+                mergeTwoObj(formState, props.selectedData);
+            }
+        });
+        function submit() {
+            Modal.confirm({
+                title: '是否确认注销该账户',
+                okText: '确认注销',
+                cancelText: '取消',
+                onOk() {
+                    let reqParam: LoginaccountOperateReq = {
+                        userid: props.selectedData.userid,
+                        loginid: props.selectedData.loginid,
+                        operatetype: 7, // 5: 锁定 6：解锁
+                        logintaaccounts: [],
+                    };
+                    requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['账户注销成功', '账户注销失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
+                },
+                onCancel() {
+                    console.log('Cancel');
+                },
+            });
+        }
+
+        return {
+            formState,
+            // rules,
+            // formRef,
+            // cardTypeList,
+            // isPersonal,
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.add-custom {
+}
+</style
+>;

src/views/information/account_info/compoments/detail-trader/index.vue

@@ -0,0 +1,107 @@
+<template>
+  <!-- 交易账号详情-->
+  <a-modal class="add-custom custom-detail"
+           title="交易账号详情"
+           v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                @click="cancel">关闭</a-button>
+    </template>
+    <a-form class="inlineForm"
+            :model="formState">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <span class="white">{{formState.accountname}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <span class="white">{{formState.logincode}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              value="2323423"
+                              v-model:value="formState.password"
+                              readonly />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="手机号码"
+                       name="">
+            <span class="white">{{formState.mobile}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="账户角色"
+                       name="userinfotype">
+            <a-checkbox-group class="commonCheckboxGroup"
+                              v-model:value="formState.roleids">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox :value="22">业务员</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox :value="23">跟单员</a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, watchEffect } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
+import { mergeTwoObj } from '@/utils/objHandle';
+import { handleBusinessForm } from '../setup';
+import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+
+export default defineComponent({
+    name: 'business-detail',
+    components: {},
+    props: {
+        selectedData: {
+            type: Object as PropType<ErmcpLoginUser>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const { visible, cancel } = closeModal('detail');
+        const { formState } = handleBusinessForm();
+        watchEffect(() => {
+            if (visible.value) {
+                mergeTwoObj(formState, props.selectedData);
+            }
+        });
+        return {
+            visible,
+            cancel,
+            formState,
+            maskClosableFlag: false,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.custom-detail {
+    .ant-form.inlineForm {
+        margin-top: 20px;
+    }
+}
+</style>;

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

@@ -77,7 +77,7 @@ import { mergeTwoObj } from '@/utils/objHandle';
 import { handleBusinessForm } from '../setup';
 
 export default defineComponent({
-    name: 'add-custom',
+    name: 'account_info_business_btn_locked',
     components: {},
     props: {
         selectedData: {

src/views/information/account_info/compoments/locked-trader/index.vue

@@ -0,0 +1,135 @@
+<template>
+  <!-- 锁定交易账户 -->
+  <a-modal class="add-custom"
+           title="锁定交易账户"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">锁定</a-button>
+    </template>
+    <a-form class="inlineForm"
+            :model="formState">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <span class="white">{{formState.accountname}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <span class="white">{{formState.logincode}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              value="2323423"
+                              v-model:value="formState.password"
+                              readonly />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="手机号码"
+                       name="">
+            <span class="white">{{formState.mobile}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="账户角色"
+                       name="userinfotype">
+            <a-checkbox-group class="commonCheckboxGroup"
+                              v-model:value="formState.roleids">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox :value="22">业务员</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox :value="23">跟单员</a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref, PropType, watchEffect } from 'vue';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { loginAccountOperate } from '@/services/proto/accountinfo';
+import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
+import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+import { Modal } from 'ant-design-vue';
+import { mergeTwoObj } from '@/utils/objHandle';
+import { handleBusinessForm } from '../setup';
+
+export default defineComponent({
+    name: 'account_info_trade_btn_locked',
+    components: {},
+    props: {
+        selectedData: {
+            default: {},
+            type: Object as PropType<ErmcpLoginUser>,
+        },
+    },
+    setup(props, context) {
+        // 控制关闭弹窗
+        const { visible, cancel } = closeModal('account_info_trade_btn_locked');
+        const loading = ref<boolean>(false);
+        const { formState } = handleBusinessForm();
+        watchEffect(() => {
+            if (visible.value) {
+                mergeTwoObj(formState, props.selectedData);
+            }
+        });
+        function submit() {
+            Modal.confirm({
+                title: '是否确认锁定该账户',
+                okText: '确认锁定',
+                cancelText: '取消',
+                onOk() {
+                    let reqParam: LoginaccountOperateReq = {
+                        userid: props.selectedData.userid,
+                        loginid: props.selectedData.loginid,
+                        operatetype: 5, // 5: 锁定 6：解锁
+                        logintaaccounts: [],
+                    };
+                    requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['账户锁定成功', '账户锁定失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
+                },
+                onCancel() {
+                    console.log('Cancel');
+                },
+            });
+        }
+        return {
+            formState,
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.add-custom {
+}
+</style
+>;

src/views/information/account_info/compoments/reset-trader/index.vue

@@ -0,0 +1,126 @@
+<template>
+  <!-- 重置交易员账户密码 -->
+  <a-modal class="add-custom"
+           title="重置交易员账户密码"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">完成
+      </a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="accountname">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     readonly
+                     v-model:value="formState.accountname"
+                     placeholder="请输入登录账号" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="原密码"
+                       name="oldPassword">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              v-model:value="formState.oldPassword"
+                              placeholder="请输入原密码" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="新密码"
+                       name="password">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              v-model:value="formState.password"
+                              placeholder="请输入8到20个字符的新密码" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="确认新密码"
+                       name="comfirePassword">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              v-model:value="formState.comfirePassword"
+                              placeholder="请再次确认新密码" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref, toRaw, PropType, watchEffect } from 'vue';
+import { ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
+import { handleBusinessForm } from './setup';
+import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+import { BusinessFormState } from '../interface';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { loginAccountOperate } from '@/services/proto/accountinfo';
+import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
+
+export default defineComponent({
+    name: 'account_info_trade_btn_reset',
+    props: {
+        selectedData: {
+            default: {},
+            type: Object as PropType<ErmcpLoginUser>,
+        },
+    },
+    setup(props, context) {
+        // 控制关闭弹窗
+        const { visible, cancel } = closeModal('account_info_trade_btn_reset');
+        const { rules, formState, formRef } = handleBusinessForm();
+        const loading = ref<boolean>(false);
+        watchEffect(() => {
+            if (visible.value) {
+                formState.accountname = props.selectedData.accountname;
+            }
+        });
+
+        function submit() {
+            let reqParam: LoginaccountOperateReq = {
+                userid: props.selectedData.userid,
+                loginid: props.selectedData.loginid,
+                operatetype: 7, // 5: 锁定 6：解锁
+                logintaaccounts: [],
+            };
+            debugger;
+            console.log('reqParam', reqParam);
+            requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['重置登录账户密码成功', '重置登录账户密码失败:']).then(() => {
+                cancel();
+                context.emit('refresh');
+            });
+        }
+
+        return {
+            formState,
+            rules,
+            formRef,
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.add-custom {
+}
+</style
+>;

src/views/information/account_info/compoments/reset-trader/interface.ts

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

src/views/information/account_info/compoments/reset-trader/setup.ts

@@ -0,0 +1,37 @@
+import { reactive, ref, UnwrapRef } from "vue";
+import { FormState } from './interface';
+
+
+/**
+ * 表单
+ * @returns 
+ */
+export function handleBusinessForm() {
+    const formRef = ref();
+    const formState: UnwrapRef<FormState> = reactive({
+        accountname: '',
+        password: '',
+        oldPassword: '',
+        comfirePassword: '',
+    })
+    const validatePassword = () => {
+        const { comfirePassword, password } = formState
+        if (comfirePassword && comfirePassword === password) {
+            return Promise.resolve();
+        } else {
+            return Promise.reject('确认新密码错误');
+        }
+    }
+    const rules = {
+        password: [{ required: true, message: '请输入账户密码', trigger: 'blur' }],
+        oldPassword: [{ required: true, message: '请输入原密码', trigger: 'blur' }],
+        comfirePassword: [{ required: true, validator: validatePassword, trigger: 'blur' }],
+
+    }
+    return { rules, formState, formRef }
+}
+
+
+
+
+

src/views/information/account_info/compoments/unlocked-trader/index.vue

@@ -0,0 +1,135 @@
+<template>
+  <!-- 解锁交易账户 -->
+  <a-modal class="add-custom"
+           title="解锁交易账户"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">锁定</a-button>
+    </template>
+    <a-form class="inlineForm"
+            :model="formState">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <span class="white">{{formState.accountname}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <span class="white">{{formState.logincode}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              value="2323423"
+                              v-model:value="formState.password"
+                              readonly />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="手机号码"
+                       name="">
+            <span class="white">{{formState.mobile}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="账户角色"
+                       name="userinfotype">
+            <a-checkbox-group class="commonCheckboxGroup"
+                              v-model:value="formState.roleids">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox :value="22">业务员</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox :value="23">跟单员</a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref, PropType, watchEffect } from 'vue';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { loginAccountOperate } from '@/services/proto/accountinfo';
+import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
+import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+import { Modal } from 'ant-design-vue';
+import { mergeTwoObj } from '@/utils/objHandle';
+import { handleBusinessForm } from '../setup';
+
+export default defineComponent({
+    name: 'account_info_trade_btn_unlocked',
+    components: {},
+    props: {
+        selectedData: {
+            default: {},
+            type: Object as PropType<ErmcpLoginUser>,
+        },
+    },
+    setup(props, context) {
+        // 控制关闭弹窗
+        const { visible, cancel } = closeModal('account_info_trade_btn_unlocked');
+        const loading = ref<boolean>(false);
+        const { formState } = handleBusinessForm();
+        watchEffect(() => {
+            if (visible.value) {
+                mergeTwoObj(formState, props.selectedData);
+            }
+        });
+        function submit() {
+            Modal.confirm({
+                title: '是否确认解锁该账户',
+                okText: '确认解锁',
+                cancelText: '取消',
+                onOk() {
+                    let reqParam: LoginaccountOperateReq = {
+                        userid: props.selectedData.userid,
+                        loginid: props.selectedData.loginid,
+                        operatetype: 6, // 5: 锁定 6：解锁
+                        logintaaccounts: [],
+                    };
+                    requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['解锁锁定成功', '解锁锁定失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
+                },
+                onCancel() {
+                    console.log('Cancel');
+                },
+            });
+        }
+        return {
+            formState,
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.add-custom {
+}
+</style
+>;

src/views/information/account_info/list/account_info_business/index.vue

@@ -83,7 +83,7 @@ import Modify from '../../compoments/modify-business/index.vue';
 import Reset from '../../compoments/reset-business/index.vue';
 import Locked from '../../compoments/locked-business/index.vue';
 import Cancel from '../../compoments/cancel-business/index.vue';
-import Detail from '../../compoments/business-detail/index.vue';
+import Detail from '../../compoments/detail-business/index.vue';
 import Unlocked from '../../compoments/unlocked-business/index.vue';
 import { ErmcpLoginUser, ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 import { getUserName } from '@/services/bus/user';

src/views/information/account_info/list/account_info_trade/index.vue

@@ -55,10 +55,20 @@
         </a-collapse>
       </a-collapse-panel>
     </a-collapse>
-    <Modify @refresh="queryTable"
-            :selectedData="moreOptenAction" />
     <Add @refresh="queryTable"
          :selectedData="addModelData" />
+    <Modify @refresh="queryTable"
+            :selectedData="moreOptenAction" />
+    <Locked @refresh="queryTable"
+            :selectedData="moreOptenAction" />
+    <Unlocked @refresh="queryTable"
+              :selectedData="moreOptenAction" />
+    <Cancel @refresh="queryTable"
+            :selectedData="moreOptenAction" />
+    <Reset @refresh="queryTable"
+           :selectedData="moreOptenAction" />
+    <Detail :selectedData="moreOptenAction" />
+
   </div>
 </template>
 
@@ -70,6 +80,11 @@ import { queryTableList } from './setup';
 import { getUserName } from '@/services/bus/user';
 import Modify from '../../compoments/modify-traders/index.vue';
 import Add from '../../compoments/add-traders/index.vue';
+import Locked from '../../compoments/locked-trader/index.vue';
+import Unlocked from '../../compoments/unlocked-trader/index.vue';
+import Cancel from '../../compoments/cancel-trader/index.vue';
+import Reset from '../../compoments/reset-trader/index.vue';
+import Detail from '../../compoments/detail-trader/index.vue';
 import { handleModalData } from '../setup';
 import { ErmcpLoginUser, ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 
@@ -81,6 +96,11 @@ export default defineComponent({
         filterCustomTable,
         Modify,
         Add,
+        Locked,
+        Unlocked,
+        Cancel,
+        Reset,
+        Detail,
     },
     setup() {
         const { loading, tableList, queryTable } = queryTableList();

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

@@ -1,110 +1,110 @@
 <template>
-  <!-- 发票审核-->
-  <a-modal class="add-custom custom-detail"
-           title="发票审核"
-           v-model:visible="visible"
-           centered
-           :maskClosable="maskClosableFlag"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">关闭
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="pass">审核通过
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @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">{{ 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">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="发票金额">
-              <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</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.invoiceamount) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登记时间">
-              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+    <!-- 发票审核-->
+    <a-modal class="add-custom custom-detail"
+             title="发票审核"
+             v-model:visible="visible"
+             centered
+             :maskClosable="maskClosableFlag"
+             @cancel="cancel"
+             width="890px">
+        <template #footer>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="cancel">关闭
+            </a-button>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="pass">审核通过
+            </a-button>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @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">{{ 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">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="发票金额">
+                            <span class="white">{{ formatValue(selectedRow.InvoiceAmount) }}</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.invoiceamount) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="登记时间">
+                            <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { mergeObj } from '@/utils/objHandle';
-import { getStatusName } from '@/common/constants/enumsName';
-import { formatValue, formatTime } from '@/common/methods';
-import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
-import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { Modal } from 'ant-design-vue';
-import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
+import {closeModal} from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
+import {mergeObj} from '@/utils/objHandle';
+import {getStatusName} from '@/common/constants/enumsName';
+import {formatValue, formatTime} from '@/common/methods';
+import {QryBussinessFpRsp} from '@/services/go/ermcp/finance-review/interface';
+import {invoiceStatusName} from '@/views/manage/finance-review/setup';
+import {getPriceTypeName} from '@/views/information/spot-contract/setup';
+import {Modal} from 'ant-design-vue';
+import {ContractOperateApplyReq} from '@/services/proto/contract/interface';
 import Long from 'long';
-import { somePriceControl } from '@/views/manage/business-review/components/setup';
-import { financeControl } from '@/views/manage/finance-review/components/setup';
+import {somePriceControl} from '@/views/manage/business-review/components/setup';
+import {financeControl} from '@/views/manage/finance-review/components/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_audit',
@@ -116,9 +116,10 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('finance_review_invoice_audit');
+        const {visible, cancel} = closeModal('finance_review_invoice_audit');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+
         function submit() {
             loading.value = true;
             setTimeout(() => {
@@ -126,6 +127,7 @@ export default defineComponent({
                 cancel();
             }, 200);
         }
+
         // 审核通过
         function pass() {
             Modal.confirm({
@@ -142,13 +144,15 @@ export default defineComponent({
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch((err) => {});
+                        .catch((err) => {
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
                 },
             });
         }
+
         // 审核拒绝
         function refuse() {
             Modal.confirm({
@@ -165,7 +169,8 @@ export default defineComponent({
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch((err) => {});
+                        .catch((err) => {
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');

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

@@ -1,106 +1,106 @@
 <template>
-  <!-- 撤销发票登记-->
-  <a-modal class="add-custom custom-detail"
-           title="撤销发票登记"
-           v-model:visible="visible"
-           centered
-           :maskClosable="maskClosableFlag"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">关闭
-      </a-button>
+    <!-- 撤销发票登记-->
+    <a-modal class="add-custom custom-detail"
+             title="撤销发票登记"
+             v-model:visible="visible"
+             centered
+             :maskClosable="maskClosableFlag"
+             @cancel="cancel"
+             width="890px">
+        <template #footer>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="submit">关闭
+            </a-button>
 
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @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">{{ 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">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="发票金额">
-              <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</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.invoiceamount) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登记时间">
-              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @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">{{ 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">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="发票金额">
+                            <span class="white">{{ formatValue(selectedRow.InvoiceAmount) }}</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.invoiceamount) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="登记时间">
+                            <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { mergeObj } from '@/utils/objHandle';
-import { getStatusName } from '@/common/constants/enumsName';
-import { formatValue, formatTime } from '@/common/methods';
-import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
-import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { Modal } from 'ant-design-vue';
-import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
+import {closeModal} from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
+import {mergeObj} from '@/utils/objHandle';
+import {getStatusName} from '@/common/constants/enumsName';
+import {formatValue, formatTime} from '@/common/methods';
+import {QryBussinessFpRsp} from '@/services/go/ermcp/finance-review/interface';
+import {invoiceStatusName} from '@/views/manage/finance-review/setup';
+import {getPriceTypeName} from '@/views/information/spot-contract/setup';
+import {Modal} from 'ant-design-vue';
+import {ContractOperateApplyReq} from '@/services/proto/contract/interface';
 import Long from 'long';
-import { somePriceControl } from '@/views/manage/business-review/components/setup';
-import { financeControl } from '@/views/manage/finance-review/components/setup';
+import {somePriceControl} from '@/views/manage/business-review/components/setup';
+import {financeControl} from '@/views/manage/finance-review/components/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_cancel',
@@ -112,10 +112,13 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('finance_review_invoice_cancel');
+        const {visible, cancel} = closeModal('finance_review_invoice_cancel');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
-        function submit() {}
+
+        function submit() {
+        }
+
         function back() {
             Modal.confirm({
                 title: '是否确认撤销',
@@ -131,13 +134,15 @@ export default defineComponent({
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch((err) => {});
+                        .catch((err) => {
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
                 },
             });
         }
+
         return {
             visible,
             cancel,