Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

src/page/Frontend/FTRouter.js

@@ -2,7 +2,7 @@
 const BusRouter =  [
     { path: 'batchg', component: ()=>import("./Batchg/views"), name: 'Batchg', meta: { title: 'Batchg' } ,module:'frontend'},
     { path: 'cpsmsg', component: ()=>import("./Cpsmsg/views"), name: 'Cpsmsg', meta: { title: 'Cpsmsg' } ,module:'frontend'},
-    { path: 'cpssxf', component: ()=>import("./Cpssxf/views"), name: 'Cpssxf', meta: { title: 'Cpssxf' } ,module:'frontend'},
+    { path: 'cpssxf', component: ()=>import("./Cpssxf/views"), name: 'Cpssxf', meta: { title: '手续费管理' } ,module:'frontend'},
     { path: 'cpysel', component: ()=>import("./Cpysel/views"), name: 'Cpysel', meta: { title: 'Cpysel' } ,module:'frontend'},
     { path: 'cpzsel', component: ()=>import("./Cpzsel/views"), name: 'Cpzsel', meta: { title: 'Cpzsel' } ,module:'frontend'},
     { path: 'ctmsel', component: ()=>import("./Ctmsel/views"), name: 'Ctmsel', meta: { title: 'Ctmsel' } ,module:'frontend'},

src/page/Frontend/Fxpjrbsel/views/Schpnl.vue

@@ -152,7 +152,7 @@ export default {
           {
             label: "被封装20域编号",
             prop: "bfzybh",
-            width: "120px"
+            width: "160px"
           },
           {
             label: "处理状态",

src/page/Funds/Crtcbk/model/index.js

@@ -68,6 +68,9 @@ export default class Fxtsss {
 			setmod: new Pub().data.Setmod,
 			docpan: new Pub().data.Docpan,
 			trndia: new Pub().data.Trndia,
+			doctre: new Pub().data.Doctre,
+     		mtabut: new Pub().data.Mtabut,
+			trnmod: new Pub().data.Trnmod,
 		}
 	}
 }
\ No newline at end of file

src/page/Funds/Crtcri/model/index.js

@@ -68,6 +68,9 @@ export default class Crtcri {
       setmod: new Pub().data.Setmod,
       docpan: new Pub().data.Docpan,
       trndia: new Pub().data.Trndia,
+      doctre: new Pub().data.Doctre,
+      mtabut: new Pub().data.Mtabut,
+			trnmod: new Pub().data.Trnmod,
     }
   }
 }
\ No newline at end of file

src/page/Funds/Crtcri/views/Clip.vue

@@ -97,7 +97,7 @@
 
     <c-col :span="12">
       <el-form-item :label="$t('crtp.业务种类')" prop="crdgrp.rec.rcvobjtyp">
-        <c-select v-model="model.crdgrp.rec.rcvobjtyp" style="width:100%">
+        <c-select dbCode="RMB122" v-model="model.crdgrp.rec.rcvobjtyp" style="width:100%">
         </c-select>
       </el-form-item>
     </c-col>
@@ -146,7 +146,7 @@
 
     <c-col :span="12">
       <el-form-item :label="$t('crtp.客户类型')" prop="crdgrp.rec.custyp">
-        <c-select v-model="model.crdgrp.rec.custyp" style="width:100%" dbCode="custyp">
+        <c-select dbCode="SZPTY" v-model="model.crdgrp.rec.custyp" style="width:100%">
         </c-select>
       </el-form-item>
     </c-col>

src/page/Funds/Crtcri/views/index.vue

@@ -17,6 +17,16 @@
               <m-docpan :codes="codes" :model="model" />
             </c-content>
           </el-tab-pane>
+          <el-tab-pane label="附件信息" name="doctre">
+            <c-content>
+              <m-doctre :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
+          <el-tab-pane label="附言" name="coninfp">
+            <c-content>
+              <m-coninfp :codes="codes" :model="model" />
+            </c-content>
+          </el-tab-pane>
         </c-tabs>
       </el-form>
       <c-function-btn
@@ -36,6 +46,8 @@ import Crtcri from "../model"
 import Clip from "./Clip"
 import Setpan from "~/components/business/setmod/views";
 import Docpan from "~/components/business/docpan/views";
+import Doctre from "~/components/business/doctre/views";
+import Coninfp from "~/components/business/coninfp/views";
 
 import operationFunc from "~/mixin/operationFunc";
 import commonDepend from "~/mixin/commonDepend";
