Merge branch 'master' of http://172.17.2.110:11080/fukai/dzt-mobx

src/views/Business/CPT/descriptor/cptopn.js

+export default fieldSet = {
+    branch: [{type: 'string', required: true, max: 20, message: '长度不能超过20个字符'}],
+    credat: [{type: 'object', required: true, message: '请选择业务日期'}],
+    ownref: [{type: 'string', required: true, max: 32, message: '长度不能超过32个字符'}],
+    extkey: [{type: 'string', max: 20}],
+    cusman: [{type: 'string', max: 20}],
+    cpman: [{type: 'string', max: 20}],
+    custyp: [{type: 'string', max: 20}],
+    cuspr: [{type: 'string', max: 20}],
+    corref: [{type: 'string', max: 20}],
+    cusseg: [{type: 'string', max: 20}],
+    ptynam: [{type: 'string', max: 20}],
+    attdat: [{type: 'string', max: 20}],
+    attrsn: [{type: 'string', max: 20}],
+    paytyp: [{type: 'string', max: 20}],
+    trntyp: [{type: 'string', max: 20}],
+    fktyp: [{type: 'string', max: 20}],
+    isoffh: [{type: 'string', max: 20}],
+    offdat: [{type: 'object'}],
+    offref: [{type: 'string', max: 20}],
+    oppcuspro: [{type: 'string', max: 20}],
+    amt: [{type: 'string', max: 20}],
+    valdat: [{type: 'object'}],
+    cashref: [{type: 'string', max: 20}],
+    liqtyp: [{type: 'string', max: 20}],
+    swftyp: [{type: 'string', max: 20}],
+    amtf33b: [{type: 'string', max: 20}],
+    f36: [{type: 'string', max: 20}],
+    ratcat: [{type: 'string', max: 20}],
+    dbfadrblkcn: [{type: 'string', max: 20}],
+    pyeact: [{type: 'string', max: 20}],
+    stac: [{type: 'string', max: 20}],
+    finref: [{type: 'string', max: 20}],
+}
\ No newline at end of file

src/views/Business/CPT/index.js

+import React,{Component} from 'react'
+
+import { Switch, Route, Redirect } from 'react-router-dom';
+import Cptopn from './Cptopn'
+
+import "./index.less"
+
+const moduleBasePath = "/business/cpt/"
+
+export default function moduleRouter(props){
+     return <React.Fragment>
+        <Switch>
+            <Route exact path={`${moduleBasePath}opn`} component={Cptopn} />
+        </Switch>
+    </React.Fragment>
+}
\ No newline at end of file

src/views/Business/CPT/index.less

+.check_layout{
+  margin-left: 33%;
+}
\ No newline at end of file

src/views/Business/FET/descriptor/fetfxq.js

+export default fieldSet = {
+    orcnam: [{type: 'string'}],
+    oppnam: [{type: 'string'}],
+    orcadr: [{type: 'string'}],
+    oppadr: [{type: 'string'}],
+    trnbnk1: [{type: 'string'}],
+    trnbnk2: [{type: 'string'}],
+    trnbnk3: [{type: 'string'}],
+    trnbnk4: [{type: 'string'}],
+    trnbnk5: [{type: 'string'}],
+    trnbnk6: [{type: 'string'}],
+    gooddis: [{type: 'string'}],
+    goodtyp: [{type: 'string'}],
+    goodnam: [{type: 'string'}],
+    notify: [{type: 'string'}],
+    oppnat: [{type: 'string'}],
+    carrier: [{type: 'string'}],
+    shipnam: [{type: 'string'}],
+    consignee: [{type: 'string'}],
+    fhdis: [{type: 'string'}],
+    shipper: [{type: 'string'}],
+    tagdis: [{type: 'string'}],
+    agent: [{type: 'string'}],
+    shport: [{type: 'string'}],
+    drawee: [{type: 'string'}],
+    taport: [{type: 'string'}],
+    remark: [{type: 'string'}],
+    valdis: [{type: 'string'}],
+}
\ No newline at end of file

src/views/Business/FET/index.js

@@ -2,6 +2,7 @@ import React,{Component} from 'react'
 
 import { Switch, Route, Redirect } from 'react-router-dom';
 import Fetopn from './Fetopn'
+import Fetfxq from './Fetfxq'
 
 import "./index.less"
 
@@ -11,6 +12,7 @@ export default function moduleRouter(props){
      return <React.Fragment>
         <Switch>
             <Route exact path={`${moduleBasePath}opn`} component={Fetopn} />
+            <Route exact path={`${moduleBasePath}fxq`} component={Fetfxq} />
         </Switch>
     </React.Fragment>
 }
\ No newline at end of file

src/views/Layout/index.js

@@ -13,6 +13,7 @@ import Home from '../Home'
 
 import PXIRouter from '../Business/PXI'
 import FETRouter from '../Business/FET'
+import CPTRouter from '../Business/CPT'
 
 const {
   Header, Footer, Sider, Content,
@@ -44,6 +45,7 @@ export default class LayoutCom extends Component {
                                 {/*模块路由插入开始*/}
                                 <Route path="/business/pxi"  component={PXIRouter} />
                                 <Route path="/business/fet"  component={FETRouter} />
+                                <Route path="/business/cpt"  component={CPTRouter} />
                                 {/*模块路由插入结束*/}
                                 <Redirect path="/" to="/home" />
                             </Switch>