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/bctame/event/buildCommons.js

@@ -34,17 +34,23 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'BCD',
-        // objinr: model.bcdgrp.rec.inr,
+        objinr: model.bcdgrp.rec.inr,
         ownref: model.bcdgrp.rec.ownref,
         opndat: model.bcdgrp.rec.opndat,
         expdat: model.bcdgrp.rec.expdat,
-        branchinr: model.bcdgrp.rec.branchInr,
+        branchInr: model.bcdgrp.rec.branchinr,
         nam: model.bcdgrp.rec.nam,
         oridre: model.bcdgrp.rec.oridre,
+        docamt: model.setmod.docamt,
+        doccur: model.setmod.doccur,
+        newamt: model.swiadd.newamt,
+        ameamt: model.swiadd.ameamt,
+        amecur: model.swiadd.amecur,
       },
       cbsMap: {
         MAX: model.bcdgrp.cbs.max,
         OPN1: model.bcdgrp.cbs.opn1,
+        OLDMAX: model.oldbcdgrp.cbs.max,
         // MAC: model.bcdgrp.cbs.mac,
         // MAC2: model.bcdgrp.cbs.mac2,
         // OPC2: model.bcdgrp.cbs.opc2,

src/business/bctame/model/check.js

@@ -297,11 +297,11 @@ let checkObj = {
     ],
 
 
-    "setmod.docamt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "setmod.docamt":[
+    //     {type: "number", required: false, message: "必输项"},
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    // ],
 
 
 
@@ -313,24 +313,24 @@ let checkObj = {
 
 
 
-    "mtabut.coninf.oitinf.oit.inftxt":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 60,message:"长度不能超过60"}
-    ],
+    // "mtabut.coninf.oitinf.oit.inftxt":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 60,message:"长度不能超过60"}
+    // ],
 
 
-    "mtabut.coninf.oitset.oit.inftxt":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 60,message:"长度不能超过60"}
-    ],
+    // "mtabut.coninf.oitset.oit.inftxt":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 60,message:"长度不能超过60"}
+    // ],
 
-    "mtabut.coninf.conexedat":[
-        {type: "string", required: false, message: "输入正确的日期"}
-    ],
-    "mtabut.coninf.usr.extkey":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 8,message:"长度不能超过8"}
-    ],
+    // "mtabut.coninf.conexedat":[
+    //     {type: "string", required: false, message: "输入正确的日期"}
+    // ],
+    // "mtabut.coninf.usr.extkey":[
+    //     {type: "string", required: false, message: "必输项"},
+    //     {max: 8,message:"长度不能超过8"}
+    // ],
 
     "trnmod.trndoc.advnam":[
         {type: "string", required: false, message: "必输项"},

src/business/bctame/model/index.js

@@ -5,6 +5,8 @@ export default class Bctame{
         this.data = {
 			bcdgrp:{
 				rec:{
+					inr:"",
+					branchinr:"",
 					ownref:"",			//  Reference		.bcdgrp.rec.ownref
 					nam:"",			//  Name		.bcdgrp.rec.nam
 					resflg:"",			//  Reserved Contract		.bcdgrp.rec.resflg
@@ -134,6 +136,28 @@ export default class Bctame{
 					matdat:"",			//  Maturity Date		.oldbcdgrp.rec.matdat
 				},
 			},
+			swiadd: {
+				trnchato: '',
+				newnomtop: '0',
+				purpos: '',
+				amedat: '',
+				addamtcov: '',
+				newnomton: '0',
+				prepers18: '',
+				amenbr: '',
+				nartxt: '',
+				addamt: '',
+				amecur: '',
+				newshpdat: '',
+				newamt: '',
+				newexpdat: '',
+				trnfeetxt: '',
+				ameamt: '',
+				newcur: '',
+				prepertxts18: '',
+				nomspc: '',
+				reqcan: ''
+			},
 			setmod: new Pub().data.Setmod,
 			mtabut: new Pub().data.Mtabut,
 			trnmod: new Pub().data.Trnmod,

src/routers/modules/business.js

@@ -83,6 +83,7 @@ const Business = [
   { path: 'infbcd', component: () => import('~/business/infbcd/views'), name: 'infbcd', meta: { title: '进口代收入口交易' }},
   { path: 'bctacc', component: () => import('~/business/bctacc/views'), name: 'bctacc', meta: { title: '进口代收承兑' }},
   { path: 'bctame', component: () => import('~/business/bctame/views'), name: 'bctame', meta: { title: '进口代收修改' }},
+  // { path: 'bctcan', component: () => import('~/business/bctcan/views'), name: 'bctcan', meta: { title: '进口代收注销' }},
   { path: 'bctrad', component: () => import('~/business/bctrad/views'), name: 'bctrad', meta: { title: '进口代收二次收单' }},
   { path: 'infccd', component: () => import('~/business/infccd/views'), name: 'infccd', meta: { title: '光票托收入口交易' }},