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

src/goServiceAPI/ermcp/business-review/index.ts

@@ -0,0 +1 @@
+/** ================================= 业务审核 ================================**/

src/goServiceAPI/ermcp/customInfo/index.ts

@@ -13,7 +13,22 @@ import { QueryCustomInfoType } from './type';
  */
 export function QueryCustomInfo(queryType: QueryCustomInfoType): Promise<type.QueryCustomInfoType[]> {
     const MemberUserID = APP.get('userAccount').memberuserid;
-    return commonSearch_go('/Ermcp/QueryUserInfo', { MemberUserID, queryType }).catch(err => {
-        throw new Error(`查询客户资料: ${err.message}`);
-    })
-}
+    return commonSearch_go('/Ermcp/QueryUserInfo', { MemberUserID, queryType })
+        .catch(err => {
+            throw new Error(`查询客户资料: ${err.message}`);
+        })
+}
+
+/**
+ * 新增/修改客户申请
+ * @param userInfoApply
+ * @param userInfoApply.userstate  1:未提交(点击草稿) 2: 待初审(点击申请)
+ * @param userInfoApply.
+ * @constructor
+ */
+// export function QueryModifyUserInfo(userInfoApply: type.ModifyUserInfoApplyReq): Promise<BaseResponse> {
+//     return commonUpdate_go('/Ermcp/ModifyUserInfoApply', { userInfoApply })
+//         .catch(err => {
+//             throw new Error(`新增客户申请: ${err.message}`);
+//         })
+// }

src/goServiceAPI/ermcp/customInfo/interface.ts

@@ -28,3 +28,82 @@ export interface QueryCustomInfoType {
     userid: number;//用户ID
     userinfotype: string;//客户类型
 }
+
+// 修改客户申请 (提交申请也在这)
+export interface ModifyUserInfoApplyReq {
+    accountid?: number;//交易系统帐号Id (加密存储)
+    areacode?: string;//机构代码
+    areaid?: number;//机构Id
+    attachment1?: string;//附件1
+    attachment2?: string;//附件2
+    attachment3?: string;//附件3
+    attachment4?: string;//附件4
+    attachment5?: string;//附件5
+    auditedby?: string;//审核人
+    auditime?: string;//审核时间
+    bankaccount?: string;//银行帐号 (加密存储)
+    bankaccountname?: string;//收款人名称
+    bankcardbackphotourl?: string;//银行卡背面照地址
+    bankcardfrontphotourl?: string;//银行卡正面照地址
+    bankid?: string;//银行编码
+    bankname?: string;//银行名称
+    bankpictureurl?: string;//银行卡正面地址
+    biznature?: number;//企业性质( 企业) - 1:国有控股企业 2:集体控股企业 3:私人控股企业 4:港澳台商控股企业 5:外商控股企业 6:其它
+    bizscope?: string;//企业经营范围(企业)
+    biztype?: number;//企业类型 - 1:进口/生产 2:销售 3:零售 4:运输 5:仓储
+    brokerid?: string;//经纪人ID(加密存储)
+    cardaddress?: string;//证件地址 (加密存储)
+    cardbackphotourl?: string;//背面证件照地址
+    cardfrontphotourl?: string;//正面证件照地址
+    cardnum?: string;//证件号码 (加密存储)
+    cardtype?: number;//证件类型
+    cityid?: number;//市
+    company?: string;//公司(个人)
+    contactcardbackphotourl?: string;//联系人证件背面图片地址
+    contactcardfrontphotourl?: string;//联系人证件正面图片地址
+    contactname?: string;//联系人
+    countryid?: number;//国家
+    createtime?: string;//开户申请时间
+    cusbankid?: string;//签约类型
+    cusbankname?: string;//签约类型名称
+    customername: string;//客户名称(企业名称)  (必填)
+    districtid?: number;//地区
+    email?: string;//Email地址(加密存储)
+    halfbodyphotourl?: string;//半身照地址
+    headurl?: string;//头像地址
+    ipaddress?: string;//IP地址
+    isvalidate?: string;//是否有效 (删除后标记为失效) - number;
+    //:无效 1:有效
+    legalcardbackphotourl?: string;//法人身份证背面照地址
+    legalcardfrontphotourl?: string;//法人身份证正面照地址
+    legalpersonname?: string;//法人姓名(企业)
+    logincode?: string;//登录帐号 (加密存储)
+    memberareaid?: number;//所属会员ID
+    mobile2?: string;//手机号码[明文-尚志]
+    mobilephone?: string;//手机号码 (加密存储) (联系电话 )
+    modifiedby?: number;//修改人帐号
+    modifiedtime?: string;//修改时间
+    nickname?: string;//昵称：默认为手机号脱敏(1399999) 或 名称脱敏(张)
+    openmode?: number;//开户方式 - 1:管理端开户 2:网上开户注册(会员官网-手机号) 3:微信开户 4:网页交易端注册 5:安卓手机端注册 6:苹果手机端注册 7:PC交易端注册 8:微信快速开户 9:支付宝快速开户 1number;
+    //:手机号快速开户 11:网上开户注册(会员官网-微信认证) 12:网上开户注册(会员官网-支付宝认证)
+    otherurl?: string;//其它图片地址[使用分号分隔]
+    postalcode?: string;//邮政编码
+    provinceid?: number;//省
+    proxystatementurl?: string;//授权委托书
+    qq?: string;//QQ(加密存储
+    referral?: string;//推荐人编码
+    remark?: string;//备注
+    removebeforestatus?: number;//REMOVEBEFORESTATUS
+    sex?: number;//性别 - number;//:女 1:男
+    signedstatus?: number;//账户一号签签约状态
+    signpdfurl?: string;//签约pdf文件
+    subbranch?: string;//开户支行
+    telphone?: string;//联系电话(加密存储)
+    userid: number;//用户ID(自增ID) (必填)
+    userinfotype: number;//用户信息类型 - 1:个人 2:企业 (必填)
+    username: string;//用户姓名 (必填)
+    userstate: number;//开户状态 - 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 (必填)
+    usertype?: number;//用户类型 - 1:投资者 2:机构
+    videourl?: string;//视频地址
+    wechat?: string;//微信号 (加密存储)
+}

