Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/information/account_info/compoments/add/index.vue
#	src/views/manage/finance-review/components/invoiceDetail/index.vue

src/common/components/buttonList/index.vue

@@ -3,7 +3,7 @@
     <a-button :class="item.className"
               v-for="item in btnList"
               :key="item.lable"
-              @click="item.callback">
+              @click.stop="item.callback">
       {{item.lable}}
     </a-button>
   </div>
@@ -25,6 +25,6 @@ export default defineComponent({
 
 <style lang="less">
 .btn-list {
-  display: inline-flex;
+    display: inline-flex;
 }
 </style>

src/common/setup/filter/index.ts

@@ -7,8 +7,8 @@ export function handleFilter(select: SelectList[] | Ref<SelectList[]>, input: In
     const selected = isRef(select) ? select.value.map(e => {
         const fn = e.change;
         if (fn) {
-            e.change = (id: number) => {
-                fn(id);
+            e.change = (value: any) => {
+                fn(value.key);
                 search()
             }
         } else {

src/services/bus/allEnum.ts

@@ -44,6 +44,6 @@ export function getItemEnumList(enumdiccode: keyof EnumKey): AllEnums[] {
  * @returns 
  */
 export function getItemEnumName(enumdiccode: keyof EnumKey, enumdicid: number): string {
-    const temp = getItemEnumList(enumdiccode).find(e => e.enumdicid === enumdicid)
+    const temp = getItemEnumList(enumdiccode).find(e => e.enumitemname === enumdicid)
     return temp ? temp.enumdicname : '--'
 }

src/utils/objHandle/index.ts

@@ -55,7 +55,6 @@ export function objectToUint8Array(data: object) {
 
 // export function objectToUint8Array(data: object): Uint8Array {
 //     const encode = encodeURI(JSON.stringify(data));// 对字符串进行编码
-//     debugger
 //     const base64String = btoa(encode);// 对编码的字符串转化base64
 //     const padding = '='.repeat((4 - base64String.length % 4) % 4);
 //     // const base64 = (base64String + padding).replace(/\-/g, '+').replace(/_/g, '/');

src/views/business/purchase/components/funds/index.vue

@@ -193,7 +193,6 @@ export default defineComponent({
         //   if(newValue){
         //     initData(()=>{
         //       QueryMiddleGoodsChange(props.selectedRow.deliverygoodsid).then(res=>{
-        //         debugger
         //       })
         //     })
         //   }

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

@@ -0,0 +1,242 @@
+<template>
+  <!-- 新增套利 -->
+  <a-modal class="commonModal add-arbitrage"
+           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="">
+            <span class="white">套利</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="现货品种"
+                       class="checkboxGroupItem"
+                       name="">
+            <a-checkbox-group class="commonCheckboxGroup">
+              <a-row>
+                <a-col>
+                  <a-checkbox value="A">钢管</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="B">铁矿石</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="C">大豆</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="D">玉米</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="E">棉花</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="F">铜板</a-checkbox>
+                </a-col>
+              </a-row>
+              <a-row>
+                <a-col>
+                  <a-checkbox value="G">铜块</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="H">螺纹钢</a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="期货账户"
+                       class="checkboxGroupItem"
+                       name="">
+            <a-checkbox-group class="commonCheckboxGroup autoWidth">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox value="A">期货母账户/25000000010</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox value="B">铜套保专用账户/25000000011</a-checkbox>
+                </a-col>
+              </a-row>
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox value="C">银套保专用账户/25000000012</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox value="D">铁矿石套保专用账户/25000000013</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 { 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-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 新增账户 -->
-  <!-- <a-modal class="commonModal add-business-info"
-           title="新增业务账户"
+  <a-modal class="commonModal add-business-info"
+           title="新增登录账户"
            v-model:visible="visible"
            @cancel="cancel"
            centered
@@ -20,465 +20,55 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="账户角色"
-                       name="userinfotype">
+                       name="LoginTaaccount">
             <a-checkbox-group class="commonCheckboxGroup">
               <a-row>
                 <a-col :span="12">
-                  <a-checkbox value="A">业务员</a-checkbox>
+                  <a-checkbox value="22">业务员</a-checkbox>
                 </a-col>
                 <a-col :span="12">
-                  <a-checkbox value="B">跟单员</a-checkbox>
+                  <a-checkbox value="23">跟单员</a-checkbox>
                 </a-col>
               </a-row>
             </a-checkbox-group>
           </a-form-item>
         </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录账号"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="手机号码"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-  <!-- 新增交易员 -->
-  <!-- <a-modal class="commonModal add-traders"
-           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="">
-            <span class="white">王凌团队</span>
-          </a-form-item>
-        </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录账号"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <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="授权期货账户"
-                         class="checkboxGroupItem"
-                         name="">
-              <a-checkbox-group class="commonCheckboxGroup">
-                <a-row>
-                  <a-col :span="12">
-                    <a-checkbox value="A">期货子账户/250000010003</a-checkbox>
-                  </a-col>
-                  <a-col :span="12">
-                    <a-checkbox value="B">铜套保专用账户/25000000011</a-checkbox>
-                  </a-col>
-                  <a-col :span="12" class="mt20">
-                    <a-checkbox value="C">银套保专用账户/250000010003</a-checkbox>
-                  </a-col>
-                  <a-col :span="12" class="mt20">
-                    <a-checkbox value="D">铁矿石套保专用账户/25000000013Q</a-checkbox>
-                  </a-col>
-                </a-row>
-              </a-checkbox-group>
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-  <!-- 新增管理员 -->
-  <!-- <a-modal class="commonModal add-managers"
-           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="">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择账户权限">
-              <a-select-option value="权限一">权限一</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录账号"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="手机号码"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-  <!-- 新增权限模板 -->
-  <!-- <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-form-item label="账户名称"
+                       name="logincode">
             <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入模板名称" />
+                     style="width: 200px"
+                     v-model:value="formState.logincode"
+                     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> -->
-  <!-- 新增期货账户 -->
-  <!-- <a-modal class="commonModal add-futures"
-           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-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择期货公司">
-              <a-select-option value="权限一">权限一</a-select-option>
-            </a-select>
+          <a-form-item label="登录账号"
+                       name="accountname">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="formState.accountname"
+                     placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货登录账号"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入期货登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="指定交易用户"
-                         name="">
-              <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择指定交易用户">
-              <a-select-option value="权限一">权限一</a-select-option>
-            </a-select>
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-   <!-- 新增期货子账户 -->
-  <!-- <a-modal class="commonModal add-futures-son"
-           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">
-            <span class="white">王小小/824327648</span>
+          <a-form-item label="登录密码"
+                       name="password">
+            <a-input-password class="dialogInput"
+                              v-model:value="formState.password"
+                              style="width: 200px"
+                              placeholder="请输入登录密码" />
           </a-form-item>
         </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货保证金"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入期货保证金" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货手续费"
-                         name="">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        placeholder="请选择期货手续费">
-                <a-select-option value="权限一">权限一</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-  <!-- 新增套利 -->
-  <a-modal class="commonModal add-arbitrage"
-           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="">
-            <span class="white">套利</span>
+          <a-form-item label="手机号码"
+                       name="mobile">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="formState.mobile"
+                     placeholder="请输入手机号码" />
           </a-form-item>
         </a-col>
-          <a-col :span="24">
-            <a-form-item label="现货品种"
-                         class="checkboxGroupItem"
-                         name="">
-              <a-checkbox-group class="commonCheckboxGroup">
-                <a-row>
-                  <a-col><a-checkbox value="A">钢管</a-checkbox></a-col>
-                  <a-col><a-checkbox value="B">铁矿石</a-checkbox></a-col>
-                  <a-col><a-checkbox value="C">大豆</a-checkbox></a-col>
-                  <a-col><a-checkbox value="D">玉米</a-checkbox></a-col>
-                  <a-col><a-checkbox value="E">棉花</a-checkbox></a-col>
-                  <a-col><a-checkbox value="F">铜板</a-checkbox></a-col>
-                </a-row>
-                <a-row>
-                  <a-col><a-checkbox value="G">铜块</a-checkbox></a-col>
-                  <a-col><a-checkbox value="H">螺纹钢</a-checkbox></a-col>
-                </a-row>
-              </a-checkbox-group>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="期货账户"
-                         class="checkboxGroupItem"
-                         name="">
-              <a-checkbox-group class="commonCheckboxGroup autoWidth">
-                <a-row>
-                  <a-col :span="12"><a-checkbox value="A">期货母账户/25000000010</a-checkbox></a-col>
-                  <a-col :span="12"><a-checkbox value="B">铜套保专用账户/25000000011</a-checkbox></a-col>
-                </a-row>
-                <a-row>
-                  <a-col :span="12"><a-checkbox value="C">银套保专用账户/25000000012</a-checkbox></a-col>
-                  <a-col :span="12"><a-checkbox value="D">铁矿石套保专用账户/25000000013</a-checkbox></a-col>
-                </a-row>
-              </a-checkbox-group>
-            </a-form-item>
-          </a-col>
       </a-row>
     </a-form>
   </a-modal>
@@ -486,55 +76,37 @@
 
 <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';
+import { defineComponent, ref, toRaw } from 'vue';
+import { ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
+import { handleForm, FormState } from './setup';
 
 export default defineComponent({
-    name: 'add-custom',
+    name: 'add-business-info',
     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);
-        //         });
-        // }
+        const loading = ref<boolean>(false);
+        const { rules, formState, formRef } = handleForm();
+        function submit() {
+            formRef.value
+                .validate()
+                .then(() => {
+                    const param = toRaw(formState);
+                    console.log('values', param);
+                })
+                .catch((error: ValidateErrorEntity<FormState>) => {
+                    console.log('error', error);
+                });
+        }
         return {
-            // formState,
-            // rules,
-            // formRef,
-            // cardTypeList,
-            // isPersonal,
+            formState,
+            rules,
+            formRef,
             visible,
             cancel,
-            // submit,
-            // loading,
+            submit,
+            loading,
         };
     },
 });
@@ -542,101 +114,96 @@ export default defineComponent({
 
 <style lang="less">
 .add-business-info {
-  
 }
 .add-traders {
-  
 }
 .add-managers {
-
 }
 .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;
+    .powerTable {
+        width: 100%;
+        height: 100%;
+        border: 3px solid @m-grey11;
+        background-color: @m-black12;
+        font-size: 14px;
+        color: @m-white0;
         .flex;
         flex-direction: column;
-        div {
-          width: 100%;
-          height: 40px;
-          line-height: 40px;
-          padding: 0 8px;
-          border: 3px solid @m-grey11;
-          border-top: 0;
+        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+            width: 90px;
+            span + span {
+                margin-right: 0;
+            }
         }
-        div:last-child {
-          border-bottom: 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;
+                }
+            }
         }
-      }
-      .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;
-        }
-      }
     }
-  }
 }
 .add-futures {
-
 }
 .add-futures-son {
-
 }
 .add-arbitrage {
-  .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-    width: 100px;
-    span + span {
-      margin-right: 0;
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
     }
-  } 
-  .ant-checkbox-group.autoWidth {
-    width: 520px;
-    .ant-checkbox-wrapper {
-      width: auto;
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
     }
-  }
-  .checkboxGroupItem {
-    .ant-row {
-      margin-bottom: 10px;
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
     }
-  }
 }
 </style
 >;

src/views/information/account_info/compoments/add-business/setup.ts

@@ -0,0 +1,30 @@
+import { reactive, ref, UnwrapRef } from "vue";
+
+export interface FormState {
+    logincode: string // 登录账号
+    accountname: string // 账户名称
+    password: string // 登录密码（明文）
+    mobile?: string // 手机号码（明文）
+    LoginTaaccount: string // 期货账户（勾选交易员必填）
+}
+/**
+ * 表单
+ * @returns 
+ */
+export function handleForm() {
+    const formRef = ref();
+    const formState: UnwrapRef<FormState> = reactive({
+        logincode: '',
+        accountname: '',
+        password: '',
+        mobile: '',
+        LoginTaaccount: '',
+    })
+    const rules = {
+        logincode: [{ required: true, message: '请输入登录账号', trigger: 'blur' }],
+        accountname: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
+        LoginTaaccount: [{ required: true, message: '请选择货账户', trigger: 'blur' }],
+    }
+    return { rules, formState, formRef }
+}

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

@@ -0,0 +1,207 @@
+<template>
+  <a-modal class="commonModal add-futures-son"
+           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">
+            <span class="white">王小小/824327648</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="期货保证金"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入期货保证金" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="期货手续费"
+                       name="">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择期货手续费">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </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 { 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-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -0,0 +1,220 @@
+<template>
+  <!-- 新增期货账户 -->
+  <a-modal class="commonModal add-futures"
+           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-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择期货公司">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="期货登录账号"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入期货登录账号" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入登录密码" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="指定交易用户"
+                       name="">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择指定交易用户">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </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 { 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-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -0,0 +1,218 @@
+<template>
+  <!-- 新增管理员 -->
+  <a-modal class="commonModal add-managers"
+           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="">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择账户权限">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入登录账号" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入登录密码" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="手机号码"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     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 { 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-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -0,0 +1,275 @@
+<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-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -0,0 +1,238 @@
+<template>
+  <!-- 新增交易员 -->
+  <a-modal class="commonModal add-traders"
+           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="">
+            <span class="white">王凌团队</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入登录账号" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入登录密码" />
+          </a-form-item>
+        </a-col>
+        <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="授权期货账户"
+                       class="checkboxGroupItem"
+                       name="">
+            <a-checkbox-group class="commonCheckboxGroup">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox value="A">期货子账户/250000010003</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox value="B">铜套保专用账户/25000000011</a-checkbox>
+                </a-col>
+                <a-col :span="12"
+                       class="mt20">
+                  <a-checkbox value="C">银套保专用账户/250000010003</a-checkbox>
+                </a-col>
+                <a-col :span="12"
+                       class="mt20">
+                  <a-checkbox value="D">铁矿石套保专用账户/25000000013Q</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 { 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-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -1,27 +0,0 @@
-export interface FormState {
-    userinfotype: string; //客户类型
-    customername: string; //客户名称(企业名称)
-    nickname: string; //企业简称
-    cardtype: number | undefined; //证件类型
-
-    cardnum: string; //证件号码 (加密存储)
-    legalpersonname: string; //法人姓名(企业)
-    taxpayernum: string; //纳税人识别号
-    attachment1: string; //附件1
-    attachment2: string; //附件2
-    attachment3: string; //附件3
-    attachment4: string; //附件4
-    attachment5: string; //附件5
-    contactname: string; //联系人
-    mobilephone: string; //手机号码 (加密存储)
-    telphone: string; //联系电话(加密存储)
-    provinceid: number; //省
-    cityid: number; //市
-    districtid: number; //地区
-    remark: string; //备注
-    cardaddress: string; //证件地址 (加密存储)
-    username: string;//用户姓名
-    cardbackphotourl: string;//背面证件照地址
-    cardfrontphotourl: string;//正面证件照地址
-    email: string;//Email地址(加密存储)
-}

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

@@ -1,62 +0,0 @@
-
-import { getCardTypeEnumList } from '@/common/constants/enumsList';
-import { QueryAddUserInfoApply } from '@/services/go/ermcp/customInfo';
-import { AddUserInfoApplyReq } from '@/services/go/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { ref } from 'vue';
-import { FormState } from './interface';
-
-/**
- * 获取证件类型
- * @returns 
- */
-export function getCardType() {
-    const arr = [2, 4, 18, 21];
-    return getCardTypeEnumList().filter(e => arr.includes(e.enumitemname))
-}
-
-/**
- * 初始化表单数据
- * @returns 
- */
-export function initFormState(): FormState {
-    return {
-        userinfotype: '2',
-        customername: '',
-        nickname: '',
-        cardtype: undefined,
-        cardnum: '',
-        legalpersonname: '',
-        taxpayernum: '',
-        attachment1: '',
-        attachment2: '',
-        attachment3: '',
-        attachment4: '',
-        attachment5: '',
-        contactname: '',
-        mobilephone: '',
-        telphone: '',
-        provinceid: 0,
-        cityid: 0,
-        districtid: 0,
-        cardaddress: '',
-        remark: '',
-        username: '',
-        cardbackphotourl: '',
-        cardfrontphotourl: '',
-        email: '',
-    }
-}
-
-export function handleApply() {
-    const loading = ref<boolean>(false);
-    function applyAction(param: AddUserInfoApplyReq) {
-        loading.value = true;
-        QueryAddUserInfoApply(param).then(res => {
-            console.log('res', res);
-        }).catch(err => {
-            message.error(err)
-        }).finally(() => loading.value = false)
-    }
-    return { loading, applyAction }
-}

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

@@ -0,0 +1,114 @@
+<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.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="">
+            <span class="white">Y001</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <span class="white">业务跟单员</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"
+                              readonly />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="手机号码"
+                       name="">
+            <span class="white">13263529568</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="账户角色"
+                       name="userinfotype">
+            <a-checkbox-group class="commonCheckboxGroup">
+              <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-row>
+    </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 '@/views/information/custom/setup';
+import { formatValue, formatTime } from '@/common/methods';
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
+
+export default defineComponent({
+    name: 'custom-detail',
+    components: {},
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props) {
+        console.log('props', props.selectedRow);
+        const { visible, cancel } = closeModal('detail');
+        const loading = ref<boolean>(false);
+        const maskClosableFlag = ref<boolean>(false);
+        function submit() {
+            cancel();
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+            formatValue,
+            getStatusName,
+            maskClosableFlag,
+            getCardTypeEnumItemName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.custom-detail {
+    .ant-form.inlineForm {
+        margin-top: 20px;
+    }
+}
+</style>;

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

@@ -1,186 +0,0 @@
-<template>
-  <!-- 撤销客户资料-->
-  <a-modal class="custom_info_btn_cancel"
-           title="撤销客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                @click="cancel">取消</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">确认撤销</a-button>
-    </template>
-    <a-form class="inlineForm">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型">
-            <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="企业名称">
-            <span class="white">{{ formatValue(selectedRow.customername)}}</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.nickname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件类型">
-            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</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.legalpersonname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件号码">
-            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="营业执照">
-            <div class="upload">
-              <div class="look">查看附件</div>
-            </div>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="联系人">
-            <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="联系人手机号">
-            <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="状态">
-            <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <span class="white">{{ formatValue(selectedRow.address) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="备注">
-            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
-</template>
-
-<script lang="ts">
-import { defineComponent, PropType, ref } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { message, Modal } from 'ant-design-vue';
-import { ModifyUserInfoReq, QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { formatValue } from '@/common/methods';
-import { getStatusName } from '@/views/information/custom/setup';
-import { cancelCustomInfo } from '@/views/information/custom/compoments/setup';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
-
-export default defineComponent({
-    name: 'custom_info_btn_cancel',
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
-        },
-    },
-    setup(props, context) {
-        const { visible, cancel } = closeModal('custom_info_btn_cancel');
-        const { loading, ModifyUserInfo } = cancelCustomInfo();
-        function submit() {
-            loading.value = true;
-            Modal.confirm({
-                title: '是否确认撤销客户资料',
-                content: '是否撤销',
-                okText: '确认撤销',
-                cancelText: '取消',
-                onOk() {
-                    console.log('OK');
-                    const req: ModifyUserInfoReq = {
-                        userid: props.selectedRow.userid, //用户ID
-                        userstate: 1, //开户状态 - 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 (必填)
-                    };
-                    // 撤销申请 将状态设置为未提交
-                    ModifyUserInfo(req)
-                        .then((res) => {
-                            message.success(res);
-                            // 通知上层  刷新数据
-                            context.emit('refresh');
-                            cancel();
-                        })
-                        .catch((err) => {
-                            message.error(err);
-                        });
-                },
-                onCancel() {
-                    console.log('Cancel');
-                    loading.value = false;
-                },
-                class: 'test',
-            });
-            // setTimeout(() => {
-            //     loading.value = false;
-            // }, 2000);
-        }
-
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            formatValue,
-            getStatusName,
-            getCardTypeEnumItemName,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.custom_info_btn_cancel {
-}
-</style
->;

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

@@ -1,221 +0,0 @@
-<template>
-  <!-- 审核客户资料-->
-  <a-modal class="custom_info_btn_check"
-           title="审核客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                @click="cancel">取消
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">审核通过
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="refuseSubmit">审核拒绝
-      </a-button>
-    </template>
-    <a-form class="inlineForm"
-            :form="form"
-            @submit="handleSearch">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型">
-            <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="企业名称">
-            <span class="white">{{ formatValue(selectedRow.customername) }}</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.nickname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件类型">
-            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</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.legalpersonname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件号码">
-            <span class="white">{{ formatValue(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="营业执照">
-            <div class="upload">
-              <div class="look">查看附件</div>
-            </div>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="联系人">
-            <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="联系人手机号">
-            <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="状态">
-            <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <span class="white">{{ formatValue(selectedRow.address) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="备注">
-            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
-</template>
-
-<script lang="ts">
-import { defineComponent, PropType, ref } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { ModifyUserInfoReq, QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { formatValue } from '@/common/methods';
-import { getStatusName } from '@/views/information/custom/setup';
-import { cancelCustomInfo, checkCustomInfo } from '@/views/information/custom/compoments/setup';
-import { UserInfoCheckMangeReq } from '@/services/proto/accountinfo/interface';
-import { getSelectedAccountId, getUserId } from '@/services/bus/account';
-import { message, Modal } from 'ant-design-vue';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
-
-export default defineComponent({
-    name: 'custom_info_btn_check',
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
-        },
-    },
-    setup(props, context) {
-        const { loading, checkCustomerInfo } = checkCustomInfo();
-        const { visible, cancel } = closeModal('custom_info_btn_check');
-        const req: UserInfoCheckMangeReq = {
-            audituserid: getUserId(),
-            userid: props.selectedRow.userid,
-            auditflag: 1,
-            remark: '',
-        };
-
-        // 审核通过
-        function submit() {
-            Modal.confirm({
-                title: '是否确认审核通过',
-                okText: '确认通过',
-                cancelText: '取消',
-                onOk() {
-                    console.log('OK');
-                    req.auditflag = 1;
-                    req.userid = props.selectedRow.userid;
-                    checkCustomerInfo(req)
-                        .then((res) => {
-                            message.success(res);
-                            context.emit('refresh');
-                            cancel();
-                        })
-                        .catch((err) => {
-                            message.error(err);
-                        });
-                },
-                onCancel() {
-                    console.log('Cancel');
-                },
-            });
-        }
-
-        // 审核拒绝
-        function refuseSubmit() {
-            Modal.confirm({
-                title: '是否确认审核拒绝',
-                okText: '审核拒绝',
-                cancelText: '取消',
-                onOk() {
-                    console.log('OK');
-                    req.auditflag = 2;
-                    req.userid = props.selectedRow.userid;
-                    checkCustomerInfo(req)
-                        .then((res) => {
-                            message.success(res);
-                            context.emit('refresh');
-                            cancel();
-                        })
-                        .catch((err) => {
-                            message.error(err);
-                        });
-                },
-                onCancel() {
-                    console.log('Cancel');
-                },
-            });
-        }
-
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            refuseSubmit,
-            formatValue,
-            getStatusName,
-            getCardTypeEnumItemName,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.custom_info_btn_check {
-}
-</style
->;

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

@@ -1,170 +0,0 @@
-<template>
-    <!-- 删除客户资料-->
-    <a-modal class="recover-custom"
-             title="删除客户资料"
-             v-model:visible="visible"
-             @cancel="cancel"
-             centered
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="submit">删除客户资料
-            </a-button>
-        </template>
-        <a-form class="inlineForm"
-                :form="form"
-                @submit="handleSearch">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型">
-                        <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="企业名称">
-                        <span class="white">{{ formatValue(selectedRow.customername) }}</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.nickname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件类型">
-                        <span class="white">{{ formatValue(selectedRow.cardtypename) }}</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.legalpersonname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件号码">
-                        <span class="white">{{ formatValue(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="营业执照">
-                        <a class="blue">查看附件</a>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系人">
-                        <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人手机号">
-                        <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="状态">
-                        <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="通讯地址">
-                        <span class="white">{{ formatValue(selectedRow.address) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="备注">
-                        <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
-</template>
-
-<script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
-import {closeModal} from '@/common/setup/modal/index';
-import {deleteUserInfo} from '@/views/information/custom/compoments/setup';
-import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
-import {formatValue} from '@/common/methods';
-import {getStatusName} from '@/views/information/custom/setup';
-import {message, Modal} from 'ant-design-vue';
-
-export default defineComponent({
-    name: 'recover-custom',
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
-        },
-    },
-    setup(props, context) {
-        const {visible, cancel} = closeModal('custom_info_btn_delete');
-        const {loading, deleteCustomerInfo} = deleteUserInfo();
-
-        function submit() {
-            Modal.confirm({
-                title: '是否确认删除客户资料',
-                okText: '确认删除',
-                cancelText: '取消',
-                onOk() {
-                    // 删除客户资料
-                    deleteCustomerInfo(props.selectedRow.userid)
-                        .then(res => {
-                            message.success(res);
-                            // 通知上层  刷新数据
-                            context.emit('refresh');
-                            cancel();
-                        }).catch(err => {
-                        message.error(err);
-                    });
-                },
-                onCancel() {
-                    console.log('Cancel');
-                },
-            });
-        }
-
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            formatValue,
-            getStatusName,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.recover-custom {
-}
-</style
->;

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

@@ -1,157 +0,0 @@
-<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.loading"
-                @click="submit">关闭</a-button>
-    </template>
-    <a-form class="inlineForm"
-            :form="form"
-            @submit="handleSearch">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型">
-            <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="企业名称">
-            <span class="white">{{ formatValue(selectedRow.customername)}}</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.nickname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件类型">
-            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</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.legalpersonname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件号码">
-            <span class="white">{{ formatValue(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="营业执照">
-            <div class="upload">
-              <div class="look">查看附件</div>
-            </div>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="联系人">
-            <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="联系人手机号">
-            <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="状态">
-            <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <span class="white">{{ formatValue(selectedRow.address) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="备注">
-            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </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 '@/views/information/custom/setup';
-import { formatValue, formatTime } from '@/common/methods';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
-
-export default defineComponent({
-    name: 'custom-detail',
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
-        },
-    },
-    setup(props) {
-        console.log('props', props.selectedRow);
-        const { visible, cancel } = closeModal('detail');
-        const loading = ref<boolean>(false);
-        const maskClosableFlag = ref<boolean>(false);
-        function submit() {
-            cancel();
-        }
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            formatValue,
-            getStatusName,
-            maskClosableFlag,
-            getCardTypeEnumItemName,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.custom-detail {
-    .ant-form.inlineForm {
-        margin-top: 20px;
-    }
-}
-</style>;

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

@@ -1,171 +0,0 @@
-<template>
-  <!-- 停用客户资料-->
-  <a-modal class="commonModal warehouse-disable"
-           title="停用客户资料"
-           v-model:visible="visible"
-           centered
-           :maskClosable="maskClosableFlag"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">确认停用</a-button>
-    </template>
-    <a-form class="inlineForm"
-            :form="form"
-            @submit="handleSearch">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型">
-            <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="企业名称">
-            <span class="white">{{ formatValue(selectedRow.customername) }}</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.nickname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件类型">
-            <span class="white">{{ formatValue(selectedRow.cardtypename) }}</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.legalpersonname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件号码">
-            <span class="white">{{ formatValue(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="营业执照">
-            <a class="blue">查看附件</a>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="联系人">
-            <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="联系人手机号">
-            <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="状态">
-            <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <span class="white">{{ formatValue(selectedRow.address) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="备注">
-            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
-</template>
-
-<script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import {updateUserAccount} from "@/views/information/custom/compoments/setup";
-import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
-import {formatValue} from "@/common/methods";
-import {getStatusName} from "@/views/information/custom/setup";
-import {message, Modal} from "ant-design-vue";
-
-export default defineComponent({
-    name: 'custom-disable',
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
-        },
-    },
-    setup(props, context) {
-        const { visible, cancel } = closeModal('custom_info_btn_disable');
-        const maskClosableFlag = ref<boolean>(false);
-        const  {loading, ModifyUserInfo} = updateUserAccount();
-        function submit() {
-            Modal.confirm({
-                title: '是否确认停用客户资料',
-                okText: '确认停用',
-                cancelText: '取消',
-                onOk() {
-                    ModifyUserInfo(props.selectedRow.userid, 6)
-                        .then(res => {
-                            message.success(res)
-                            context.emit('refresh')
-                            cancel()
-                        })
-                        .catch(err => {
-                            message.error(err)
-                        })
-                },
-                onCancel() {
-                    console.log('Cancel');
-                },
-            });
-        }
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            maskClosableFlag,
-            formatValue,
-            getStatusName,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.warehouse-disable {
-}
-</style>

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

@@ -0,0 +1,242 @@
+<template>
+    <!-- 修改套利 -->
+  <a-modal class="commonModal add-arbitrage"
+           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="">
+            <span class="white">套利</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="现货品种"
+                       class="checkboxGroupItem"
+                       name="">
+            <a-checkbox-group class="commonCheckboxGroup">
+              <a-row>
+                <a-col>
+                  <a-checkbox value="A">钢管</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="B">铁矿石</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="C">大豆</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="D">玉米</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="E">棉花</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="F">铜板</a-checkbox>
+                </a-col>
+              </a-row>
+              <a-row>
+                <a-col>
+                  <a-checkbox value="G">铜块</a-checkbox>
+                </a-col>
+                <a-col>
+                  <a-checkbox value="H">螺纹钢</a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="期货账户"
+                       class="checkboxGroupItem"
+                       name="">
+            <a-checkbox-group class="commonCheckboxGroup autoWidth">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox value="A">期货母账户/25000000010</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox value="B">铜套保专用账户/25000000011</a-checkbox>
+                </a-col>
+              </a-row>
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox value="C">银套保专用账户/25000000012</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox value="D">铁矿石套保专用账户/25000000013</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 { 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">
+.add-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 修改账户 -->
-  <!-- <a-modal class="commonModal add-business-info"
+  <a-modal class="commonModal add-business-info"
            title="修改业务账户"
            v-model:visible="visible"
            @cancel="cancel"
@@ -33,452 +33,38 @@
             </a-checkbox-group>
           </a-form-item>
         </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录账号"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="手机号码"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-  <!-- 修改交易员 -->
-  <!-- <a-modal class="commonModal add-traders"
-           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="所属用户"
+          <a-form-item label="账户名称"
                        name="">
-            <span class="white">王凌团队</span>
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录账号"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <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="授权期货账户"
-                         class="checkboxGroupItem"
-                         name="">
-              <a-checkbox-group class="commonCheckboxGroup">
-                <a-row>
-                  <a-col :span="12">
-                    <a-checkbox value="A">期货子账户/250000010003</a-checkbox>
-                  </a-col>
-                  <a-col :span="12">
-                    <a-checkbox value="B">铜套保专用账户/25000000011</a-checkbox>
-                  </a-col>
-                  <a-col :span="12" class="mt20">
-                    <a-checkbox value="C">银套保专用账户/250000010003</a-checkbox>
-                  </a-col>
-                  <a-col :span="12" class="mt20">
-                    <a-checkbox value="D">铁矿石套保专用账户/25000000013Q</a-checkbox>
-                  </a-col>
-                </a-row>
-              </a-checkbox-group>
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-  <!-- 修改管理员 -->
-  <!-- <a-modal class="commonModal add-managers"
-           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="">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择账户权限">
-              <a-select-option value="权限一">权限一</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录账号"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="手机号码"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-  <!-- 修改权限模板 -->
-  <!-- <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="模板名称"
+          <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> -->
-  <!-- 修改期货账户 -->
-  <!-- <a-modal class="commonModal add-futures"
-           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-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择期货公司">
-              <a-select-option value="权限一">权限一</a-select-option>
-            </a-select>
+                     style="width: 200px"
+                     placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货登录账号"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入期货登录账号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登录密码"
-                         name="">
-              <a-input-password class="dialogInput" 
-                      style="width: 200px" 
-                      placeholder="请输入登录密码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="指定交易用户"
-                         name="">
-              <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择指定交易用户">
-              <a-select-option value="权限一">权限一</a-select-option>
-            </a-select>
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-   <!-- 修改期货子账户 -->
-  <!-- <a-modal class="commonModal add-futures-son"
-           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">
-            <span class="white">王小小/824327648</span>
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入登录密码" />
           </a-form-item>
         </a-col>
-          <a-col :span="12">
-            <a-form-item label="账户名称"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入账户名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货保证金"
-                         name="">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       placeholder="请输入期货保证金" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="期货手续费"
-                         name="">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        placeholder="请选择期货手续费">
-                <a-select-option value="权限一">权限一</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-      </a-row>
-    </a-form>
-  </a-modal> -->
-  <!-- 修改套利 -->
-  <a-modal class="commonModal add-arbitrage"
-           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="业务类型"
+          <a-form-item label="手机号码"
                        name="">
-            <span class="white">套利</span>
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入手机号码" />
           </a-form-item>
         </a-col>
-          <a-col :span="24">
-            <a-form-item label="现货品种"
-                         class="checkboxGroupItem"
-                         name="">
-              <a-checkbox-group class="commonCheckboxGroup">
-                <a-row>
-                  <a-col><a-checkbox value="A">钢管</a-checkbox></a-col>
-                  <a-col><a-checkbox value="B">铁矿石</a-checkbox></a-col>
-                  <a-col><a-checkbox value="C">大豆</a-checkbox></a-col>
-                  <a-col><a-checkbox value="D">玉米</a-checkbox></a-col>
-                  <a-col><a-checkbox value="E">棉花</a-checkbox></a-col>
-                  <a-col><a-checkbox value="F">铜板</a-checkbox></a-col>
-                </a-row>
-                <a-row>
-                  <a-col><a-checkbox value="G">铜块</a-checkbox></a-col>
-                  <a-col><a-checkbox value="H">螺纹钢</a-checkbox></a-col>
-                </a-row>
-              </a-checkbox-group>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="期货账户"
-                         class="checkboxGroupItem"
-                         name="">
-              <a-checkbox-group class="commonCheckboxGroup autoWidth">
-                <a-row>
-                  <a-col :span="12"><a-checkbox value="A">期货母账户/25000000010</a-checkbox></a-col>
-                  <a-col :span="12"><a-checkbox value="B">铜套保专用账户/25000000011</a-checkbox></a-col>
-                </a-row>
-                <a-row>
-                  <a-col :span="12"><a-checkbox value="C">银套保专用账户/25000000012</a-checkbox></a-col>
-                  <a-col :span="12"><a-checkbox value="D">铁矿石套保专用账户/25000000013</a-checkbox></a-col>
-                </a-row>
-              </a-checkbox-group>
-            </a-form-item>
-          </a-col>
       </a-row>
     </a-form>
   </a-modal>
@@ -496,7 +82,7 @@ export default defineComponent({
     components: {},
     setup() {
         // 控制关闭弹窗
-        const { visible, cancel } = closeModal('account_info_business_btn_add');
+        const { visible, cancel } = closeModal('account_info_business_btn_modify');
         // 证件类型
         // const cardTypeList = ref<AllEnums[]>(getCardType());
         // // 表单
@@ -542,101 +128,96 @@ export default defineComponent({
 
 <style lang="less">
 .add-business-info {
-  
 }
 .add-traders {
-  
 }
 .add-managers {
-
 }
 .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;
+    .powerTable {
+        width: 100%;
+        height: 100%;
+        border: 3px solid @m-grey11;
+        background-color: @m-black12;
+        font-size: 14px;
+        color: @m-white0;
         .flex;
         flex-direction: column;
-        div {
-          width: 100%;
-          height: 40px;
-          line-height: 40px;
-          padding: 0 8px;
-          border: 3px solid @m-grey11;
-          border-top: 0;
+        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+            width: 90px;
+            span + span {
+                margin-right: 0;
+            }
         }
-        div:last-child {
-          border-bottom: 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;
+                }
+            }
         }
-      }
-      .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;
-        }
-      }
     }
-  }
 }
 .add-futures {
-
 }
 .add-futures-son {
-
 }
 .add-arbitrage {
-  .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-    width: 100px;
-    span + span {
-      margin-right: 0;
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
     }
-  } 
-  .ant-checkbox-group.autoWidth {
-    width: 520px;
-    .ant-checkbox-wrapper {
-      width: auto;
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
     }
-  }
-  .checkboxGroupItem {
-    .ant-row {
-      margin-bottom: 10px;
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
     }
-  }
 }
 </style
 >;

src/views/information/account_info/compoments/modify-futures-son/index.vue

@@ -0,0 +1,208 @@
+<template>
+  <!-- 修改期货子账户 -->
+  <a-modal class="commonModal add-futures-son"
+           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">
+            <span class="white">王小小/824327648</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="期货保证金"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入期货保证金" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="期货手续费"
+                       name="">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择期货手续费">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </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 { 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">
+.add-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -0,0 +1,220 @@
+<template>
+  <!-- 修改期货账户 -->
+  <a-modal class="commonModal add-futures"
+           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-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择期货公司">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="期货登录账号"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入期货登录账号" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入登录密码" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="指定交易用户"
+                       name="">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择指定交易用户">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </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 { 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">
+.add-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -0,0 +1,218 @@
+<template>
+  <!-- 修改管理员 -->
+  <a-modal class="commonModal add-managers"
+           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="">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择账户权限">
+              <a-select-option value="权限一">权限一</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入登录账号" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入登录密码" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="手机号码"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     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 { 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">
+.add-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -0,0 +1,275 @@
+<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_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">
+.add-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -0,0 +1,237 @@
+<template>
+  <!-- 修改交易员 -->
+  <a-modal class="commonModal add-traders"
+           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="">
+            <span class="white">王凌团队</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入账户名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录账号"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入登录账号" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="登录密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入登录密码" />
+          </a-form-item>
+        </a-col>
+        <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="授权期货账户"
+                       class="checkboxGroupItem"
+                       name="">
+            <a-checkbox-group class="commonCheckboxGroup">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox value="A">期货子账户/250000010003</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox value="B">铜套保专用账户/25000000011</a-checkbox>
+                </a-col>
+                <a-col :span="12"
+                       class="mt20">
+                  <a-checkbox value="C">银套保专用账户/250000010003</a-checkbox>
+                </a-col>
+                <a-col :span="12"
+                       class="mt20">
+                  <a-checkbox value="D">铁矿石套保专用账户/25000000013Q</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, 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_trade_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">
+.add-business-info {
+}
+.add-traders {
+}
+.add-managers {
+}
+.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;
+                }
+            }
+        }
+    }
+}
+.add-futures {
+}
+.add-futures-son {
+}
+.add-arbitrage {
+    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+        width: 100px;
+        span + span {
+            margin-right: 0;
+        }
+    }
+    .ant-checkbox-group.autoWidth {
+        width: 520px;
+        .ant-checkbox-wrapper {
+            width: auto;
+        }
+    }
+    .checkboxGroupItem {
+        .ant-row {
+            margin-bottom: 10px;
+        }
+    }
+}
+</style
+>;

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

@@ -1,252 +0,0 @@
-<template>
-  <!-- 修改客户资料 -->
-  <a-modal class="commonModal modify-custom"
-           title="修改客户资料"
-           v-if="visible"
-           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>
-    </template>
-    <a-form class="inlineForm"
-            :form="form"
-            @submit="handleSearch">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      placeholder="请选择客户类型">
-              <a-select-option value="1">
-                客户一
-              </a-select-option>
-              <a-select-option value="2">
-                客户二
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="企业名称">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入企业名称" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="企业简称">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入企业简称" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件类型">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      placeholder="请选择证件类型">
-              <a-select-option value="1">
-                客户一
-              </a-select-option>
-              <a-select-option value="2">
-                客户二
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="法定代表人">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入法定代表人" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="证件号码">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入证件号码" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="纳税人识别号">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入纳税人识别号" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="营业执照">
-            <div class="upload">
-              <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-                        :transform-file="transformFile">
-                <a-button class="uploadBtn">上传</a-button>
-              </a-upload>
-              <div class="look">查看附件</div>
-            </div>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="联系人">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入联系人" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="联系人手机号">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入联系人手机号" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="联系电话">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     placeholder="请输入联系电话" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item>
-            &nbsp;
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <a-select class="inlineFormSelect"
-                      style="width: 205px"
-                      placeholder="请选择省">
-              <a-select-option value="1">
-                客户一
-              </a-select-option>
-              <a-select-option value="2">
-                客户二
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml10"
-                      style="width: 205px"
-                      placeholder="请选择市">
-              <a-select-option value="1">
-                客户一
-              </a-select-option>
-              <a-select-option value="2">
-                客户二
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml10"
-                      style="width: 205px"
-                      placeholder="请选择县(区)">
-              <a-select-option value="1">
-                客户一
-              </a-select-option>
-              <a-select-option value="2">
-                客户二
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="&nbsp;">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     placeholder="请输入详细地址" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="备注">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     placeholder="请输入备注" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
-</template>
-
-<script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { initData } from '@/common/methods/index';
-
-export default defineComponent({
-    name: 'modify-custom',
-    components: {},
-    props: {
-        // selectedRow: {
-        //   type:
-        // }
-    },
-    setup() {
-        // const { visible, cancel } = closeModal('modifyCustomInfo');
-        const { visible, cancel } = closeModal('custom_info_btn_modify');
-
-        const loading = ref<boolean>(false);
-        const maskClosableFlag = ref<boolean>(false);
-        function submit() {
-            cancel();
-        }
-        initData(() => {});
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            maskClosableFlag,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.modify-custom {
-    .upload {
-        display: inline-flex;
-        .ant-btn.uploadBtn {
-            width: 60px;
-            height: 30px;
-            background: @m-blue0;
-            border: 0;
-            padding: 0;
-            text-align: center;
-            font-size: 14px;
-            color: @m-white0;
-            .rounded-corners(3px);
-            &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
-            }
-        }
-        .look {
-            color: @m-blue0;
-            font-size: 14px;
-            margin-left: 10px;
-            cursor: pointer;
-        }
-    }
-}
-</style
->;

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

@@ -1,174 +0,0 @@
-<template>
-    <!-- 恢复客户资料-->
-    <a-modal class="modify-custom"
-             title="恢复客户资料"
-             v-model:visible="visible"
-             @cancel="cancel"
-             centered
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      class="cancelBtn"
-                      @click="cancel">取消
-            </a-button>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="recover">完成
-            </a-button>
-        </template>
-        <a-form class="inlineForm"
-                :form="form"
-                @submit="handleSearch">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型">
-                        <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="企业名称">
-                        <span class="white">{{ formatValue(selectedRow.customername) }}</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.nickname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件类型">
-                        <span class="white">{{ formatValue(selectedRow.cardtypename) }}</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.legalpersonname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件号码">
-                        <span class="white">{{ formatValue(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="营业执照">
-                        <div class="upload">
-                            <div class="look">查看附件</div>
-                        </div>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系人">
-                        <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人手机号">
-                        <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="状态">
-                        <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="通讯地址">
-                        <span class="white">{{ formatValue(selectedRow.address) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="备注">
-                        <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
-</template>
-
-<script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
-import {closeModal} from '@/common/setup/modal/index';
-import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
-import {formatValue} from "@/common/methods";
-import {getStatusName} from "@/views/information/custom/setup";
-import {updateUserAccount} from "@/views/information/custom/compoments/setup";
-import {message, Modal} from "ant-design-vue";
-
-export default defineComponent({
-    name: 'modify-custom',
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
-        },
-    },
-    setup(props, context) {
-        const {visible, cancel} = closeModal('custom_info_btn_recover');
-        const {loading, ModifyUserInfo} = updateUserAccount();
-        // 恢复方法
-        function recover(){
-            Modal.confirm({
-                title: '是否确认恢复客户资料',
-                okText: '确认恢复',
-                cancelText: '取消',
-                onOk() {
-                    ModifyUserInfo(props.selectedRow.userid, 4)
-                        .then(res => {
-                            message.success(res)
-                            context.emit('refresh')
-                            cancel()
-                        })
-                        .catch(err => {
-                            message.error(err)
-                        })
-                },
-                onCancel() {
-                    console.log('Cancel');
-                },
-            });
-        }
-        return {
-            visible,
-            cancel,
-            recover,
-            loading,
-            formatValue,
-            getStatusName,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.modify-custom {
-}
-</style
->;

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

@@ -13,7 +13,43 @@
                 :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">
+           <span class="white">Y001</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="原密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入原密码" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="新密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请输入8到20个字符的新密码" />
+          </a-form-item>
+        </a-col>
+         <a-col :span="12">
+          <a-form-item label="确认新密码"
+                       name="">
+            <a-input-password class="dialogInput"
+                              style="width: 200px"
+                              placeholder="请再次确认新密码" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
   </a-modal>
 </template>
 

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

@@ -87,6 +87,7 @@
     <Reset />
     <Locked />
     <Cancel />
+    <Detail />
   </div>
 </template>
 
@@ -101,6 +102,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';
 
 export default defineComponent({
     name: 'account_info_business',
@@ -113,6 +115,7 @@ export default defineComponent({
         Reset,
         Locked,
         Cancel,
+        Detail,
     },
     setup() {
         const { businesserList, merchandiserList, getBusinesserList } = handleAccountManager();

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

@@ -51,6 +51,7 @@
         </a-collapse>
       </a-collapse-panel>
     </a-collapse>
+    <Modify />
   </div>
 </template>
 
@@ -60,6 +61,7 @@ import filterCustomTable from '@/views/information/goods/components/filterTable/
 import { ref } from 'vue';
 import { handleAccountManager, getAccountStatus } from '../setup';
 import { getUserName } from '@/services/bus/user';
+import Modify from '../../compoments/modify-traders/index.vue';
 
 export default defineComponent({
     name: 'account_info_trade',
@@ -67,6 +69,7 @@ export default defineComponent({
         contextMenu,
         BtnList,
         filterCustomTable,
+        Modify,
     },
     setup() {
         const { traderList, getRoleList } = handleAccountManager();
@@ -96,16 +99,16 @@ export default defineComponent({
 
 <style lang="less">
 .account_info_trade {
-  .tltLeft {
+    .tltLeft {
         padding-left: 12px;
-  }
-  .btn-list {
-    .btnPrimary.ant-btn {
-      height: 26px;
-      line-height: 26px;
     }
-  }
-  .ant-collapse.spotCollapse.ant-collapse-borderless {
+    .btn-list {
+        .btnPrimary.ant-btn {
+            height: 26px;
+            line-height: 26px;
+        }
+    }
+    .ant-collapse.spotCollapse.ant-collapse-borderless {
         padding-left: 43px;
         padding-right: 43px;
     }

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

@@ -1,99 +1,99 @@
 <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>
-        </template>
-        <a-form class="inlineForm"
-                :form="form"
-                @submit="handleSearch">
-            <fieldset class="formFieldSet">
-                <legend>合同基本信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同编号">
-                            <span class="white">{{
+  <!-- 发票登记详情-->
+  <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>
+    </template>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <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">{{ 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-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 '@/views/information/custom/setup';
-import {formatValue, formatTime} from '@/common/methods';
-import {QryBussinessFpRsp} from "@/services/go/ermcp/finance-review/interface";
-import {invoiceStatusName} from "@/views/manage/finance-review/setup";
-import {getContractTypeName, getPriceTypeName} from "@/views/information/spot-contract/setup";
+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 '@/views/information/custom/setup';
+import { formatValue, formatTime } from '@/common/methods';
+import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
+import { invoiceStatusName } from '@/views/manage/finance-review/setup';
+import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_detail',
@@ -105,14 +105,14 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const {visible, cancel} = closeModal('detail');
+        const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
 
         function submit() {
-            console.log(props)
+            console.log(props);
             context.emit('refresh');
-            cancel()
+            cancel();
         }
 
         return {

src/views/search/inventory/components/filterTable/index.vue

@@ -60,10 +60,10 @@ export default defineComponent({
                     return { value: deliverygoodsid, lable: deliverygoodsname };
                 });
         });
-        function DGChange(value: any) {
+        function DGChange(id: number) {
             select.value[1].value = undefined;
             select.value[2].value = undefined;
-            const temp = APP.get('DeliveryGoodsList').find((el: ErmcpDeliveryGoodsDetailEx) => el.data.deliverygoodsid === value.key);
+            const temp = APP.get('DeliveryGoodsList').find((el: ErmcpDeliveryGoodsDetailEx) => el.data.deliverygoodsid === id);
             if (temp) {
                 select.value[1].list = temp.gmlist.map((e: Ermcp3Wrstandard) => {
                     const { wrstandardid, wrstandardname } = e;

src/views/search/inventory/list/inventory_applyrecord/index.vue

@@ -82,7 +82,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_delivery', ['deliverygoodsid', 'wrstandardid', 'spotgoodsbrandid', 'warehouseinfoid']);
+            registerColumn('table_pcweb_application_record', ['deliverygoodsid', 'wrstandardid', 'spotgoodsbrandid', 'warehouseinfoid']);
         });
         return {
             columns,

src/views/search/inventory/list/inventory_current/index.vue

@@ -61,7 +61,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_delivery', ['deliverygoodsid', 'wrstandardid', 'spotgoodsbrandid', 'warehouseinfoid']);
+            registerColumn('table_pcweb_current_inventory', ['deliverygoodsid', 'wrstandardid', 'spotgoodsbrandid', 'warehouseinfoid']);
         });
         return {
             columns,