Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

src/business/botame/event/buildCommons.js

@@ -31,7 +31,7 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'BOD',
-        // objinr: model.bedgrp.rec.inr,
+        // objinr: model.bodgrp.rec.inr,
         ownref: model.bodgrp.rec.ownref,
         opndat: model.bodgrp.rec.opndat,
         expdat: model.bodgrp.rec.expdat,
@@ -49,10 +49,14 @@ export default {
         // purpos: model.bodgrp.rec.purpos,
         // revflg: model.bodgrp.rec.revflg,
         // cnfsta: model.bodgrp.rec.cnfsta,
+        amecur: model.swiadd.amecur,
+        ameamt: model.swiadd.ameamt,
+        newamt: model.swiadd.newamt,
       },
       cbsMap: {
         MAX: model.bodgrp.cbs.max,
         OPN1: model.bodgrp.cbs.opn1,
+        OLDMAX: model.oldbodgrp.cbs.max,
         // MAC: model.bodgrp.cbs.mac,
         // MAC2: model.bodgrp.cbs.mac2,
         // OPC2: model.bodgrp.cbs.opc2,

src/business/botame/model/check.js

@@ -47,11 +47,11 @@ let checkObj = {
         //{type: "date", required: false, message: "输入正确的日期"}
     ],
 
-    "oldbodgrp.cbs.max.amt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "oldbodgrp.cbs.max.amt":[
+    //     // {type: "string", required: false, message: "必输项"},
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    // ],
 
     "trnmod.swiadd.ameamt":[
         {type: "string", required: false, message: "必输项"},
@@ -377,7 +377,7 @@ let checkObj = {
 
 
     "setmod.docamt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],

src/business/botame/model/index.js

@@ -45,11 +45,11 @@ export default class Botame{
 				cbs:{
 					max:{
 						cur:"",			//  Document Amount		.bodgrp.cbs.max.cur
-						amt:"",			//  Document Amount		.bodgrp.cbs.max.amt
+						amt:"0.00",			//  Document Amount		.bodgrp.cbs.max.amt
 					},
 					opn1:{
 						cur:"",			//  Warehouse/Insurance		.bodgrp.cbs.opn1.cur
-						amt:"",			//  Open Amount		.bodgrp.cbs.opn1.amt
+						amt:"0.00",			//  Open Amount		.bodgrp.cbs.opn1.amt
 					},
 				},
 				blk:{
@@ -92,7 +92,7 @@ export default class Botame{
 				cbs:{
 					max:{
 						cur:"",			//  Original Amount		.oldbodgrp.cbs.max.cur
-						amt:"",			//  Original Amount		.oldbodgrp.cbs.max.amt
+						amt:"0.00",			//  Original Amount		.oldbodgrp.cbs.max.amt
 					},
 				},
 				rec:{
@@ -149,6 +149,18 @@ export default class Botame{
 					ptsaddg:[],			//  		.botp.ptsaddp.ptsaddg
 				},
 			},
+			swiadd: {
+				amecur: '',
+				ameamt: '0.00',
+				newcur: '',
+				newamt: '0.00',
+				newmatpercnt: '',
+				newmatpertyp: '',
+				newmatperbeg: '',
+				newmatdat: '',
+				ametxt: '',
+				// amatpertyp: '',//swiadd类中是没有这个属性的，不清楚为什么前端会有使用到这个字段
+			},
 			setmod: new Pub().data.Setmod,
 			mtabut: new Pub().data.Mtabut,
 			trnmod: new Pub().data.Trnmod,

src/business/botame/views/Addbcb.vue

@@ -17,10 +17,7 @@
     </template>
  
     <script>
-    import Api from "~/service/Api";
-    import commonProcess from "~/mixin/commonProcess";
-    import Utils from "~/utils";
-    import Event from "~/model/Litcan/Event";
+    import event from "../event";
    //import Addbcb1 from "~/views/Public/Addbcb1";
     import Coninfp from "~/views/Public/Coninfp";
  
@@ -32,7 +29,7 @@
       },
         inject: ["root"],
         props: ["model", "codes"],
-        mixins: [commonProcess],
+        mixins: [event],
         data() {
             return {
             

src/business/botame/views/Amep.vue

@@ -118,10 +118,10 @@
       </c-col>
 
       <c-col :span="12">
-        <el-form-item label="修改增减额" prop="trnmod.swiadd.amecur">
+        <el-form-item label="修改增减额" prop="swiadd.amecur">
           <c-select
             disabled
-            v-model="model.trnmod.swiadd.amecur"
+            v-model="model.swiadd.amecur"
             style="width: 100%"
             placeholder="请选择币种"
           >
@@ -139,10 +139,10 @@
         <el-form-item
           style="text-align: left"
           label-width="5px"
-          prop="trnmod.swiadd.ameamt"
+          prop="swiadd.ameamt"
         >
           <c-input
-            v-model="model.trnmod.swiadd.ameamt"
+            v-model="model.swiadd.ameamt"
             style="text-align: left; width: 100%"
             placeholder="请输入修改增减额"
             @keyup.enter.native="showGridPromptDialog('trnmod.swiadd.ameamt')"
@@ -151,10 +151,10 @@
       </c-col>
 
       <c-col :span="12">
-        <el-form-item label="修改后的付款期限" prop="trnmod.swiadd.newcur">
+        <el-form-item label="修改后的付款期限" prop="swiadd.newcur">
           <c-select
             disabled
-            v-model="model.trnmod.swiadd.newcur"
+            v-model="model.swiadd.newcur"
             style="width: 100%"
             placeholder="请选择币种"
           >
@@ -172,10 +172,11 @@
         <el-form-item
           style="text-align: left"
           label-width="5px"
-          prop="trnmod.swiadd.newamt"
+          prop="swiadd.newamt"
+          v-model="newamt"
         >
           <c-input
-            v-model="model.trnmod.swiadd.newamt"
+            v-model="model.swiadd.newamt"
             style="text-align: left; width: 100%"
             placeholder="请输入"
             @keyup.enter.native="showGridPromptDialog('trnmod.swiadd.newamt')"
@@ -257,11 +258,11 @@
             <c-col :span="9">
               <el-form-item
                 label="修改后的付款期限"
-                prop="trnmod.swiadd.newmatpercnt"
+                prop="swiadd.newmatpercnt"
               >
                 <c-input
                   :disabled="model.bodgrp.rec.doctypcod === 'P'"
-                  v-model="model.trnmod.swiadd.newmatpercnt"
+                  v-model="model.swiadd.newmatpercnt"
                   placeholder="请输入修改后的付款期限"
                 ></c-input>
               </el-form-item>
@@ -270,12 +271,12 @@
             <c-col :span="4">
               <el-form-item
                 label=""
-                prop="trnmod.swiadd.newmatpertyp"
+                prop="swiadd.newmatpertyp"
                 label-width="5px"
               >
                 <c-select
                   :disabled="model.bodgrp.rec.doctypcod === 'P'"
-                  v-model="model.trnmod.swiadd.newmatpertyp"
+                  v-model="model.swiadd.newmatpertyp"
                   style="width: 100%"
                   placeholder="请输入"
                 >
@@ -293,12 +294,12 @@
             <c-col :span="11">
               <el-form-item
                 label=""
-                prop="trnmod.swiadd.newmatperbeg"
+                prop="swiadd.newmatperbeg"
                 label-width="5px"
               >
                 <c-select
                   :disabled="model.bodgrp.rec.doctypcod === 'P'"
-                  v-model="model.trnmod.swiadd.newmatperbeg"
+                  v-model="model.swiadd.newmatperbeg"
                   style="width: 100%"
                   placeholder="请选择"
                 >
@@ -332,11 +333,11 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="修改后的付款期限" prop="trnmod.swiadd.newmatdat">
+        <el-form-item label="修改后的付款期限" prop="swiadd.newmatdat">
           <c-date-picker
             type="date"
             :disabled="model.bodgrp.rec.doctypcod === 'P'"
-            v-model="model.trnmod.swiadd.newmatdat"
+            v-model="model.swiadd.newmatdat"
             style="width: 100%"
             placeholder="请选择修改后的付款期限"
           ></c-date-picker>
@@ -344,10 +345,10 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="更多的修改内容" prop="trnmod.swiadd.ametxt">
+        <el-form-item label="更多的修改内容" prop="swiadd.ametxt">
           <c-input-format
             type="textarea"
-            v-model="model.trnmod.swiadd.ametxt"
+            v-model="model.swiadd.ametxt"
             :maxRows="6"
             :maxCols="35"
             placeholder="请输入更多的修改内容"
@@ -358,15 +359,12 @@
   </c-row>
 </template>
 <script>
-import Api from "~/service/Api";
-import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable";
-import Event from "~/model/Botame/Event";
+import event from "../event";
 
 export default {
   inject: ["root"],
   props: ["model", "codes"],
-  mixins: [commonProcess],
+  mixins: [event],
   data() {
     return {
       matpertyp: [
@@ -378,7 +376,7 @@ export default {
   watch: {
     "model.bodgrp.rec.doctypcod": function () {
       if (this.model.bodgrp.rec.doctypcod == "P") {
-        this.model.trnmod.swiadd.newmatdat = "";
+        this.model.swiadd.newmatdat = "";
         this.model.bodgrp.rec.matdat = "";
       }
     },
@@ -386,6 +384,12 @@ export default {
   methods: {
     ...Event,
   },
+  computed: {
+    newamt(){
+      this.model.swiadd.newamt =parseInt(this.model.oldbodgrp.cbs.max.amt)+parseInt(this.model.swiadd.ameamt)
+      return this.model.swiadd.newamt;
+    }
+  },
   created: function () {},
 };
 </script>

src/business/botame/views/Inst.vue

@@ -175,15 +175,12 @@
   </div>
 </template>
 <script>
-import Api from "~/service/Api"
-import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Botdav/Event"
+import event from "../event";
 
 export default {
   inject: ['root'],
   props: ["model", "codes"],
-  mixins: [commonProcess],
+  mixins: [event],
   data() {
     return {
 

src/business/botame/views/Instrecp.vue

@@ -90,15 +90,12 @@
   </div>
 </template>
 <script>
-import Api from "~/service/Api"
-import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Botdav/Event"
+import event from "../event";
 
 export default {
     inject: ['root'],
     props:["model","codes"],
-    mixins: [commonProcess],
+    mixins: [event],
     data(){
         return {
 

src/business/botame/views/Ovwp.vue

@@ -26,10 +26,7 @@
   </div>
   </template>
   <script>
-  import Api from "~/service/Api";
-  import commonProcess from "~/mixin/commonProcess";
-  import CodeTable from "~/config/CodeTable";
-  import Event from "~/model/Botame/Event";
+  import event from "../event";
      import Ovwp1 from "./Ovwp1"
      import Inst from "./Inst"
      import Ptyp from "./Ptyp"
@@ -46,7 +43,7 @@
     },
     inject: ["root"],
     props: ["model", "codes"],
-    mixins: [commonProcess],
+    mixins: [event],
     data() {
       return {
         activeNames: ["ovwp1"],

src/business/botame/views/Ovwp1.vue

@@ -291,7 +291,7 @@
           ></c-input>
         </el-form-item>
       </c-col>
-      <c-col v-if=" (model.trnmod.swiadd.Amatpertyp=='D')||(model.oldbodgrp.rec.matpertyp==''&&model.trnmod.swiadd.newmatpertyp=='')||(model.oldbodgrp.rec.matpertyp=='D' &&model.trnmod.swiadd.newmatpertyp=='')"   :span="1" style="margin-left:-10px">
+      <c-col v-if=" (model.trnmod.swiadd.Amatpertyp=='D')||(model.oldbodgrp.rec.matpertyp==''&&model.swiadd.newmatpertyp=='')||(model.oldbodgrp.rec.matpertyp=='D' &&model.swiadd.newmatpertyp=='')"   :span="1" style="margin-left:-10px">
         <el-form-item label="天"> </el-form-item>
       </c-col>
 
@@ -431,11 +431,7 @@
   </c-row>
 </template>
 <script>
-import Api from "~/service/Api";
-import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable";
-import Event from "~/model/Botame/Event";
-import Utils from "~/utils";
+import event from "../event";
 import Ptap from "~/views/Public/Ptap";
 import Docpre from "~/views/Public/Docpre";
 export default {
@@ -445,7 +441,7 @@ export default {
   },
   inject: ["root"],
   props: ["model", "codes"],
-  mixins: [commonProcess],
+  mixins: [event],
   data() {
     return {
       flag2:false,

src/business/botame/views/Ptyp.vue

@@ -93,10 +93,7 @@
 
 </template>
 <script>
-import Api from "~/service/Api"
-import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Botame/Event"
+import event from "../event";
 import Utils from "~/utils"; 
 import Ptap from "~/views/Public/Ptap";
 
@@ -104,7 +101,7 @@ export default {
     components: { "c-ptap": Ptap },
     inject: ['root'],
     props:["model","codes"],
-    mixins: [commonProcess],
+    mixins: [event],
     data(){
         return {
            newValue: {

src/business/botame/views/index.vue

@@ -70,15 +70,6 @@
 </c-page>
 </template>
 <script>
-// import Api from "~/service/Api"
-// import CodeTable from "~/config/CodeTable"
-// import Botame from "~/model/Botame"
-// import commonProcess from "~/mixin/commonProcess"
-// import commonFuncs from "~/mixin/commonFuncs";
-// import Check from "~/model/Botame/Check"
-// import Default from "~/model/Botame/Default"
-// import Pattern from "~/model/Botame/Pattern"
-
 import CodeTable from "~/config/CodeTable"
 import Botame from "../model"
 import formRules from '../model/check'
@@ -90,13 +81,6 @@ import Inst from "./Inst"
 import Ptyp from "./Ptyp"
 import Instrecp from "./Instrecp"
 
-// import Setpan from "~/components/business/setmod/views"
-// import Glepan from "~/views/Public/Glepan"
-// import Coninfp from "~/views/Public/Coninfp"
-// import Docpan from "~/views/Public/Docpan"
-// import Doctre from "~/views/Public/Doctre"
-// import Engp from "~/views/Public/Engp"
-
 import Setmod from "~/components/business/setmod/views"
 import Docpan from "~/components/business/docpan/views";
 import Engp from "~/components/business/engp/views";

src/business/botcan/event/buildCommons.js

@@ -31,10 +31,11 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'BOD',
+        objinr: model.bodgrp.rec.inr,
         ownref: model.bodgrp.rec.ownref,
         opndat: model.bodgrp.rec.opndat,
         expdat: model.bodgrp.rec.expdat,
-        branchInr: model.bodgrp.rec.branchInr,
+        branchInr: model.bodgrp.rec.branchinr,
         hndtyp: model.bodgrp.rec.hndtyp,
         gartyp: model.bodgrp.rec.gartyp,
         fingua: model.bodgrp.rec.fingua,
@@ -45,6 +46,7 @@ export default {
         purpos: model.bodgrp.rec.purpos,
         revflg: model.bodgrp.rec.revflg,
         cnfsta: model.bodgrp.rec.cnfsta,
+        sndmsg: model.sndmsg,
       },
       cbsMap: {
         MAX: model.bodgrp.cbs.max,

src/business/botcan/model/check.js

@@ -118,10 +118,10 @@ let checkObj = {
     "mtabut.coninf.conexedat":[
         //{type: "date", required: false, message: "输入正确的日期"}
     ],
-    "mtabut.coninf.usr.extkey":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 8,message:"长度不能超过8"}
-    ],
+    // "mtabut.coninf.usr.extkey":[
+    //     {type: "string", required: false, message: "必输项"},
+    //     {max: 8,message:"长度不能超过8"}
+    // ],
 
     "trnmod.trndoc.advnam":[
         {type: "string", required: false, message: "必输项"},
@@ -154,7 +154,7 @@ let checkObj = {
     ],
     "setmod.dspflg"                      :null,
     "botp0.recget.sdamod.dadsnd"                      :null,
-    "mtabut.coninf.conexedat"                      :null,
+    // "mtabut.coninf.conexedat"                      :null,
     "setmod.docamt"                      :null,
 }
 

src/business/botcan/model/index.js

+import Pub from "@/components/business/commonModel";
+import Pts from '~/components/business/commonModel/Pts';
 export default class Botcan {
     constructor() {
         this.data = {
+        botdrrl1blk:"",
+        botcoll1blk:"",
+                    strinf:"",			//  Narrative		.strinf
+                    bodgrp:{
+                        rec:{
+                            inr:"",
+                            matpertyp:"",			//  Days/Months or Years for Maturity Period		.bodgrp.rec.matpertyp
+                            ownref:"",			//  Reference		.bodgrp.rec.ownref
+                            nam:"",			//  Name		.bodgrp.rec.nam
+                            rcvdat:"",			//  Order Date		.bodgrp.rec.rcvdat
+                            predat:"",			//  Presentation Date		.bodgrp.rec.predat
+                            matpercnt:"",			//  Tenor Specification		.bodgrp.rec.matpercnt
+                            matperbeg:"",			//  Start of Maturity Period MATBEG		.bodgrp.rec.matperbeg
+                            doctypcod:"",			//  Collection Condition		.bodgrp.rec.doctypcod
+                            docsta:"",			//  Document Set Status		.bodgrp.rec.docsta
+                            matdat:"",			//  Maturity Date		.bodgrp.rec.matdat
+                            branchinr:"",
+                        },
+                        cbs:{
+                            max:{
+                                cur:"",			//  Document Amount		.bodgrp.cbs.max.cur
+                                amt:"",			//  Document Amount		.bodgrp.cbs.max.amt
+                            },
+                            opn1:{
+                                cur:"",			//  Open Amount		.bodgrp.cbs.opn1.cur
+                                amt:"",			//  Open Amount		.bodgrp.cbs.opn1.amt
+                            },
+                        },
+                        drr:{
+                            pts:new Pts().data,
+                        },
+                        dre:{
+                            pts:new Pts().data,
+                        },
+                        col:{
+                            pts:new Pts().data,
+                        },
+                    },
+                    botp0:{
+                        recget:{
+                            sdamod:{
+                                dadsnd:"",			//  Drag  Drop Sender		.botp0.recget.sdamod.dadsnd
+                                seainf:"",			//  		.botp0.recget.sdamod.seainf
+                            },
+                        },
+                        matp:{
+                            mattxtlab:"",			//  Label for MATTXT		.botp0.matp.mattxtlab
+                        },
+                    },
+                    sndmsg:"",			//  Send Message		.sndmsg
+                    // setmod:{
+                    // 	docamttyplab:"",			//  settled amount description as label		.setmod.docamttyplab
+                    // 	retmsg:"",			//  Label showing Retry overflow condition		.setmod.retmsg
+                    // 	ref:"",			//  our reference		.setmod.ref
+                    // 	doccur:"",			//  document currency		.setmod.doccur
+                    // 	docamt:"",			//  document amount		.setmod.docamt
+                    // 	dspflg:"",			//  Type of settlement		.setmod.dspflg
+                    // 	xreflg:"",			//  Recalculate Rates		.setmod.xreflg
+                    // 	setglg:{
+                    // 		labdspflg:"",			//  Label for Type of Settlement		.setmod.setglg.labdspflg
+                    // 		setgll:[]
+                    // 	},
+                    // 	zmqacclab:"",			//  主�'�号LABEL		.setmod.zmqacclab
+                    // 	zmqacc:"",			//  自�'�区主�'�号		.setmod.zmqacc
+                    // 	setfog:{
+                    // 		setfol:[]
+                    // 	},
+                    // 	setfeg:{
+                    // 		setfel:[]
+                    // 	},
+                    // 	glemod:{
+                    // 		gleshwstm: {}
+                    // 	}
+                    // },
+                    // mtabut:{
+                    // 	coninf:{
+                    // 		oitinf:{
+                    // 			labinftxt:"",			//  Label for INFTXT		.mtabut.coninf.oitinf.labinftxt
+                    // 			oit:{
+                    // 				inftxt:"",			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
+                    // 				inflev:"",			//  Infotext Level		.mtabut.coninf.oitinf.oit.inflev
+                    // 			},
+                    // 		},
+                    // 		oitset:{
+                    // 			labinftxt:"",			//  Label for INFTXT		.mtabut.coninf.oitset.labinftxt
+                    // 			oit:{
+                    // 				inftxt:"",			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
+                    // 				inflev:"",			//  Infotext Level		.mtabut.coninf.oitset.oit.inflev
+                    // 			},
+                    // 		},
+                    // 		conexedat:"",			//  执行日期		.mtabut.coninf.conexedat
+                    // 		usr:{
+                    // 			extkey:"",			//  User ID		.mtabut.coninf.usr.extkey
+                    // 		},
+                    // 	},
+                    // },
+                    // trnmod:{
+                    // 	trndoc:{
+                    // 		advlabel:"",			//  ADVLABEL		.trnmod.trndoc.advlabel
+                    // 		amdnam:"",			//  AMDNAM		.trnmod.trndoc.amdnam
+                    // 		advdoc:"",			//  国内证通知书		.trnmod.trndoc.advdoc
+                    // 		advnam:"",			//  国内证落款		.trnmod.trndoc.advnam
+                    // 		amdapl:"",			//  修改申请人名称		.trnmod.trndoc.amdapl
+                    // 		doclbl:"",			//  Lable for CONDOCSTM		.trnmod.trndoc.doclbl
+                    // 		doctrestm:"",			//  Document tree		.trnmod.trndoc.doctrestm
+                    // 		shwinc:"",			//  Show Incoming Messages		.trnmod.trndoc.shwinc
+                    // 		shwout:"",			//  Show Outgoing Messages		.trnmod.trndoc.shwout
+                    // 		condocstm:"",			//  Connected Documents		.trnmod.trndoc.condocstm
+                    // 		rcvatt:{
+                    // 			seainf:"",			//  		.trnmod.trndoc.rcvatt.seainf
+                    // 		},
+                    // 		filrecv:"",			//  File Receiver		.trnmod.trndoc.filrecv
+                    // 	},
+                    // },
+                    setmod: new Pub().data.Setmod,
+                    mtabut: new Pub().data.Mtabut,
+                    trnmod: new Pub().data.Trnmod,
+                    liaall: new Pub().data.Liaall,
+                    liaccv: new Pub().data.Liaccv,
+                    docpan: new Pub().data.Docpan,
+                    pageId: ""			// ctx的key
             }
         }
+
 }
\ No newline at end of file

src/business/botcan/views/Canp.vue

@@ -87,11 +87,11 @@
               label-width="5px"
               prop="bodgrp.cbs.max.amt"
             >
-              <c-input
+              <c-input-currency
               disabled
                 v-model="model.bodgrp.cbs.max.amt"
                 placeholder="请输入托收金额"
-              ></c-input
+              ></c-input-currency
             ></el-form-item>
           </c-col>
         </c-col>
@@ -121,11 +121,11 @@
               label-width="5px"
               prop="bodgrp.cbs.opn1.amt"
             >
-              <c-input
+              <c-input-currency
               disabled
                 v-model="model.bodgrp.cbs.opn1.amt"
                 placeholder="请输入托收余额"
-              ></c-input>
+              ></c-input-currency>
             </el-form-item>
           </c-col>
         </c-col>

src/business/botcan/views/Ovwp.vue

@@ -8,6 +8,7 @@
     </div>
     </template>
     <script>
+
     import commonProcess from "~/mixin/commonProcess";
     import Event from "~/model/Getcan/Event"
     import canp from "./Canp";

src/business/botcan/views/index.vue

@@ -18,25 +18,21 @@
             </c-content>
           </el-tab-pane>
 
-          <!-- 费用/账务 -->
-          <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
+         <el-tab-pane label="表外记账" name="engp">
             <c-content>
-              <div class="eibs-tab">
-                <el-collapse v-model="activeNames">
-                  <el-collapse-item title="表外记账" name="engp">
               <!-- 表外记账 -->
               <m-engp :model="model" :codes="codes" />
-                  </el-collapse-item>
-                  <el-collapse-item title="结算" name="setpan">
-                    <!-- 结算 -->
-                    <m-setpan :model="model" :codes="codes" />
-                  </el-collapse-item>
-                  <el-collapse-item title="账务" name="glepan">
-                    <!-- 会计分录 -->
-                    <m-glepan :model="model" :codes="codes" />
-                  </el-collapse-item>
-                </el-collapse>
-              </div>
+            </c-content>
+          </el-tab-pane>
+
+          <!--PD000027 -->
+          <el-tab-pane label="费用/账务" name="setmod">
+            <c-content>
+              <m-setmod
+                  :model="model"
+                  :codes="codes"
+                  @changeSetmodModel="changeSetmodModel"
+              />
             </c-content>
           </el-tab-pane>
 
@@ -66,8 +62,9 @@
       <c-grid-ety-prompt-dialog
           ref="etyDialog"
           :promptData="promptData"
-        v-on:select-ety="selectEty"
-      ></c-grid-ety-prompt-dialog>
+          @select-ety="selectGridEtyPromptData"
+      >
+      </c-grid-ety-prompt-dialog>
       <c-function-btn
     :handleSubmit="handleSubmit"
     :handleCheck="handleCheck"
@@ -88,30 +85,26 @@
 import Api from "~/service/Api";
 import Utils from "~/utils/index";
 import CodeTable from "~/config/CodeTable";
-import Botcan from "~/model/Botcan";
-import commonProcess from "~/mixin/commonProcess";
-import commonFuncs from "~/mixin/commonFuncs";
-import Check from "~/model/Botcan/Check";
-import Default from "~/model/Botcan/Default";
-import Pattern from "~/model/Botcan/Pattern";
-
+import Botcan from "../model"
+import formRules from '../model/check'
 import Canp from "./Canp";
+import Doctre from "~/components/business/doctre/views";
+import Setmod from "~/components/business/setmod/views";
+import Docpan from "~/components/business/docpan/views"
+import Coninfp from "~/components/business/coninfp/views";
+import Engp from "~/components/business/engp/views";
+import Glepan from "~/components/business/glentry/views";
+import Ovwp from "./Ovwp"
 
-import Doctre from "~/views/Public/Doctre";
-import Setpan from "~/components/business/setmod/views";
-import Docpan from "~/views/Public/Docpan"
-import Coninfp from "~/views/Public/Coninfp"
-import Engp from "~/views/Public/Engp";
-import Glepan from "~/views/Public/Glepan";
-import Ovwp from "./Ovwp.vue";
 
 import event from "../event";
+import operationFunc from "@/mixin/operationFunc";
 
 export default {
   name: "Botcan",
   components: {
     "m-canp": Canp,
-    "m-setpan": Setpan,
+    "m-setmod": Setmod,
     "m-coninfp": Coninfp,
     "m-docpan": Docpan,
     "m-doctre": Doctre,
@@ -124,16 +117,13 @@ export default {
       root: this,
     };
   },
-  mixins: [commonProcess,commonFuncs,event], // 里面包含了Default、Check等的公共处理
+  mixins: [operationFunc,event], // 里面包含了Default、Check等的公共处理
   data() {
     return {
       tabVal: "ovwp",
       trnName: "botcan",
       model: new Botcan().data,
-      checkRules: Check,
-      defaultRules: Default,
-      pattern: Pattern,
-      rules: null,
+      rules: formRules,
       codes: { ...CodeTable },
       activeNames: ["engp"],
     };