src/goServiceAPI/ermcp/exposure-report/index.ts

@@ -0,0 +1 @@
+/** ================================= 敞口报表 ================================**/

src/goServiceAPI/ermcp/exposure/index.ts

@@ -0,0 +1 @@
+/** ================================= 敞口 ================================**/

src/goServiceAPI/ermcp/finance-report/index.ts

@@ -0,0 +1 @@
+/** ================================= 财务报表 ================================**/

src/goServiceAPI/ermcp/finance-review/index.ts

@@ -0,0 +1 @@
+/** ================================= 财务审核 ================================**/

src/goServiceAPI/ermcp/goodsInfo/index.ts

@@ -0,0 +1 @@
+/** ================================= 商品信息 ================================**/

src/goServiceAPI/ermcp/inventory-report/index.ts

@@ -0,0 +1 @@
+/** ================================= 库存报表 ================================**/

src/goServiceAPI/ermcp/inventory-review/index.ts

@@ -0,0 +1 @@
+/** ================================= 库存审核 ================================**/

src/goServiceAPI/ermcp/index.ts → src/goServiceAPI/ermcp/outaccount-status/index.ts

@@ -1,5 +1,5 @@
 import { getLongTypeLoginID } from '@/services/bus/login';
-import { commonSearch_go } from '../index';
+import { commonSearch_go } from '../../index';
 import * as type from './interface';
 
 /**

src/goServiceAPI/ermcp/plan/index.ts

@@ -0,0 +1 @@
+/** ================================= 计划 ================================**/

src/goServiceAPI/ermcp/purchase/index.ts

@@ -0,0 +1 @@
+/** ================================= 采购 ================================**/

src/goServiceAPI/ermcp/search-inventory/index.ts

@@ -0,0 +1 @@
+/** ================================= 库存查询 ================================**/

src/goServiceAPI/ermcp/sell/index.ts

@@ -0,0 +1 @@
+/** ================================= 销售 ================================**/

src/goServiceAPI/ermcp/spot-contract/index.ts

@@ -0,0 +1 @@
+/** ================================= 现货合同 ================================**/

src/goServiceAPI/ermcp/spot-report/index.ts

@@ -0,0 +1 @@
+/** ================================= 现货报表 ================================**/

src/goServiceAPI/ermcp/warehouse-info/index.ts

@@ -0,0 +1 @@
+/** ================================= 仓库信息 ================================**/

src/goServiceAPI/index.ts

@@ -17,3 +17,30 @@ export function commonSearch_go(url: string, params: Object, method: Method = 'g
         .then((value) => value.data.data)
         .catch((err) => Promise.reject(err));
 }
+
+
+export interface BaseResponse{
+    result: boolean
+    message: String
+}
+
+/**
+ * go 申请/修改类型返回 (不关心具体返回的数据, 只关心请求是否成功)
+ * @param url 接口路径
+ * @param params 请求参数
+ * @param method 请求方式
+ */
+export function commonUpdate_go(url: string, params: Object, method: Method = 'post'): Promise<BaseResponse> {
+    return request({
+        method,
+        url: goCommonSearchUrl(url),
+        params,
+    })
+        .then((value) => {
+             return {
+                result: value.data.code === 200 ? true : false,
+                message: value.data.msg
+            }
+        })
+        .catch((err) => Promise.reject(err));
+}

src/layout/top.vue

