合并冲突

src/components/BusinessButton.vue

@@ -13,6 +13,7 @@ export default {
     data(){
         return{
 
+            
         }
     },
     methods:{
@@ -43,7 +44,7 @@ export default {
 }
 </script>
 <style>
-.bus-button{
-    text-align: center;
+.bus-button {
+  text-align: center;
 }
 </style>
\ No newline at end of file

src/components/IStreamTable.vue

@@ -75,7 +75,6 @@ export default {
 			pageSize: 5
 		};
   },
-  mounted: {},
   methods: {
 		sizeChange(size) {
 			this.pageSize = size;

src/model/Ditopn/Default.js

@@ -3,6 +3,7 @@
 * Ditopn Default规则
 */
 import Api from "~/service/Api";
+import Utils from "~/utils/index"
 export default {
 
     "didgrp.rec.resflg"                      :defaultDidgrpRecResflg,

src/model/Sptsel/Default.js

@@ -3,46 +3,47 @@
 * Sptsel Default规则
 */
 import Api from "~/service/Api";
+import Utils from "~/utils/index"
 export default {
 
-    "sptstm"                      :defaultSptstm,
-    "dlaxq"                      :defaultDlaxq,
-    "usfmod.labtxt"                      :defaultUsfmodLabtxt,
-    "usfmod.flt"                      :defaultUsfmodFlt,
-    "usfmod.shwflt"                      :defaultUsfmodShwflt,
-    "dlmft"                      :defaultDlmft,
-    "butimg"                      :defaultButimg,
-    "dflg"                      :defaultDflg,
-    "yptinf"                      :defaultYptinf,
-    "usfmod.usr.extkey"                      :defaultUsfmodUsrExtkey,
-}
-function defaultSptstm()
-{
+    "sptstm": defaultSptstm,
+    "dlaxq": defaultDlaxq,
+    "usfmod.labtxt": defaultUsfmodLabtxt,
+    "usfmod.flt": defaultUsfmodFlt,
+    "usfmod.shwflt": defaultUsfmodShwflt,
+    "dlmft": defaultDlmft,
+    "butimg": defaultButimg,
+    "dflg": defaultDflg,
+    "yptinf": defaultYptinf,
+    "usfmod.usr.extkey": defaultUsfmodUsrExtkey,
+}
+function defaultSptstm() {
+
 }
-function defaultDlaxq()
-{
+function defaultDlaxq() {
 }
-function defaultUsfmodLabtxt()
-{
+function defaultUsfmodLabtxt() {
 }
-function defaultUsfmodFlt()
-{
+function defaultUsfmodFlt() {
 }
-function defaultUsfmodShwflt()
-{
+function defaultUsfmodShwflt() {
 }
-function defaultDlmft()
-{
+function defaultDlmft() {
 }
-function defaultButimg()
-{
+function defaultButimg() {
 }
-function defaultDflg()
-{
+async function defaultDflg() {
+    let rtnmsg = await Api.post("sptsel/default/dflg", Utils.flatObject(this.model))
+    if (rtnmsg.retcod == "AAAAAA") {
+        //TODO 处理数据逻辑
+        this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
+    }
+    else {
+        this.$notify.error({ title: '错误', message: '服务请求失败！' });
+    }
 }
-function defaultYptinf()
-{
+function defaultYptinf() {
+    console.log(this.model.yptinf)
 }
-function defaultUsfmodUsrExtkey()
-{
+function defaultUsfmodUsrExtkey() {
 }

src/model/Sptsel/Event.js

 import Api from "~/service/Api"
+import Utils from "~/utils/index"
 export default {
-    onUsfmodShwflt() {
-        this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
-            if (!valid)
-                return;
-            let rtnmsg = await Api.post("sptsel/usfmod_shwflt", { data: this.model })
-            if (rtnmsg.retcod == SUCCESS) {
-                //TODO 处理数据逻辑
+                onUsfmodShwflt(){
+                this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
+                    if(!valid)
+                        return;
+                    let rtnmsg = await Api.post("sptsel/usfmod_shwflt",Utils.flatObject(this.model))
+                    if(rtnmsg.respCode == "AAAAAA")
+                    {
+                        //TODO 处理数据逻辑
 
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
-        })
-    },
-    onButypt() {
-        this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
-            if (!valid)
-                return;
-            let rtnmsg = await Api.post("sptsel/butypt", { data: this.model })
-            if (rtnmsg.retcod == SUCCESS) {
-                //TODO 处理数据逻辑
+                    }
+                    else
+                    {
+                       this.$notify.error({title: '错误',message: '服务请求失败！'});
+                    }
+                })
+            },
+        onButypt(){
+                this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
+                    if(!valid)
+                        return;
+                    let rtnmsg = await Api.post("sptsel/butypt",Utils.flatObject(this.model))
+                    if(rtnmsg.respCode == "AAAAAA")
+                    {
+                        //TODO 处理数据逻辑
 
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
-        })
-    },
-    onDlmft() {
-        this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
-            if (!valid)
-                return;
-            let rtnmsg = await Api.post("sptsel/dlmft", { data: this.model })
-            if (rtnmsg.retcod == SUCCESS) {
-                //TODO 处理数据逻辑
+                    }
+                    else
+                    {
+                       this.$notify.error({title: '错误',message: '服务请求失败！'});
+                    }
+                })
+            },
+        onDlmft(){
+                this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
+                    if(!valid)
+                        return;
+                    let rtnmsg = await Api.post("sptsel/dlmft",Utils.flatObject(this.model))
+                    if(rtnmsg.respCode == "AAAAAA")
+                    {
+                        //TODO 处理数据逻辑
 
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
-        })
-    },
-    onDlaxq() {
-        this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
-            if (!valid)
-                return;
-            let rtnmsg = await Api.post("sptsel/dlaxq", { data: this.model })
-            if (rtnmsg.retcod == SUCCESS) {
-                //TODO 处理数据逻辑
+                    }
+                    else
+                    {
+                       this.$notify.error({title: '错误',message: '服务请求失败！'});
+                    }
+                })
+            },
+        onDlaxq(){
+                this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
+                    if(!valid)
+                        return;
+                    let rtnmsg = await Api.post("sptsel/dlaxq",Utils.flatObject(this.model))
+                    if(rtnmsg.respCode == "AAAAAA")
+                    {
+                        //TODO 处理数据逻辑
 
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
-        })
-    },
-    onButimg() {
-        this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
-            if (!valid)
-                return;
-            let rtnmsg = await Api.post("sptsel/butimg", { data: this.model })
-            if (rtnmsg.retcod == SUCCESS) {
-                //TODO 处理数据逻辑
+                    }
+                    else
+                    {
+                       this.$notify.error({title: '错误',message: '服务请求失败！'});
+                    }
+                })
+            },
+        onButimg(){
+                this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
+                    if(!valid)
+                        return;
+                    let rtnmsg = await Api.post("sptsel/butimg",Utils.flatObject(this.model))
+                    if(rtnmsg.respCode == "AAAAAA")
+                    {
+                        //TODO 处理数据逻辑
 
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
-        })
-    },
-    tabClick() {
-
-    },
+                    }
+                    else
+                    {
+                       this.$notify.error({title: '错误',message: '服务请求失败！'});
+                    }
+                })
+            },
 
 }
