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

src/page/Funds/Fttfcm/event/buildCommons.js

@@ -25,7 +25,7 @@ export default {
       return {
         rec: {
           objtyp: "FTD",
-          objtyp: "",
+          objinr: "",
           ownref: model.ftdgrp.rec.ownref,
           msgtyp: model.fttp.msgtyp,
           fttyp: model.ftdgrp.rec.fttyp,

src/page/Funds/Fttfcm/event/index.js

 import commonFunctions from "~/mixin/commonFunctions.js";
 import Api from "~/service/Api";
 
+import Pts from "~/page/Model/Common/Pts"
+
 export default {
   mixins: [commonFunctions],
   methods: {
@@ -8,7 +10,7 @@ export default {
       if (this.model.ftdgrp.rec.fttyp == "") {
         this.$notify.warning({
           title: '提示',
-          message: '请先选择平盘类型！'
+          message: '请先选择定存拆借类型！'
         });
         return;
       }
@@ -22,6 +24,24 @@ export default {
       this.model.ftdgrp.rec.ownref = res.data;
     },
 
+    async onFttypChange() {
+      if (this.model.ftdgrp.rec.fttyp =='LI'||
+              this.model.ftdgrp.rec.fttyp =='DI'){
+                this.model.ftdgrp.tri.pts=new Pts().data;
+               
+              }else if(this.model.ftdgrp.rec.fttyp =='LO'||
+              this.model.ftdgrp.rec.fttyp =='DO'){
+                this.model.fttp.troact='';
+                this.model.ftdgrp.tro.pts=new Pts().data;
+  
+              }else{
+                this.model.fttp.troact='';
+                this.model.fttp.triact='';
+                this.model.ftdgrp.tro.pts=new Pts().data;
+                this.model.ftdgrp.tri.pts=new Pts().data;
+                this.model.ftdgrp.act.pts=new Pts().data;
+              }
+    },
 
     async onMaxcurChange() {
       

src/page/Funds/Fttfcm/views/Mt199.vue

@@ -9,7 +9,7 @@
 
         <c-col :span="24">
             <c-form-item label="Related Reference" prop="relref">
-                <c-input disabled v-model="model.relref" maxlength="16" placeholder=""></c-input>
+                <c-input  v-model="model.relref" maxlength="16" placeholder=""></c-input>
             </c-form-item>
         </c-col>
 

src/page/Funds/Fttfcm/views/Mt299.vue

@@ -9,7 +9,7 @@
 
         <c-col :span="24">
             <c-form-item label="Related Reference" prop="relref">
-                <c-input disabled v-model="model.relref" maxlength="16" placeholder=""></c-input>
+                <c-input  v-model="model.relref" maxlength="16" placeholder=""></c-input>
             </c-form-item>
         </c-col>
 

src/page/Funds/Fttfcm/views/Ovwp1.vue

@@ -48,7 +48,7 @@
         </c-col>
         <c-col :span="24">
           <el-form-item label="定存拆借类型" prop="ftdgrp.rec.fttyp">
-            <c-select v-model="model.ftdgrp.rec.fttyp" :code="codes.fttyp" :filterKey="['LO','LI','DO','DI']" style="width:100%"
+            <c-select @change="onFttypChange" v-model="model.ftdgrp.rec.fttyp" :code="codes.fttyp" :filterKey="['LO','LI','DO','DI']" style="width:100%"
               placeholder="请输入定存拆借类型">
             </c-select>
           </el-form-item>
@@ -94,8 +94,21 @@
         </c-col>
         <c-col :span="24">
           <c-form-item label="年利率" prop="ftdgrp.rec.rat">
-            <c-input v-model="model.ftdgrp.rec.rat" placeholder="请输入年利率"></c-input>
+            <!-- <c-input v-model="model.ftdgrp.rec.rat" placeholder="请输入年利率"></c-input> -->
+            <c-fullbox>
+            <c-input v-model="model.ftdgrp.rec.rat" placeholder="请输入年利率" ></c-input>
+              <template slot="footer">
+                  <span style="margin: 0 5px" size="small" type="primary">
+                  %
+                  </span>
+              </template>
+          </c-fullbox>
+          
           </c-form-item>
+
+
+          
+
         </c-col>
         <c-col :span="24">
           <el-form-item label="计息方式" prop="ftdgrp.rec.cntfra">
@@ -146,13 +159,17 @@
       <c-col :span="12" style="padding-left: 20px">
         <c-col :span="24">
           <c-form-item label="业务摘要" prop="ftdgrp.rec.nam">
-            <c-input v-model="defaultNam950" maxlength="40"
+            <c-input disabled v-model="defaultNam950" maxlength="40"
               placeholder="请输入名称"></c-input>
           </c-form-item>
         </c-col>
         <c-col :span="24">
           <el-card class="box-card">
-            <c-ptap :model="model" :requiredExtkey="true" @change="onTroChange"   :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
+            <c-ptap :model="model" @change="onTroChange"   :disabled="true"
+            :requiredExtkey="model.ftdgrp.rec.fttyp =='LI'||model.ftdgrp.rec.fttyp =='DI'"
+            :disabledExtkey="model.ftdgrp.rec.fttyp =='LO'||model.ftdgrp.rec.fttyp =='DO'|| model.ftdgrp.rec.fttyp ==''||model.ftdgrp.rec.fttyp ==undefined" 
+            
+            :isAdrblk="true" :haveAdrLabel="true"
               :isShowCard="false" :argadr="{ title: '资金拆出行', grp: 'ftdgrp', rol: 'tro' }" ptytyp="B">
             </c-ptap>
           </el-card >
@@ -164,9 +181,12 @@
           </el-form-item> -->
 
 
-          <el-form-item label="" prop="fttp.troact">
+          <el-form-item label="Account" prop="fttp.troact">
             <el-select
               v-model="model.fttp.troact" clearablex
+
+              :disabled="model.ftdgrp.rec.fttyp =='LO'||model.ftdgrp.rec.fttyp =='DO'|| model.ftdgrp.rec.fttyp ==''||model.ftdgrp.rec.fttyp ==undefined" 
+
               placeholder="请选择账号"
             >
               <el-option v-for="item in troActlist" :key="item" :label="item"
@@ -180,14 +200,19 @@
 
         <c-col :span="24">
           <el-card class="box-card">
-            <c-ptap :model="model" :requiredExtkey="true" @change="onTriChange" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
+            <c-ptap :model="model"  @change="onTriChange" :disabled="true"  
+            :requiredExtkey="model.ftdgrp.rec.fttyp =='LO'||model.ftdgrp.rec.fttyp =='DO'"
+            :disabledExtkey="model.ftdgrp.rec.fttyp =='LI'||model.ftdgrp.rec.fttyp =='DI'|| model.ftdgrp.rec.fttyp ==''||model.ftdgrp.rec.fttyp ==undefined" :isAdrblk="true" :haveAdrLabel="true"
               :isShowCard="false" :argadr="{ title: '资金拆入行', grp: 'ftdgrp', rol: 'tri' }" ptytyp="B">
             </c-ptap>
           </el-card>
         </c-col>
         <c-col :span="24">
           <el-card class="box-card">
-            <c-ptap :model="model" :requiredExtkey="true" @change="onActChange" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
+            <c-ptap :model="model"  @change="onActChange" :disabled="true" 
+            
+            :disabledExtkey="model.ftdgrp.rec.fttyp ==''||model.ftdgrp.rec.fttyp ==undefined"
+            :isAdrblk="true" :haveAdrLabel="true"
               :isShowCard="false" :argadr="{ title: '资金拆出我方账户行', grp: 'ftdgrp', rol: 'act' }" ptytyp="B">
             </c-ptap>
           </el-card>
@@ -199,9 +224,10 @@
           </el-form-item> -->
 
 
-          <el-form-item label="" prop="fttp.triact">
+          <el-form-item label="Account" prop="fttp.triact">
             <el-select
               v-model="model.fttp.triact" clearablex
+              :disabled="model.ftdgrp.rec.fttyp ==''||model.ftdgrp.rec.fttyp ==undefined" 
               placeholder="请选择账号"
             >
               <el-option v-for="item in triActlist" :key="item" :label="item"
@@ -228,6 +254,8 @@ export default {
   mixins: [Event,commonProcess],
   data() {
     return {
+      triActlist:['1111120209999','1111120209998'],
+      troActlist:['2222220209999','2222220209998'],
 
     }
   },
@@ -249,6 +277,9 @@ export default {
                 this.model.ftdgrp.rec.nam=nam;
                 return nam
             },
+
+            
+
         },
 
   methods: {

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

@@ -44,7 +44,7 @@ import operationFunc from "~/mixin/operationFunc";
 import commonDepend from "~/mixin/commonDepend";
 
 import event from "../event";
-import Check from "../model/Check"
+import Check from "../model/Check.js"
 // import Default from "../model/Default"
 // import Pattern from "../model/Pattern"
 import Ovwp from "./Ovwp"
@@ -62,7 +62,7 @@ export default {
             root: this
         }
     },
-    mixins: [commonProcess,operationFunc,commonDepend,event,buildFn],
+    mixins: [commonProcess,operationFunc,commonDepend,event,Check,buildFn],
     data() {
         return {
             tabVal: "ovwp",