@@ -160,9 +160,17 @@ const handleMenu = () => {
             openKeys.value = preOpenKeys.value;
         }
     }
-
+    // 配置是否显示下半部分
+    function setShowBottomPart(code: string): boolean {
+        // 显示下半部分 这里保存的是市场对应的 code
+        const show: string[] = [''];
+        return show.includes(code);
+    }
     function menuClick(value: any) {
-        router.push({ name: value.key });
+        console.log('菜单： ', value);
+        const key = value.key;
+        setShowBottomPart(key);
+        router.push({ name: key });
     }
     // 一级菜单图标
     function fontIcon(code: string): string {
@@ -189,7 +197,7 @@ const handleMenu = () => {
         }
         return '#' + result;
     }
-    return { collapsed, selectedKeys, menuList, openKeys, collapse, menuClick, fontIcon };
+    return { collapsed, selectedKeys, menuList, openKeys, collapse, menuClick, setShowBottomPart, fontIcon };
 };
 
 function testAction() {
@@ -227,14 +235,7 @@ const onSearch = () => {
     }
     return { search };
 };
-// 配置是否显示下半部分
-function setShowBottomPart(code: string): boolean {
-    // 不显示下半部分 这里保存的是市场对应的 code
-    const unShow = [
-        'outaccount_status', // 仓单贸易
-    ];
-    return unShow.includes(code);
-}
+
 // 控制消息弹窗
 function controlNotice() {
     const { openAction } = openModal('notice');
@@ -250,7 +251,7 @@ export default defineComponent({
         Drawer,
     },
     setup(props, context) {
-        const { collapsed, selectedKeys, openKeys, menuList, collapse, menuClick, fontIcon } = handleMenu();
+        const { collapsed, selectedKeys, openKeys, menuList, collapse, menuClick, setShowBottomPart, fontIcon } = handleMenu();
         const router = useRouter();
         // 控制消息弹窗
         const { openNotice } = controlNotice();
@@ -272,6 +273,10 @@ export default defineComponent({
                     }
                 }
                 const code = list[firstIndex].children[secondeIndex].code;
+                // selectedKeys.value.length = 0;
+                // selectedKeys.value.push(code);
+                // openKeys.value.length = 0;
+                // openKeys.value.push(list[firstIndex].code);
                 selectedKeys.value = [code];
                 openKeys.value = [list[firstIndex].code];
                 context.emit('chooseMenu', setShowBottomPart(code));

src/router/index.ts

@@ -41,14 +41,6 @@ const routes: Array<RouteRecordRaw> = [
                 component: () => import('@/views/market/warehouseTrade/index.vue'),
             },
             {
-                path: '/outaccount_status',
-                name: 'accountStatus',
-                component: () => import('@/views/account/accountStatus.vue'),
-                meta: {
-                    requireAuth: true
-                },
-            },
-            {
                 path: 'custom_info',
                 name: 'custom_info',
                 component: () => import('@/views/information/custom/index.vue'),
@@ -101,7 +93,127 @@ const routes: Array<RouteRecordRaw> = [
                         },
                     },
                 ],
-            }
+            },
+            {
+                path: '/outaccount_status',
+                name: 'outaccount_status',
+                component: () => import('@/views/search/outaccount_status/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/inventory',
+                name: 'inventory',
+                component: () => import('@/views/search/inventory/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/spot_contract',
+                name: 'spot_contract',
+                component: () => import('@/views/information/spot-contract/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/warehouse_info',
+                name: 'warehouse_info',
+                component: () => import('@/views/information/warehouse-info/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/exposure',
+                name: 'exposure',
+                component: () => import('@/views/business/exposure/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/plan',
+                name: 'plan',
+                component: () => import('@/views/business/plan/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/purchase',
+                name: 'purchase',
+                component: () => import('@/views/business/purchase/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/sell',
+                name: 'sell',
+                component: () => import('@/views/business/sell/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/business_review',
+                name: 'business_review',
+                component: () => import('@/views/manage/business-review/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/finance_review',
+                name: 'finance_review',
+                component: () => import('@/views/manage/finance-review/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/inventory_review',
+                name: 'inventory_review',
+                component: () => import('@/views/manage/inventory-review/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/exposure_report',
+                name: 'exposure_report',
+                component: () => import('@/views/report/exposure-report/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/finance_report',
+                name: 'finance_report',
+                component: () => import('@/views/report/finance-report/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/inventory_report',
+                name: 'inventory_report',
+                component: () => import('@/views/report/inventory-report/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
+            {
+                path: '/spot_report',
+                name: 'spot_report',
+                component: () => import('@/views/report/spot-report/index.vue'),
+                meta: {
+                    requireAuth: true
+                },
+            },
         ],
     },
     {

src/views/business/exposure/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 敞口 -->
+  <div class="exposure">
+    敞口
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'exposure',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.exposure {
+}
+</style>;

src/views/business/plan/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 计划 -->
+  <div class="plan">
+    计划
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'plan',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.plan {
+}
+</style>;

src/views/business/purchase/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 采购 -->
+  <div class="purchase">
+    采购
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'purchase',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.spurchase {
+}
+</style>;

src/views/business/sell/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 销售-->
+  <div class="sell">
+    销售
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'sell',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.sell {
+}
+</style>;

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

@@ -0,0 +1,42 @@
+<template>
+  <!-- 新增客户资料 -->
+  <a-modal class="add-custom"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px"
+           :footer="null"
+           @ok="handleOk">
+    新增客户资料
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref } from 'vue';
+import { closeModal } from '@/setup/controlModal/index';
+import NoticeContent from './components/noticeContent.vue';
+import { initData } from '@/setup/methods/index';
+import { queryNotice } from '@/goServiceAPI/commonService/index';
+import { queryNoticeRsp } from '@/goServiceAPI/commonService/interface';
+
+export default defineComponent({
+    name: 'add-custom',
+    components: {
+        NoticeContent,
+    },
+    setup() {
+        const { visible, cancel, handleOk } = closeModal('notice');
+
+        initData(() => {});
+        return {
+            visible,
+            cancel,
+            handleOk,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.add-custom {
+}
+</style>;

src/views/information/custom/list/normal-use/index.vue

@@ -2,12 +2,12 @@
   <!-- 客户信息: 正常 -->
   <div class="custom-normal">
     客户信息: 正常
-    <!-- <div class="table-operations">
-      <a-button @click="setAgeSort">Sort age</a-button>
-      <a-button @click="clearFilters">Clear filters</a-button>
-      <a-button @click="clearAll">Clear filters and sorters</a-button>
+    <div class="table-operations">
+      <a-button>查询</a-button>
+      <a-button>重置</a-button>
+      <a-button>新增</a-button>
     </div>
-    <a-table :columns="columns"
+    <!-- <a-table :columns="columns"
              :data-source="data"
              @change="handleChange" /> -->
   </div>

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

@@ -0,0 +1,23 @@
+<template>
+  <!-- 现货合同 -->
+  <div class="spot-contract">
+    "现货合同"
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'spot-contract',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.spot-contract {
+}
+</style>;

src/views/information/warehouse-info/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 仓库信息 -->
+  <div class="warehouse-info">
+    "仓库信息"
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'warehouse-info',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.warehouse-info {
+}
+</style>;

src/views/manage/business-review/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 业务审核 -->
+  <div class="business-review">
+    业务审核
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'business-review',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.business-review {
+}
+</style>;

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

@@ -0,0 +1,23 @@
+<template>
+  <!-- 财务审核 -->
+  <div class="finance-review">
+    财务审核
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'finance-review',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.finance-review {
+}
+</style>;

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

@@ -0,0 +1,23 @@
+<template>
+  <!-- 库存审核 -->
+  <div class="inventory-review">
+    库存审核
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'inventory-review',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.inventory-review {
+}
+</style>;

src/views/report/exposure-report/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 敞口报表 -->
+  <div class="exposure-report">
+    敞口报表
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'exposure-report',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.exposure-report {
+}
+</style>;

src/views/report/finance-report/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 财务报表 -->
+  <div class="finance-report">
+    财务报表
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'finance-report',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.finance-report {
+}
+</style>;

src/views/report/inventory-report/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 库存报表-->
+  <div class="inventory-report">
+    库存报表
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'inventory-report',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.inventory-report {
+}
+</style>;

src/views/report/spot-report/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 现货报表 -->
+  <div class="spot-report">
+    现货报表
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'spot-report',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.spot-report {
+}
+</style>;

src/views/search/inventory/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 库存查询 -->
+  <div class="inventory">
+    "库存查询"
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'inventory',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.inventory {
+}
+</style>;

src/views/account/accountStatus.vue → src/views/search/outaccount_status/index.vue

@@ -22,8 +22,8 @@ import { defineComponent, ref, onUnmounted } from 'vue';
 import { initData } from '@/setup/methods/index';
 import { message } from 'ant-design-vue';
 import firstMenu from '@/components/firstMenu/index.vue';
-import { GetErmcpOutAccountStatus } from '@/goServiceAPI/ermcp/index';
-import { GetErmcpOutAccountStatus as GetErmcpOutAccountStatusType } from '@/goServiceAPI/ermcp/interface';
+import { GetErmcpOutAccountStatus } from '@/goServiceAPI/ermcp/outaccount-status/index';
+import { GetErmcpOutAccountStatus as GetErmcpOutAccountStatusType } from '@/goServiceAPI/ermcp/outaccount-status/interface';
 import TimerUtils from '@/utils/tool/timerUtil';
 import moment from 'moment';