\ No newline at end of file

src/model/Trnrel/Default.js

@@ -3,122 +3,102 @@
 * Trnrel Default规则
 */
 import Api from "~/service/Api";
+import Utils from "~/utils/index";
 export default {
 
-    "relcor"                      :defaultRelcor,
-    "recpan.butspt"                      :defaultRecpanButspt,
-    "recpan.ackstm"                      :defaultRecpanAckstm,
-    "seaown"                      :defaultSeaown,
-    "trn.inftxt"                      :defaultTrnInftxt,
-    "numtrn"                      :defaultNumtrn,
-    "recpan.butord"                      :defaultRecpanButord,
-    "recpan.inftxt.buttxmsel"                      :defaultRecpanInftxtButtxmsel,
-    "trn.infdsp"                      :defaultTrnInfdsp,
-    "recpan.incben"                      :defaultRecpanIncben,
-    "usrcon"                      :defaultUsrcon,
-    "imgmod.hisimg"                      :defaultImgmodHisimg,
-    "recpan.con"                      :defaultRecpanCon,
-    "seajbh"                      :defaultSeajbh,
-    "recpan.det"                      :defaultRecpanDet,
-    "trncorco.trnstm"                      :defaultTrncorcoTrnstm,
-    "imgmod.newhisimg"                      :defaultImgmodNewhisimg,
-    "recpan.cpltxt"                      :defaultRecpanCpltxt,
-    "trncorco.dflg"                      :defaultTrncorcoDflg,
-    "orddsp"                      :defaultOrddsp,
-    "recpan.usr.extkey"                      :defaultRecpanUsrExtkey,
-    "atptxt"                      :defaultAtptxt,
-    "recpan.ackgrp.rec.sndref"                      :defaultRecpanAckgrpRecSndref,
-    "syswrn.butshw"                      :defaultSyswrnButshw,
-    "imgmod.newimg"                      :defaultImgmodNewimg,
-    "recpan.inc"                      :defaultRecpanInc,
-    "printe"                      :defaultPrinte,
-    "trn.inr"                      :defaultTrnInr,
-    "imgmod.image"                      :defaultImgmodImage,
+    "relcor": defaultRelcor,
+    "recpan.butspt": defaultRecpanButspt,
+    "recpan.ackstm": defaultRecpanAckstm,
+    "seaown": defaultSeaown,
+    "trn.inftxt": defaultTrnInftxt,
+    "numtrn": defaultNumtrn,
+    "recpan.butord": defaultRecpanButord,
+    "recpan.inftxt.buttxmsel": defaultRecpanInftxtButtxmsel,
+    "trn.infdsp": defaultTrnInfdsp,
+    "recpan.incben": defaultRecpanIncben,
+    "usrcon": defaultUsrcon,
+    "imgmod.hisimg": defaultImgmodHisimg,
+    "recpan.con": defaultRecpanCon,
+    "seajbh": defaultSeajbh,
+    "recpan.det": defaultRecpanDet,
+    "trncorco.trnstm": defaultTrncorcoTrnstm,
+    "imgmod.newhisimg": defaultImgmodNewhisimg,
+    "recpan.cpltxt": defaultRecpanCpltxt,
+    "trncorco.dflg": defaultTrncorcoDflg,
+    "orddsp": defaultOrddsp,
+    "recpan.usr.extkey": defaultRecpanUsrExtkey,
+    "atptxt": defaultAtptxt,
+    "recpan.ackgrp.rec.sndref": defaultRecpanAckgrpRecSndref,
+    "syswrn.butshw": defaultSyswrnButshw,
+    "imgmod.newimg": defaultImgmodNewimg,
+    "recpan.inc": defaultRecpanInc,
+    "printe": defaultPrinte,
+    "trn.inr": defaultTrnInr,
+    "imgmod.image": defaultImgmodImage,
 }
