Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

config/base.config.json

+{"userRegister":{"useType":{"memberType":[{"id":1,"typeName":"企业会员"},{"id":2,"typeName":"企业个人会员"},{"id":3,"typeName":"渠道企业会员"},{"id":4,"typeName":"渠道个人会员"}],"businessType":[{"id":1,"typeName":"采购"},{"id":2,"typeName":"商品销售"},{"id":3,"typeName":"加工服务"},{"id":4,"typeName":"物流服务"},{"id":5,"typeName":"金融服务"},{"id":6,"typeName":"保险服务"},{"id":7,"typeName":"1"},{"id":8,"typeName":"2"},{"id":9,"typeName":"3"},{"id":10,"typeName":"4"},{"id":11,"typeName":"23"},{"id":12,"typeName":"6"},{"id":13,"typeName":"5"},{"id":14,"typeName":"11111111111111111111111111"},{"id":16,"typeName":"44"},{"id":17,"typeName":"33"},{"id":18,"typeName":"32"},{"id":19,"typeName":"33333"},{"id":20,"typeName":"4432"}]},"useDetail":[{"groupName":"联系信息","elements":[{"id":26,"fieldName":"contact","fieldCNName":"联系人","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":27,"fieldName":"fixed_contact_number","fieldCNName":"固定联系电话","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":28,"fieldName":"phone_number","fieldCNName":"手机号码","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":29,"fieldName":"fax_number","fieldCNName":"传真号码","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":30,"fieldName":"address","fieldCNName":"地址","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":31,"fieldName":"zip_code","fieldCNName":"邮编","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":32,"fieldName":"url","fieldCNName":"网址","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":33,"fieldName":"email","fieldCNName":"邮箱","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]},{"groupName":"营业执照信息","elements":[{"id":10,"fieldName":"company_name","fieldCNName":"公司名称","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":11,"fieldName":"enterprise_type","fieldCNName":"企业类型","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":12,"fieldName":"residence","fieldCNName":"住所","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":13,"fieldName":"legal_representative","fieldCNName":"法定代表人","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":14,"fieldName":"register_capital","fieldCNName":"注册资本","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":15,"fieldName":"establish_date","fieldCNName":"成立日期","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":16,"fieldName":"business_term","fieldCNName":"营业期限","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":17,"fieldName":"business_scope","fieldCNName":"经营范围","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":18,"fieldName":"registration_authority","fieldCNName":"登记机关","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":19,"fieldName":"registration_time","fieldCNName":"登记时间","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":20,"fieldName":"unified_social_credit_code","fieldCNName":"统一社会信用代码","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":21,"fieldName":"business_license","fieldCNName":"营业执照","fieldType":"file","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":35,"fieldName":" C_COMPANY_KIND","fieldCNName":"企业类型1","fieldType":"file","fieldLength":66,"fieldEmpty":1,"fieldOrder":2,"fieldRemark":"","checkRules":[]}]},{"groupName":"填写会员基本信息","elements":[{"id":1,"fieldName":"member_type","fieldCNName":"会员类型","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":2,"fieldName":"MEMBER_ROLE","fieldCNName":"会员角色","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":3,"fieldName":"member_level","fieldCNName":"会员等级","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":4,"fieldName":"REGISTER_PHONE","fieldCNName":"注册手机号","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":5,"fieldName":"register_email","fieldCNName":"注册邮箱","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]},{"groupName":"法定代表人信息","elements":[{"id":22,"fieldName":"legal_name","fieldCNName":"法人姓名","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":23,"fieldName":"legal_phone","fieldCNName":"法人手机号","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":24,"fieldName":"legal_id_card","fieldCNName":"法人身份证号","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":25,"fieldName":"legal_id_card_information","fieldCNName":"法人身份证信息","fieldType":"file","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]},{"groupName":"填写渠道信息","elements":[{"id":6,"fieldName":"channel_level","fieldCNName":"渠道级别","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":7,"fieldName":"channel_type","fieldCNName":"渠道类型","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":8,"fieldName":"agent_city","fieldCNName":"代理地市","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":9,"fieldName":"channel_describe","fieldCNName":"渠道描述","fieldType":"String","fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]}]},"global":{"logo":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/logo.png","countryList":[{"name":"简体中文-ZH","key":"cn","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/china.png"},{"name":"English-EN","key":"en","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/us.png"},{"name":"日本語-JP","key":"jp","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/japen.png"},{"name":"한국어-KO","key":"ko","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png"}]}}

config/routes/index.ts

@@ -7,9 +7,10 @@
 import CommodityRoute from './commodityRoute' // 商品能力路由
 import MemberRoute from './memberRoute' // 会员能力路由
 import ShopRoute from './shopRoute' // 店铺能力路由
+import TranactionRoute from './tranactionRoute' // 交易能力路由
 import LogisticsRoute from './logisticsRoutes' // 物流能力路由
 
-const routes = [CommodityRoute, MemberRoute, ShopRoute, LogisticsRoute]
+const routes = [CommodityRoute, MemberRoute, ShopRoute, TranactionRoute, LogisticsRoute]
 
 const memberCenterRoute = {
   path: '/memberCenter',

config/routes/tranactionRoute.ts

+
+const TranactionRoute = {
+  path: '/memberCenter/tranactionAbility',
+  name: 'tranactionAbility',
+  key: 'tranactionAbility',
+  icon: 'smile',
+  routes: [
+    {
+      path: '/memberCenter/tranactionAbility/stockSellStorage',
+      name: 'stockSellStorage',
+      key: 'stockSellStorage',
+      routes: [
+        {
+          path: '/memberCenter/tranactionAbility/stockSellStorage/warehouse',
+          name: 'warehouse',
+          key: 'warehouse',
+          component: '@/pages/transaction/stockSellStorage/warehouse/index',
+        },
+        {
+          path: '/memberCenter/tranactionAbility/stockSellStorage/billsType',
+          name: 'billsType',
+          key: 'billsType',
+          component: '@/pages/transaction/stockSellStorage/billsType/index',
+        },
+        {
+          path: '/memberCenter/tranactionAbility/stockSellStorage/bills',
+          name: 'bills',
+          key: 'bills',
+          component: '@/pages/transaction/stockSellStorage/bills/index',
+        },
+        {
+          path: '/memberCenter/tranactionAbility/stockSellStorage/inventory',
+          name: 'inventory',
+          key: 'inventory',
+          component: '@/pages/transaction/stockSellStorage/inventory/index',
+        },
+      ]
+    }
+  ]
+
+}
+
+export default TranactionRoute

src/locales/zh-CN/menu.ts

@@ -65,6 +65,14 @@ export default {
   'menu.shopAbility.shopInfoManage': '店铺信息',
   'menu.shopAbility.shopTemplate': '店铺装修模板',
 
+  // 交易能力
+  'menu.tranactionAbility': '交易',
+  'menu.tranactionAbility.stockSellStorage': '进销存',
+  'menu.tranactionAbility.stockSellStorage.warehouse': '仓库',
+  'menu.tranactionAbility.stockSellStorage.billsType': '单据类型',
+  'menu.tranactionAbility.stockSellStorage.bills': '单据',
+  'menu.tranactionAbility.stockSellStorage.inventory': '库存',
+
   //物流能力
   'menu.logisticsAbility': '物流',
   'menu.logisticsAbility.logistics': '物流管理',

src/pages/transaction/stockSellStorage/bills/index.tsx

+import React, { useState, useEffect, useRef } from 'react';
+import { history } from 'umi';
+import {
+  Tooltip,
+  Input,
+  Select,
+  Button,
+  Card,
+  Dropdown,
+  Menu,
+  Row,
+  Col,
+  Popconfirm,
+} from 'antd';
+import {
+  PlusOutlined,
+  EyeOutlined,
+  UpOutlined,
+  DeleteOutlined,
+  DownOutlined,
+} from '@ant-design/icons';
+import { StandardTable } from 'god';
+import { ColumnType } from 'antd/lib/table/interface';
+import style from './index.less';
+
+const Bills: React.FC<{}> = () => {
+  return <div>Bills</div>;
+};
+
+export default Bills;

src/pages/transaction/stockSellStorage/billsType/index.tsx

+import React, { useState, useEffect, useRef } from 'react';
+import { history } from 'umi';
+import {
+  Tooltip,
+  Input,
+  Select,
+  Button,
+  Card,
+  Dropdown,
+  Menu,
+  Row,
+  Col,
+  Popconfirm,
+} from 'antd';
+import {
+  PlusOutlined,
+  EyeOutlined,
+  UpOutlined,
+  DeleteOutlined,
+  DownOutlined,
+} from '@ant-design/icons';
+import { StandardTable } from 'god';
+import { ColumnType } from 'antd/lib/table/interface';
+import style from './index.less';
+
+const BillsType: React.FC<{}> = () => {
+  return <div>BillsType</div>;
+};
+
+export default BillsType;

src/pages/transaction/stockSellStorage/inventory/index.tsx

+import React, { useState, useEffect, useRef } from 'react';
+import { history } from 'umi';
+import {
+  Tooltip,
+  Input,
+  Select,
+  Button,
+  Card,
+  Dropdown,
+  Menu,
+  Row,
+  Col,
+  Popconfirm,
+} from 'antd';
+import {
+  PlusOutlined,
+  EyeOutlined,
+  UpOutlined,
+  DeleteOutlined,
+  DownOutlined,
+} from '@ant-design/icons';
+import { StandardTable } from 'god';
+import { ColumnType } from 'antd/lib/table/interface';
+import style from './index.less';
+
+const Inventory: React.FC<{}> = () => {
+  return <div>Inventory</div>;
+};
+
+export default Inventory;

src/pages/transaction/stockSellStorage/warehouse/index.tsx

+import React, { useState, useEffect, useRef } from 'react';
+import { history } from 'umi';
+import {
+  Tooltip,
+  Input,
+  Select,
+  Button,
+  Card,
+  Dropdown,
+  Menu,
+  Row,
+  Col,
+  Popconfirm,
+} from 'antd';
+import {
+  PlusOutlined,
+  EyeOutlined,
+  UpOutlined,
+  DeleteOutlined,
+  DownOutlined,
+} from '@ant-design/icons';
+import { StandardTable } from 'god';
+import { ColumnType } from 'antd/lib/table/interface';
+import style from './index.less';
+
+const WareHouse: React.FC<{}> = () => {
+  return <div>warehouse</div>;
+};
+
+export default WareHouse;