Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/brtset/model/check.js

@@ -1317,10 +1317,10 @@ let checkObj = {
     { max: 35, message: '长度不能超过35' },
   ],
 
-  'trtcre.oriamt': [
-    { type: 'string', required: false, message: '必输项' },
-    { max: 17, message: '整数位不能超过14位' },
-  ],
+  // 'trtcre.oriamt': [
+  //   { type: 'string', required: false, message: '必输项' },
+  //   { max: 17, message: '整数位不能超过14位' },
+  // ],
   'trtcre.trdgrp.rec.pctfin': [
     { type: 'string', required: false, message: '必输项' },
     { max: 6, message: '长度不能超过6' },

src/business/brtset/model/index.js

@@ -132,8 +132,9 @@ export default class Bctset {
       trtcre: {
         trtmod: {
           finmod: {
+            act1:'',
             accbch: '',
-            intprd: '',
+            intprd: '6',
             ovdintrat: '',
             fincod: '',
             fltval: '',
@@ -141,7 +142,7 @@ export default class Bctset {
               spjgdc: '',
               shpdch: '',
               sxlexi: '',
-              jzllgz: '',
+              jzllgz: '1',
               chapdm: '',
               libor: '',
               sheplb: '',
@@ -169,7 +170,7 @@ export default class Bctset {
               djhtno: '',
               chapmc: '',
             },
-            intamt: '',
+            intamt: '0',
             flttyp: '',
             act3: '',
             ratchgdat: '',
@@ -177,10 +178,9 @@ export default class Bctset {
             ovdinttyp: '',
             graday: '',
             intact: '',
-            act1: '',
             dinjdm: '',
             wjdkfl: '',
-            ratchgtyp: '',
+            ratchgtyp: '1',
             acttyp: '',
             intdat: '',
             ratchgprd: '',
@@ -192,23 +192,23 @@ export default class Bctset {
         trntyp: '',
         trdgrp: {
           rec: {
-            stttendat: '',
+            stttendat: new Date(),
             recaccount: '',
-            pctfin: '',
+            pctfin: '100',
             recdistrictcode: '',
             ownref: '',
-            intrat: '',
+            intrat: '0.000000',
             pntnam: '',
-            invtyp: '',
+            invtyp: '1',
             fintyp: '',
             tenday: '',
             guaflg: '',
-            stagod: '',
+            stagod: '001',
             lprtyp: '',
-            issdat: '',
+            issdat: new Date(),
             matdat: '',
             nam: '',
-            actrat: '',
+            actrat: '0.000000',
             pntref: '',
             reccountrycode: '',
           },
@@ -227,7 +227,7 @@ export default class Bctset {
         trtp: {
           act: '',
           usr: {
-            extkey: '',
+            extkey: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL',
           },
           recname: '',
           bcdget: {
@@ -381,7 +381,7 @@ export default class Bctset {
             flttyp: '',
             tenday: '',
             rescur: '',
-            guaflg: '',
+            guaflg: '0',
             dfuflg: '',
             trntyp: '',
             bankno: '',

src/business/brtset/views/Trtcrep.vue

@@ -8,7 +8,7 @@
             <c-fullbox>
               <c-input
                 disabled
-                v-model="model.trtcre.trdgrp.rec.pntref"
+                v-model="trtcretrdgrprecpntref"
                 maxlength="16"
                 style="width: 98%"
                 placeholder="请输入单据编号"
@@ -130,16 +130,16 @@
           <el-form-item label="融资品种" prop="trtcre.trdgrp.rec.fintyp">
             <c-select
               disabled
-              v-model="model.trtcre.trdgrp.rec.fintyp"
+              v-model="fintyp"
               style="width: 100%"
               placeholder="请选择融资品种"
               :disable="true"
             >
               <el-option
-                v-for="item in codes.fintyp1"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                  v-for="item in codes.fintyp1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
               >
               </el-option>
             </c-select>
@@ -153,13 +153,15 @@
               style="width: 100%"
               placeholder="请选择货押标识"
             >
+
               <el-option
-                v-for="item in codes.guaflg"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                  v-for="item in codes.guaflg"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
               >
               </el-option>
+
             </c-select>
           </el-form-item>
         </c-col>
@@ -185,7 +187,7 @@
         <c-col :span="12">
           <el-form-item label="原始币种" prop="trtcre.oricur">
             <c-select
-              v-model="model.trtcre.oricur"
+              v-model="oricur"
               style="width: 100%"
               :disabled="true"
               placeholder="请选择币种"
@@ -207,7 +209,7 @@
             prop="trtcre.oriamt"
           >
             <c-input
-              v-model="model.trtcre.oriamt"
+              v-model="oriamt"
               style="width: 100%"
               placeholder="请输入融资金额"
             ></c-input>
@@ -241,7 +243,7 @@
         <c-col :span="24">
           <c-col :span="13">
             <el-form-item label="融资金额" prop="trtcre.trdgrp.cbs.max.cur">
-              <c-select v-model="model.trtcre.trdgrp.cbs.max.cur">
+              <c-select v-model="maxcur">
                 <el-option
                   v-for="item in codes.curtxt2"
                   :key="item.value"
@@ -259,7 +261,7 @@
               label-width="5px"
             >
               <c-input
-                v-model="model.trtcre.trdgrp.cbs.max.amt"
+                v-model="maxamt"
                 :disabled="true"
               ></c-input>
             </el-form-item>
@@ -395,14 +397,14 @@
               style="width: 100%"
               placeholder="请选择第一还款账号"
             >
-              <el-option
-                v-for="(item, idx) in codes.codeSet[
-                  'trtcre.trtmod.finmod.act1'
-                ]"
-                :key="idx"
-                :label="item.split('\t')[1]"
-                :value="item.split('\t')[0]"
-              ></el-option>
+<!--              <el-option-->
+<!--                v-for="(item, idx) in codes.codeSet[-->
+<!--                  'trtcre.trtmod.finmod.act1'-->
+<!--                ]"-->
+<!--                :key="idx"-->
+<!--                :label="item.split('\t')[1]"-->
+<!--                :value="item.split('\t')[0]"-->
+<!--              ></el-option>-->
             </c-select>
           </el-form-item>
         </c-col>
@@ -842,6 +844,33 @@ export default {
   watch: {},
   methods: {},
   created: function () {},
+  computed:{
+    trtcretrdgrprecpntref(){
+      this.model.trtcre.trtmod.finmod.fincod = this.model.brdgrp.rec.ownref
+      this.model.trtcre.trdgrp.rec.pntref = this.model.brdgrp.rec.ownref
+      return this.model.trtcre.trdgrp.rec.pntref
+    },
+    fintyp(){
+      this.model.trtcre.trdgrp.rec.fintyp = 'BRF'
+      return this.model.trtcre.trdgrp.rec.fintyp
+    },
+    oricur(){
+      this.model.trtcre.oricur = this.model.brdgrp.cbs.max.cur
+      return this.model.trtcre.oricur
+    },
+    oriamt(){
+      this.model.trtcre.oriamt = this.model.brdgrp.cbs.max.amt * this.model.trtcre.trdgrp.rec.pctfin /100
+      return this.model.trtcre.oriamt
+    },
+    maxcur(){
+      this.model.trtcre.trdgrp.cbs.max.cur = this.model.trtcre.oricur
+      return this.model.trtcre.trdgrp.cbs.max.cur
+    },
+    maxamt(){
+      this.model.trtcre.trdgrp.cbs.max.amt = this.model.trtcre.oriamt
+      return this.model.trtcre.trdgrp.cbs.max.amt
+    },
+  }
 };
 </script>