-function defaultRelcor()
-{
+function defaultRelcor() {
 }
-function defaultRecpanButspt()
-{
+function defaultRecpanButspt() {
 }
-function defaultRecpanAckstm()
-{
+function defaultRecpanAckstm() {
 }
-function defaultSeaown()
-{
+function defaultSeaown() {
 }
-function defaultTrnInftxt()
-{
+function defaultTrnInftxt() {
 }
-function defaultNumtrn()
-{
+function defaultNumtrn() {
 }
-function defaultRecpanButord()
-{
+function defaultRecpanButord() {
 }
-function defaultRecpanInftxtButtxmsel()
-{
+function defaultRecpanInftxtButtxmsel() {
 }
-function defaultTrnInfdsp()
-{
+function defaultTrnInfdsp() {
 }
-function defaultRecpanIncben()
-{
+function defaultRecpanIncben() {
 }
-function defaultUsrcon()
-{
+function defaultUsrcon() {
 }
-function defaultImgmodHisimg()
-{
+function defaultImgmodHisimg() {
 }
-function defaultRecpanCon()
-{
+function defaultRecpanCon() {
 }
-function defaultSeajbh()
-{
+function defaultSeajbh() {
 }
-function defaultRecpanDet()
-{
+function defaultRecpanDet() {
 }
-function defaultTrncorcoTrnstm()
-{
+function defaultTrncorcoTrnstm() {
 }
-function defaultImgmodNewhisimg()
-{
+function defaultImgmodNewhisimg() {
 }
-function defaultRecpanCpltxt()
-{
+function defaultRecpanCpltxt() {
 }
-function defaultTrncorcoDflg()
-{
+async function defaultTrncorcoDflg() {
+    let rtnmsg = await Api.post("trnrel/default/trncorco.dflg", Utils.flatObject(this.model))
+    if (rtnmsg.respCode == "AAAAAA") {
+        //TODO 处理数据逻辑
+        this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
+    }
+    else {
+        this.$notify.error({ title: '错误', message: '服务请求失败！' });
+    }
 }
-function defaultOrddsp()
-{
+function defaultOrddsp() {
 }
-function defaultRecpanUsrExtkey()
-{
+function defaultRecpanUsrExtkey() {
 }
-function defaultAtptxt()
-{
+function defaultAtptxt() {
 }
-function defaultRecpanAckgrpRecSndref()
-{
+function defaultRecpanAckgrpRecSndref() {
 }
-function defaultSyswrnButshw()
-{
+function defaultSyswrnButshw() {
 }
-function defaultImgmodNewimg()
-{
+function defaultImgmodNewimg() {
 }
-function defaultRecpanInc()
-{
+function defaultRecpanInc() {
 }
-function defaultPrinte()
-{
+function defaultPrinte() {
 }
-function defaultTrnInr()
-{
+function defaultTrnInr() {
 }
-function defaultImgmodImage()
-{
+function defaultImgmodImage() {
 }

src/service/Api.js

@@ -82,7 +82,7 @@ export default class Api
                 if(data && data[CODE_KEY] == 'L0003'){		
                     window.sessionStorage.removeItem("token")
                     window.sessionStorage.removeItem("userId")				
-					MessageBox.alert({
+					          MessageBox.alert({
                             title:'会话超时',
                             message:'即将退出，请重新登录',
                             showClose:false,

src/utils/index.js

-export default class Utils{
-    static toDepthObject(obj)
-    {
+export default class Utils {
+    static toDepthObject(obj) {
         var target = {};
-        for(var key in obj)
-        {
+        for (var key in obj) {
             var keyArr = key.split("_"); //以下划线或分割
             var tempobj = target;
-            for(var i=0;i<keyArr.length - 1;i++)
-            {
-                if(tempobj[keyArr[i]])
+            for (var i = 0; i < keyArr.length - 1; i++) {
+                if (tempobj[keyArr[i]])
                     tempobj = tempobj[keyArr[i]];
-                else
-                {
+                else {
                     tempobj[keyArr[i]] = {};
                     tempobj = tempobj[keyArr[i]];
-                }	
+                }
             }
             //给叶子元素赋值
-            tempobj[keyArr[keyArr.length - 1]]=obj[key];
+            tempobj[keyArr[keyArr.length - 1]] = obj[key];
         }
         return target;
     }
-    static flatObject(obj,target,pkey)
-	{
-		target = target||{};
-		for(var key in obj)
-		{
-			var nkey = pkey?pkey+"_"+key:key;
-			if(!obj[key])
-				target[nkey] = obj[key];
-			else if(obj[key] instanceof Array)
+    static flatObject(obj, target, pkey) {
+        target = target || {};
+        for (var key in obj) {
+            var nkey = pkey ? pkey + "_" + key : key;
+            if (!obj[key])
                 target[nkey] = obj[key];
-            else if(obj[key] instanceof Date)
+            else if (obj[key] instanceof Array)
                 target[nkey] = obj[key];
-			else if(typeof obj[key] == "object")
-                Utils.flatObject(obj[key],target,nkey); //递归赋值
-			else
-				target[nkey] = obj[key];
-		}
-		return target;
+            else if (obj[key] instanceof Date)
+                target[nkey] = obj[key];
+            else if (typeof obj[key] == "object")
+                Utils.flatObject(obj[key], target, nkey); //递归赋值
+            else
+                target[nkey] = obj[key];
+        }
+        return target;
     }
-    static copyValueFromVO(model,vo)
-    {
+    static copyValueFromVO(model, vo) {
         var target = model;
-        for(var key in vo)
-        {
+        for (var key in vo) {
             var keyArr = key.split("_"); //以下划线或分割
             var tempobj = target;
-            for(var i=0;i<keyArr.length - 1;i++)
-            {
-                if(tempobj[keyArr[i]])
+            for (var i = 0; i < keyArr.length - 1; i++) {
+                if (tempobj[keyArr[i]])
                     tempobj = tempobj[keyArr[i]];
-                else
-                {
+                else {
                     tempobj = null;
                     break;
-                } 
+                }
             }
             //给叶子元素赋值
-            if(tempobj )
-            {
+            if (tempobj) {
                 let leafProp = keyArr[keyArr.length - 1];
-                if(tempobj.hasOwnProperty(leafProp))
-                    tempobj[leafProp]=vo[key];
+                if (tempobj.hasOwnProperty(leafProp))
+                    tempobj[leafProp] = vo[key];
             }
         }
         return target;

src/views/Business/Ditopn/Addbcb.vue

@@ -4,7 +4,7 @@
 
        <el-col :span="24">
         <el-form-item label="货物/服务名称">
-            <c-input  v-model="model.godnam" maxlength="40" style="width:40%"  placeholder="货物服务名称"></c-input>
+            <c-input  v-model="model.godnam" maxlength="40" style="width:80%"  placeholder="货物服务名称"></c-input>
         </el-form-item>
        </el-col>         
 
@@ -12,7 +12,7 @@
                                    
        <el-col :span="24">
         <el-form-item label="特殊规定">
-            <c-select v-model="model.litameadv" style="width:40%" placeholder="请选择特殊规定">
+            <c-select v-model="model.litameadv" style="width:80%" placeholder="请选择特殊规定">
               </c-select>
         </el-form-item>
        </el-col>
@@ -21,7 +21,7 @@
                   
        <el-col :span="24">
         <el-form-item label="">
-            <c-input type="textarea" v-model="model.ameadvrmk" maxlength="34" style="width:40%" show-word-limit placeholder="请输入特殊规定条件" ></c-input>
+            <c-input type="textarea" v-model="model.ameadvrmk" maxlength="34" style="width:80%" show-word-limit placeholder="请输入特殊规定条件" ></c-input>
         </el-form-item>
         </el-col>
 
@@ -29,7 +29,7 @@
                                    
        <el-col :span="24">
         <el-form-item label="开证行">
-            <c-input  v-model="model.bchname" maxlength="40" style="width:40%" placeholder="请输入branch  name"></c-input>
+            <c-input  v-model="model.bchname" maxlength="40" style="width:80%" placeholder="请输入branch  name"></c-input>
         </el-form-item>
        </el-col>             
   </div>

src/views/Business/Ditopn/Limitbody.vue

@@ -34,15 +34,21 @@
         </el-col>
         -->
 
-        <el-col :span="12">
+        <el-col :span="10">
             <el-form-item label="开证授信额度主体编号">
-                <c-input style="width:70%;margin-right:20px"  v-model="model.liaall.limmod.limpts.wrk.pts.extkey" maxlength="16"  placeholder="请输入External Key of Address"></c-input>
+                <c-input v-model="model.liaall.limmod.limpts.wrk.pts.extkey" maxlength="16"  placeholder="请输入External Key of Address"></c-input>
+            </el-form-item>
+        </el-col>
+
+        <el-col :span="2">
+            <el-form-item label="" label-width="20px">
                 <c-button size="small" type="primary" icon="el-icon-search" @click="onPreperButtxmsel">
                     Details
                 </c-button>
             </el-form-item>
         </el-col>
 
+
         <el-col :span="12">
             <el-form-item label="开证授信额度主体名称">
                 <c-input  v-model="model.liaall.limmod.limpts.wrk.pts.nam" maxlength="40"  placeholder="请输入Name of Party"></c-input>
@@ -143,58 +149,56 @@
             </el-form-item>
         </el-col>
 
-        <el-row>
-            <el-col :span="24">
-                <c-table style="text-align:center">
-                    <el-table-column
-                            label="可否串用"
-                            width=60
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            label="序号"
-                            width=60
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            label="额度类型"
-                            width=50
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            label="入账机构"
-                            width=70
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            label="额度编号"
-                            width=100
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            label="额度明细编号"
-                            width=100
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            label="额度品种代码"
-                            width=30
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            label="品种代码描述"
-                            width=100
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            label=""
-                            width=50
-                    >
-                    </el-table-column>
-
-                </c-table>
-            </el-col>
-        </el-row>
+        <el-col :span="24">
+            <c-table style="text-align:center" :data="tableData">
+                <el-table-column
+                        label="可否串用"
+                        width="60"
+                >
+                </el-table-column> -->
+                <el-table-column
+                        label="序号"
+                        width="60"
+                >
+                </el-table-column>
+                <el-table-column
+                        label="额度类型"
+                        width="50"
+                >
+                </el-table-column>
+                <el-table-column
+                        label="入账机构"
+                        width="70"
+                >
+                </el-table-column>
+                <el-table-column
+                        label="额度编号"
+                        width="100"
+                >
+                </el-table-column>
+                <el-table-column
+                        label="额度明细编号"
+                        width="100"
+                >
+                </el-table-column>
+                <el-table-column
+                        label="额度品种代码"
+                        width="30"
+                >
+                </el-table-column>
+                <el-table-column
+                        label="品种代码描述"
+                        width="100"
+                >
+                </el-table-column>
+                <el-table-column
+                        label=""
+                        width="50"
+                >
+                </el-table-column>
+
+            </c-table>
+        </el-col>
     </div>
 </template>
 <script>
@@ -206,7 +210,9 @@
         props:["model","codes"],
         data(){
             return {
+                tableData:{
 
+                }
             }
         },
         methods:{...Event},

src/views/Business/Ditopn/Ovwp.vue

@@ -12,10 +12,12 @@
         </el-form-item>
        </el-col>
        <el-col :span="4">
-            <c-button size="small" type="primary;width:10%"  @click="onSeainf">i</c-button>
-            <c-button size="small" type="primary"  @click="onDitpButgetref">
-            获取
-            </c-button>
+           <el-form-item label="" label-width="15px">
+                <c-button size="small" type="primary;width:10%"  @click="onSeainf">i</c-button>
+                <c-button size="small" type="primary"  @click="onDitpButgetref">
+                获取
+                </c-button>
+           </el-form-item>
         </el-col>                     
 
        <!--           
@@ -34,13 +36,15 @@
        </el-col>  
 
         <el-col :span="8">
-        <el-form-item label="所属客户经理">
-            <c-input  v-model="model.ditp.usr.extkey" maxlength="8"  placeholder="请输入User ID"></c-input>
-        </el-form-item>
+            <el-form-item label="所属客户经理">
+                <c-input  v-model="model.ditp.usr.extkey" maxlength="8"  placeholder="请输入User ID"></c-input>
+            </el-form-item>
         </el-col>
-        <el-col :span="4" style="text-align:center">
-        <c-checkbox v-model="model.didgrp.rec.resflg">Reserved Contract</c-checkbox>
-       </el-col>               
+        <el-col :span="4">
+            <el-form-item label="" label-width="15px">
+                <c-checkbox v-model="model.didgrp.rec.resflg">Reserved Contract</c-checkbox>
+            </el-form-item>
+        </el-col>               
                                    
        <el-col :span="12">
         <el-form-item label="申请人           参考号">
@@ -48,17 +52,17 @@
         </el-form-item>
        </el-col>             
                   
-            <el-col :span="4">
-                <el-form-item label="信用证金额">
-                    <c-select v-model="model.didgrp.cbs.nom1.cur" style="width:100%" placeholder="请选择Currency">
-                    </c-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                 <el-form-item style="text-align:left">
-                    <c-input  v-model="model.didgrp.cbs.nom1.amt" style="text-align:left;width:100%" placeholder="请输入信用证金额"></c-input>
-                </el-form-item>
-            </el-col>
+        <el-col :span="6">
+            <el-form-item label="信用证金额">
+                <c-select v-model="model.didgrp.cbs.nom1.cur" style="width:100%" placeholder="请选择Currency">
+                </c-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="6" >
+            <el-form-item style="text-align:left" label-width="20px">
+                <c-input  v-model="model.didgrp.cbs.nom1.amt" style="text-align:left;width:100%" placeholder="请输入信用证金额"></c-input>
+            </el-form-item>
+        </el-col>
       
         <!--                           
        <el-col :span="12">
@@ -80,10 +84,12 @@
         </el-form-item>
        </el-col>
        <el-col :span="4">
-            <c-button size="small" type="primary;width:10%"  @click="onSeainf">i</c-button>
-            <c-button size="small" type="primary"  @click="onAplpDet">
-            Details
-            </c-button>
+           <el-form-item label="" label-width="15px">
+                <c-button size="small" type="primary;width:10%"  @click="onSeainf">i</c-button>
+                <c-button size="small" type="primary"  @click="onAplpDet">
+                Details
+                </c-button>
+           </el-form-item>
         </el-col>                 
 
        <!--           
@@ -126,7 +132,7 @@
        </el-col>             
                   
        <el-col :span="6" style="text-align:left" >
-        <el-form-item label="-" style="text-align:left">
+        <el-form-item label="-" style="text-align:left;margin-left: 12px;" label-width="20px">
             <c-input  v-model="model.didgrp.rec.nomton" maxlength="6"  placeholder="请输入Amount Tolerance - Negative"></c-input>
         </el-form-item>
        </el-col>  
@@ -142,13 +148,13 @@
         </el-form-item>
        </el-col>    
                                    
-       <el-col :span="5">
+       <el-col :span="7">
         <el-form-item label="邮编">
             <c-input  v-model="model.didgrp.apl.pts.youzbm" maxlength="6"  placeholder="请输入邮编"></c-input>
         </el-form-item>
        </el-col>                   
-       <el-col :span="7">
-        <el-form-item label="电话">
+       <el-col :span="5">
+        <el-form-item label="电话" label-width="40px" style="margin-left: 12px;">
             <c-input  v-model="model.didgrp.apl.pts.dihdig" maxlength="16"  placeholder="请输入电话"></c-input>
         </el-form-item>
        </el-col> 
@@ -165,15 +171,15 @@
         </el-form-item>
        </el-col>
                                    
-       <el-col :span="4">
+       <el-col :span="7">
         <el-form-item label="信用证最大金额">
             <c-select v-model="model.didgrp.cbs.max.cur" style="width:100%" placeholder="请选择Currency">
               </c-select>
         </el-form-item>
        </el-col>
                   
-       <el-col :span="8">
-        <el-form-item label="">
+       <el-col :span="5">
+        <el-form-item label="" label-width="20px">
             <c-input  v-model="model.didgrp.cbs.max.amt"  placeholder="请输入信用证最大金额"></c-input>
         </el-form-item>
        </el-col>                 
@@ -225,10 +231,12 @@
         </el-form-item>
        </el-col>
        <el-col :span="4">
+           <el-form-item label="" label-width="12px">
             <c-button size="small" type="primary;width:10%"  @click="onSeainf">i</c-button>
             <c-button size="small" type="primary"  @click="onBenpDet">
             Details
             </c-button>
+           </el-form-item>
         </el-col>             
                                   
        <el-col :span="12">
@@ -296,13 +304,13 @@
         </el-form-item>
        </el-col>
 
-        <el-col :span="6">
+        <el-col :span="7">
         <el-form-item label="邮编">
             <c-input  v-model="model.didgrp.ben.pts.youzbm" maxlength="6"  placeholder="请输入邮编  电证用"></c-input>
         </el-form-item>
        </el-col>                          
-       <el-col :span="6">
-        <el-form-item label="电话">
+       <el-col :span="5">
+        <el-form-item label="电话" label-width="40px" style="margin-left: 12px;">
             <c-input  v-model="model.didgrp.ben.pts.dihdig" maxlength="16"  placeholder="请输入邮编"></c-input>
         </el-form-item>
        </el-col>   

src/views/Business/Sptsel/index.vue

@@ -43,7 +43,7 @@ export default {
     methods:{...Event},
     mounted:async function(){
         console.log("进入sptsel交易");
-        let rtnmsg = await Api.post(this,"init",{params:{}})
+        let rtnmsg = await Api.post("sptsel/init",{params:{}})
         if(rtnmsg.respCode == SUCCESS)
         {
            //TODO 处理数据逻辑

src/views/Business/Trnrel/index.vue

 <template>
-  <div class="eContainer">
-    <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small">
-       <el-tabs ref="elment" type="border-card" @tab-click="tabClick"> 
-            <el-tab-pane label="复核夹查询">
-                <m-inftrnps :model="model" :codes="codes" />
-            </el-tab-pane>
-       </el-tabs>
- 
-      
-    </el-form>
-  </div>
+    <div class="eContainer">
+        <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small">
+            <el-tabs ref="elment" type="border-card" @tab-click="tabClick">
+                <el-tab-pane label="复核夹查询">
+                    <m-inftrnps :model="model" :codes="codes" ref="inftrnps" />
+                </el-tab-pane>
+            </el-tabs>
+
+        </el-form>
+    </div>
 </template>
 <script>
 import Api from "~/service/Api"
@@ -31,6 +30,7 @@ import Prtswtp from "./Prtswtp"
 import Xmldoc from "./Xmldoc"
 import Prtswtrp from "./Prtswtrp"
 import Prtp from "./Prtp"
+import Utils from "~/utils/index"
 
 // import * as poinMessage from '@/util/poin-common/messageManage.js'
 import { TabPane,Col,Table,Form,FormItem,Upload,TableColumn,Card,Input,Button,Dialog,Select,Tabs,Option,DatePicker,Row} from 'element-ui'
@@ -55,7 +55,7 @@ export default {
             codes: {
             },
             declareParams:{"fileName":"trnrel.json","basePath":"{{basePath}}","method":"post","scheme":"{{schemes}}","host":"{{host}}","consume":"0","produce":"0","uri":"/trnrel/init"},
-           
+            
         }
     },
     methods:{
@@ -67,14 +67,12 @@ export default {
         console.log("进入trnrel交易");
         
 
-        let rtnmsg = await Api.post(this,"init",{params:{}})
-        if(rtnmsg.respCode == SUCCESS)
+        let rtnmsg = await Api.post("trnrel/init", Utils.flatObject(this.model))
+        if(rtnmsg.respCode == "AAAAAA")
         {
-           //TODO 处理数据逻辑
-            this.model.trncorco.trnstm=rtnmsg.data.trncorco_trnstm.rows
-            this.model.trncorco.inidatfro = rtnmsg.data.trncorco_inidatfro
-             this.model.trncorco.inidattil = rtnmsg.data.trncorco_inidattil
-             this.model.trncorco.relflg = rtnmsg.data.trncorco_relflg
+            //TODO 处理数据逻辑
+            Utils.copyValueFromVO(this.model, rtnmsg.data);
+            this.$refs.inftrnps.stmData.columns=rtnmsg.data.trncorco_trnstm.rows
         }
         else
         {
@@ -84,5 +82,4 @@ export default {
 }
 </script>
 <style>
-
 </style>

webpack.config.js

@@ -17,27 +17,27 @@ module.exports = (options = {}) => ({
   },
   module: {
     rules: [{
-        test: /\.vue$/,
-        use: ['vue-loader']
-      },
-      {
-        test: /\.js$/,
-        use: ['babel-loader'],
-        exclude: /node_modules/
-      },
-      {
-        test: /\.css$/,
-        use: ['style-loader', 'css-loader', 'postcss-loader']
-      },
-      {
-        test: /\.(png|jpg|jpeg|gif|eot|ttf|woff|woff2|svg|svgz)(\?.+)?$/,
-        use: [{
-          loader: 'url-loader',
-          options: {
-            limit: 10000
-          }
-        }]
-      }
+      test: /\.vue$/,
+      use: ['vue-loader']
+    },
+    {
+      test: /\.js$/,
+      use: ['babel-loader'],
+      exclude: /node_modules/
+    },
+    {
+      test: /\.css$/,
+      use: ['style-loader', 'css-loader', 'postcss-loader']
+    },
+    {
+      test: /\.(png|jpg|jpeg|gif|eot|ttf|woff|woff2|svg|svgz)(\?.+)?$/,
+      use: [{
+        loader: 'url-loader',
+        options: {
+          limit: 10000
+        }
+      }]
+    }
     ]
   },
   plugins: [