Merge remote-tracking branch 'origin/master'

src/views/information/account_info/compoments/add-managers-permission/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 新增权限模板 -->
+  <!-- 新增角色 -->
   <a-modal class="commonModal add-roles"
-           title="新增权限模板"
+           title="新增角色"
            v-model:visible="visible"
            @cancel="cancel"
            centered
@@ -25,7 +25,7 @@
             :rules="rules">
       <a-row :gutter="24">
         <a-col :span="24">
-          <a-form-item label="模板名称">
+          <a-form-item label="角色名称">
             <a-input class="dialogInput"
                      style="width: 200px"
                      v-model:value="name"

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

@@ -1,246 +0,0 @@
-<template>
-  <!-- 新增权限模板 -->
-  <a-modal class="commonModal add-powers"
-           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="24">
-          <a-form-item label="模板名称"
-                       name="">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入模板名称" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="权限功能"
-                       name="">
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <div class="powerTable">
-            <a-checkbox-group class="commonCheckboxGroup">
-              <div class="powerRow">
-                <div class="powerLeft">
-                  <a-checkbox value="A">采购</a-checkbox>
-                </div>
-                <div class="powerMiddle">
-                  <div>
-                    <a-checkbox value="B">待点价</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="C">履约交收</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="D">全部</a-checkbox>
-                  </div>
-                </div>
-                <div class="powerRight">
-                  <div>
-                    <a-checkbox value="E">点价登记</a-checkbox>
-                    <a-checkbox value="F">详情</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="G">交收登记</a-checkbox>
-                    <a-checkbox value="H">款项登记</a-checkbox>
-                    <a-checkbox value="I">发票登记</a-checkbox>
-                    <a-checkbox value="J">入库登记</a-checkbox>
-                    <a-checkbox value="K">详情</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="L">全部</a-checkbox>
-                    <a-checkbox value="M">详情</a-checkbox>
-                  </div>
-                </div>
-              </div>
-              <div class="powerRow">
-                <div class="powerLeft">
-                  <a-checkbox value="N">期货</a-checkbox>
-                </div>
-                <div class="powerMiddle">
-                  <div>
-                    <a-checkbox value="O">待点价</a-checkbox>
-                  </div>
-                </div>
-                <div class="powerRight">
-                  <div>
-                    <a-checkbox value="P">交易</a-checkbox>
-                    <a-checkbox value="Q">买入</a-checkbox>
-                    <a-checkbox value="R">卖出</a-checkbox>
-                    <a-checkbox value="S">平仓</a-checkbox>
-                  </div>
-                </div>
-              </div>
-              <div class="powerRow">
-                <div class="powerLeft">
-                  <a-checkbox value="T">敞口</a-checkbox>
-                </div>
-                <div class="powerMiddle">
-                  <div>
-                    <a-checkbox value="U">实时敞口</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="V">现货头寸</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="W">期货头寸</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="X">历史敞口</a-checkbox>
-                  </div>
-                </div>
-                <div class="powerRight">
-                  <div>
-                    <a-checkbox value="Y">期货明细</a-checkbox>
-                    <a-checkbox value="Z">现货明细</a-checkbox>
-                    <a-checkbox value="A1">下单</a-checkbox>
-                  </div>
-                  <div>&nbsp;</div>
-                  <div>&nbsp;</div>
-                  <div>&nbsp;</div>
-                </div>
-              </div>
-            </a-checkbox-group>
-          </div>
-        </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 { AllEnums } from '@/services/go/commonService/interface';
-import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
-
-export default defineComponent({
-    name: 'add-custom',
-    components: {},
-    setup() {
-        // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_business_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);
-        //             applyAction(param);
-        //             console.log('values', formState);
-        //         })
-        //         .catch((error: ValidateErrorEntity<FormState>) => {
-        //             console.log('error', error);
-        //         });
-        // }
-        return {
-            // formState,
-            // rules,
-            // formRef,
-            // cardTypeList,
-            // isPersonal,
-            visible,
-            cancel,
-            // submit,
-            // loading,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-</style
->;

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

@@ -123,7 +123,7 @@ export default defineComponent({
             if (visible.value && props.selectedData) {
                 const { selectedData } = props;
                 mergeTwoObj(formState, selectedData);
-                formState.logintaaccounts = selectedData.acclist.map((e) => e.accountid);
+                formState.logintaaccounts = selectedData.acclist?.map((e) => e.accountid);
                 formState.accountname = props.selectedData.loginname;
             }
         });

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

@@ -27,7 +27,7 @@
             <a-input class="dialogInput"
                      readonly
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
@@ -37,7 +37,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>
@@ -111,7 +111,7 @@ export default defineComponent({
                        if (visible.value && props.selectedData) {
                 const { selectedData } = props;
                 mergeTwoObj(formState, selectedData);
-                formState.logintaaccounts = selectedData.acclist.map((e) => e.accountid);
+                formState.logintaaccounts = selectedData.acclist?.map((e) => e.accountid);
                 formState.accountname = props.selectedData.loginname;
             }
         });

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

@@ -117,7 +117,7 @@ export default defineComponent({
             if (visible.value && props.selectedData) {
                 const { selectedData } = props;
                 mergeTwoObj(formState, selectedData);
-                formState.logintaaccounts = selectedData.acclist.map((e) => e.accountid);
+                formState.logintaaccounts = selectedData.acclist?.map((e) => e.accountid);
                 formState.accountname = props.selectedData.loginname;
             }
         });

src/views/information/account_info/compoments/managers-permission-delete/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 删除权限模板 -->
+  <!-- 删除角色 -->
   <a-modal class="commonModal add-roles"
-           title="删除权限模板"
+           title="删除角色"
            v-model:visible="visible"
            @cancel="cancel"
            centered
@@ -25,7 +25,7 @@
             :rules="rules">
       <a-row :gutter="24">
         <a-col :span="24">
-          <a-form-item label="模板名称">
+          <a-form-item label="角色名称">
             <a-input class="dialogInput"
                      style="width: 200px"
                      v-model:value="name"
@@ -111,8 +111,8 @@
             const name = ref<string>('')
             watchEffect(() => {
                 if (visible.value) {
-                    const { modifiername, areauserid, autoid} = props.selectedData;
-                    name.value = modifiername
+                    const { rolename, areauserid, autoid} = props.selectedData;
+                    name.value = rolename
                     const param = {userid: areauserid, roleid: autoid.toString()}
                     queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading, param).then((res) => {
                         tableList.value = res;

src/views/information/account_info/compoments/managers-permission-detail/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 权限模板详情 -->
+  <!-- 角色详情 -->
   <a-modal class="commonModal add-roles"
-           title="权限模板详情"
+           title="角色详情"
            v-model:visible="visible"
            @cancel="cancel"
            centered
@@ -20,7 +20,7 @@
             :rules="rules">
       <a-row :gutter="24">
         <a-col :span="24">
-          <a-form-item label="模板名称">
+          <a-form-item label="角色名称">
             <a-input class="dialogInput"
                      style="width: 200px"
                      v-model:value="name"
@@ -106,8 +106,8 @@
             const name = ref<string>('')
             watchEffect(() => {
                 if (visible.value) {
-                    const { modifiername, areauserid, autoid} = props.selectedData;
-                    name.value = modifiername
+                    const { rolename, areauserid, autoid} = props.selectedData;
+                    name.value = rolename
                     const param = {userid: areauserid, roleid: autoid.toString()}
                     queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading, param).then((res) => {
                         tableList.value = res;

src/views/information/account_info/compoments/managers-permission-modify/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 修改权限模板 -->
+  <!-- 修改角色 -->
   <a-modal class="commonModal add-roles"
-           title="修改权限模板"
+           title="修改角色"
            v-model:visible="visible"
            @cancel="cancel"
            centered
@@ -26,7 +26,7 @@
             :rules="rules">
       <a-row :gutter="24">
         <a-col :span="24">
-          <a-form-item label="模板名称">
+          <a-form-item label="角色名称">
             <a-input class="dialogInput"
                      style="width: 200px"
                      v-model:value="name"
@@ -109,8 +109,8 @@
             const name = ref<string>('')
             watchEffect(() => {
                 if (visible.value) {
-                    const { modifiername, areauserid, autoid} = props.selectedData;
-                    name.value = modifiername
+                    const { rolename, areauserid, autoid} = props.selectedData;
+                    name.value = rolename
                     const param = {userid: areauserid, roleid: autoid.toString()}
                     queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading, param).then((res) => {
                         tableList.value = res;

src/views/information/account_info/compoments/modify-child-traders/index.vue

@@ -115,7 +115,7 @@ export default defineComponent({
             if (visible.value && props.selectedData) {
                 const { selectedData } = props;
                 mergeTwoObj(formState, selectedData);
-                formState.logintaaccounts = selectedData.acclist.map((e) => e.accountid);
+                formState.logintaaccounts = selectedData.acclist?.map((e) => e.accountid);
                 formState.accountname = selectedData.loginname;
             }
         });

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

@@ -1,246 +0,0 @@
-<template>
-  <!-- 修改权限模板 -->
-  <a-modal class="commonModal modify-powers"
-           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="24">
-          <a-form-item label="模板名称"
-                       name="">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入模板名称" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="权限功能"
-                       name="">
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <div class="powerTable">
-            <a-checkbox-group class="commonCheckboxGroup">
-              <div class="powerRow">
-                <div class="powerLeft">
-                  <a-checkbox value="A">采购</a-checkbox>
-                </div>
-                <div class="powerMiddle">
-                  <div>
-                    <a-checkbox value="B">待点价</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="C">履约交收</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="D">全部</a-checkbox>
-                  </div>
-                </div>
-                <div class="powerRight">
-                  <div>
-                    <a-checkbox value="E">点价登记</a-checkbox>
-                    <a-checkbox value="F">详情</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="G">交收登记</a-checkbox>
-                    <a-checkbox value="H">款项登记</a-checkbox>
-                    <a-checkbox value="I">发票登记</a-checkbox>
-                    <a-checkbox value="J">入库登记</a-checkbox>
-                    <a-checkbox value="K">详情</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="L">全部</a-checkbox>
-                    <a-checkbox value="M">详情</a-checkbox>
-                  </div>
-                </div>
-              </div>
-              <div class="powerRow">
-                <div class="powerLeft">
-                  <a-checkbox value="N">期货</a-checkbox>
-                </div>
-                <div class="powerMiddle">
-                  <div>
-                    <a-checkbox value="O">待点价</a-checkbox>
-                  </div>
-                </div>
-                <div class="powerRight">
-                  <div>
-                    <a-checkbox value="P">交易</a-checkbox>
-                    <a-checkbox value="Q">买入</a-checkbox>
-                    <a-checkbox value="R">卖出</a-checkbox>
-                    <a-checkbox value="S">平仓</a-checkbox>
-                  </div>
-                </div>
-              </div>
-              <div class="powerRow">
-                <div class="powerLeft">
-                  <a-checkbox value="T">敞口</a-checkbox>
-                </div>
-                <div class="powerMiddle">
-                  <div>
-                    <a-checkbox value="U">实时敞口</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="V">现货头寸</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="W">期货头寸</a-checkbox>
-                  </div>
-                  <div>
-                    <a-checkbox value="X">历史敞口</a-checkbox>
-                  </div>
-                </div>
-                <div class="powerRight">
-                  <div>
-                    <a-checkbox value="Y">期货明细</a-checkbox>
-                    <a-checkbox value="Z">现货明细</a-checkbox>
-                    <a-checkbox value="A1">下单</a-checkbox>
-                  </div>
-                  <div>&nbsp;</div>
-                  <div>&nbsp;</div>
-                  <div>&nbsp;</div>
-                </div>
-              </div>
-            </a-checkbox-group>
-          </div>
-        </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 { AllEnums } from '@/services/go/commonService/interface';
-import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
-
-export default defineComponent({
-    name: 'add-custom',
-    components: {},
-    setup() {
-        // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_business_btn_modify');
-        // 证件类型
-        // 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);
-        //             applyAction(param);
-        //             console.log('values', formState);
-        //         })
-        //         .catch((error: ValidateErrorEntity<FormState>) => {
-        //             console.log('error', error);
-        //         });
-        // }
-        return {
-            // formState,
-            // rules,
-            // formRef,
-            // cardTypeList,
-            // isPersonal,
-            visible,
-            cancel,
-            // submit,
-            // loading,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.modify-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-</style
->;

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 修改交易用户 -->
   <a-modal class="commonModal add-traders"
-           title="修改交易员"
+           title="修改交易用户"
            v-model:visible="visible"
            @cancel="cancel"
            centered

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

@@ -30,15 +30,6 @@
           </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"

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

@@ -117,7 +117,7 @@ export default defineComponent({
             if (visible.value && props.selectedData) {
                 const { selectedData } = props;
                 mergeTwoObj(formState, selectedData);
-                formState.logintaaccounts = selectedData.acclist.map((e) => e.accountid);
+                formState.logintaaccounts = selectedData.acclist?.map((e) => e.accountid);
                 formState.accountname = props.selectedData.loginname;
             }
         });

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

@@ -49,7 +49,7 @@
             <template #header>
               <a-row class="contRow">
                 <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
-                <a-col :span="12">{{getRoleTypeName(sub.rolestatus)}}</a-col>
+                <a-col :span="12">{{getRoleTypeName(sub.loginstatus)}}</a-col>
               </a-row>
             </template>
             <BtnList :btnList="sub.btnList"
@@ -61,7 +61,7 @@
     <Add @refresh="handleBtnAction" />
     <AddChild @refresh="handleBtnAction"
               :accountList="accountList"
-              :secondBtnData="firstBtnData" />
+              :selectedData="firstBtnData" />
     <Modify @refresh="handleBtnAction"
             :selectedData="firstBtnData" />
     <Locked @refresh="handleBtnAction"
@@ -156,7 +156,12 @@ export default defineComponent({
                 accountList.value.length = 0;
                 res.forEach((el: ErmcpTaAccountEx) => {
                     const {  subacclist } = el;
-                    subacclist.forEach((e) => accountList.value.push(e));
+                    subacclist.forEach((e) => {
+                      if (e.tradestatus === 1) { //交易状态 - 1:正常
+                        accountList.value.push(e)
+                      }
+                    }
+                    );
                 });
             });
         });

src/views/information/custom/compoments/modify/index.vue

@@ -287,6 +287,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { QueryModifyUserInfoApply } from '@/services/go/ermcp/customInfo';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { validateAction } from '@/common/setup/form';
+import { delAddress } from '@/services/socket/address';
 
 export default defineComponent({
     name: 'modify-custom',
@@ -315,11 +316,12 @@ export default defineComponent({
         const countryid = ref<number>(0);
         watchEffect(() => {
             if (visible.value) {
-              console.log('selectedRow', props.selectedRow);
-              
                 userid.value = props.selectedRow.userid;
                 countryid.value = props.selectedRow.countryid;
                 mergeTwoObj(formState, props.selectedRow);
+                if(isPersonal()) {
+                  formState.username = props.selectedRow.customername
+                }
                 const { provinceid, cityid, address, mobile } = props.selectedRow;
                 formState.cardaddress = address
                 formState.mobilephone = mobile

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

@@ -63,7 +63,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="发票附件">
-              <span class="white">{{ formatValue(selectedRow.InvoiceAmount) }}</span>
+              <span class="white">{{ formatValue(selectedRow.attachurl) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">

src/views/manage/inventory-review/components/checkoutDetail/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 发票登记详情-->
+  <!-- 出库登记详情-->
   <a-modal class="add-custom custom-detail"
            title="出库登记详情"
            v-model:visible="visible"