@@ -48,6 +60,8 @@ export default {
     "m-clip": Clip,
     "m-setpan": Setpan,
     "m-docpan": Docpan,
+    "m-doctre": Doctre,
+    "m-coninfp": Coninfp
   },
   provide() {
     return {

src/page/Funds/Crtcro/model/index.js

@@ -63,6 +63,9 @@ export default class Crtcri {
       setmod: new Pub().data.Setmod,
       docpan: new Pub().data.Docpan,
       trndia: new Pub().data.Trndia,
+      doctre: new Pub().data.Doctre,
+      mtabut: new Pub().data.Mtabut,
+			trnmod: new Pub().data.Trnmod,
     }
   }
 }
\ No newline at end of file

src/page/Funds/Crtcro/views/Clop.vue

@@ -68,7 +68,7 @@
 
     <c-col :span="12">
       <el-form-item :label="$t('crtp.清算币种及金额')" prop="crdgrp.cbs.max.cur">
-        <c-select v-model="model.crdgrp.cbs.max.cur" style="width:100%">
+        <c-select v-model="model.crdgrp.cbs.max.cur" style="width:100%" dbCode="curtxt">
         </c-select>
       </el-form-item>
     </c-col>
@@ -89,7 +89,7 @@
 
     <c-col :span="12">
       <el-form-item :label="$t('crtp.业务种类')" prop="crdgrp.rec.rcvobjtyp">
-        <c-select v-model="model.crdgrp.rec.rcvobjtyp" style="width:100%">
+        <c-select dbCode="RMB122" v-model="model.crdgrp.rec.rcvobjtyp" style="width:100%">
         </c-select>
       </el-form-item>
     </c-col>

src/page/Funds/Crtcro/views/index.vue

@@ -18,6 +18,16 @@
                 <m-docpan :codes="codes" :model="model" />
               </c-content>
             </el-tab-pane>
+            <el-tab-pane label="附件信息" name="doctre">
+            <c-content>
+              <m-doctre :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
+          <el-tab-pane label="附言" name="coninfp">
+            <c-content>
+              <m-coninfp :codes="codes" :model="model" />
+            </c-content>
+          </el-tab-pane>
         </c-tabs>
       </el-form>
       <c-function-btn
@@ -37,6 +47,8 @@ import Crtcro from "../model"
 import Clop from "./Clop"
 import Setpan from "~/components/business/setmod/views";
 import Docpan from "~/components/business/docpan/views";
+import Doctre from "~/components/business/doctre/views";
+import Coninfp from "~/components/business/coninfp/views";
 
 import operationFunc from "~/mixin/operationFunc";
 import commonDepend from "~/mixin/commonDepend";
@@ -49,6 +61,8 @@ export default {
     "m-clop": Clop,
     "m-setpan": Setpan,
     "m-docpan": Docpan,
+    "m-doctre": Doctre,
+    "m-coninfp": Coninfp
   },
   provide() {
     return {

src/page/Funds/Crtctf/model/index.js

@@ -72,6 +72,9 @@ export default class Fxtsss {
 			setmod: new Pub().data.Setmod,
 			docpan: new Pub().data.Docpan,
 			trndia: new Pub().data.Trndia,
+			doctre: new Pub().data.Doctre,
+      		mtabut: new Pub().data.Mtabut,
+			trnmod: new Pub().data.Trnmod,
 		}
 	}
 }
\ No newline at end of file

src/page/Funds/Fttfmt/views/index.vue

@@ -22,6 +22,8 @@
                     </el-tab-pane>
                 </c-tabs>
             </el-form>
+            <c-function-btn :handleCheck="handleCheck" :handleStash="handleStash" :handleSubmit="handleSubmit"
+                @handleSureWarning="handleSureWarning" ref="commonBtn"></c-function-btn>
         </c-page>
     </div>
 </template>

src/page/Funds/FundsRouter.js

@@ -33,6 +33,8 @@ const BusRouter = [
   },
   { path: 'fxtssb', component: () => import("./Fxtssb/views"), name: 'Fxtssb', meta: { title: '即期结汇交易' }, module: 'Funds' },
   { path: 'fxtsss', component: () => import("./Fxtsss/views"), name: 'Fxtsss', meta: { title: '即期售汇交易' }, module: 'Funds' },
+  { path: 'crtcri', component: () => import("./Crtcri/views"), name: 'Crtcri', meta: { title: '汇入清算' }, module: 'Funds' },
+  { path: 'crtcro', component: () => import("./Crtcro/views"), name: 'Crtcro', meta: { title: '汇出清算' }, module: 'Funds' },
   { path: 'fxtsqo', component: () => import("./Fxtsqo/views"), name: 'Fxtsqo', meta: { title: '结售汇报价' }, module: 'Funds' },
   { path: 'crtcbk', component: () => import("./Crtcbk/views"), name: 'Crtcbk', meta: { title: '退汇清算' }, module: 'Funds' },
   { path: 'crtctf', component: () => import("./Crtctf/views"), name: 'Crtctf', meta: { title: '转汇清算' }, module: 'Funds' },