Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

package-lock.json

@@ -3804,6 +3804,11 @@
       "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
       "dev": true
     },
+    "js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.nlark.com/js-cookie/download/js-cookie-3.0.1.tgz",
+      "integrity": "sha1-njm0xsL1ZWNwjX0x9vXyGHOpJBQ="
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -7250,6 +7255,11 @@
       "integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=",
       "dev": true
     },
+    "vue-i18n": {
+      "version": "8.26.7",
+      "resolved": "https://registry.npmmirror.com/vue-i18n/download/vue-i18n-8.26.7.tgz",
+      "integrity": "sha1-rf1INzRJ/jFDjEjjs71DBE3DpoE="
+    },
     "vue-loader": {
       "version": "13.7.3",
       "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-13.7.3.tgz",

package.json

@@ -15,8 +15,10 @@
     "echarts": "^5.2.2",
     "element-ui": "^2.13.2",
     "es6-promise": "^4.2.8",
+    "js-cookie": "^3.0.1",
     "lodash": "^4.17.21",
     "vue": "^2.6.11",
+    "vue-i18n": "^8.26.7",
     "vue-router": "^3.2.0",
     "vuex": "^3.4.0"
   },

src/components/FunctionBtn.vue

@@ -125,8 +125,8 @@ export default {
   flex-wrap: nowrap;
   justify-content: space-between;
   align-items: flex-start;
-  height: 28px;
-  /* margin-bottom: 5px; */
+  height: 29px;
+  /* margin-bottom: 1px; */
 }
 .m-funcBtn-eContainer {
   order: 1;

src/components/Select.vue

@@ -2,7 +2,7 @@
   <el-select
     :id="id"
     v-model="model"
-    v-bind="attrs"
+    v-bind="$attrs"
     v-on="$listeners"
     v-bind:disabled="isDisable"
     :clearable="clearable"

src/components/c-page.vue

@@ -4,7 +4,7 @@
       <i class="el-icon-location" style="color: #409eff;"></i>
       <span>{{ title }}</span>
     </div> -->
-    <div style="flex: 1; padding: 3px 10px; position: relative">
+    <div style="flex: 1; padding: 5px 15px; position: relative">
       <slot></slot>
     </div>
   </div>

src/lang/index.js

+import Vue from "vue";
+import VueI18n from "vue-i18n";
+import Cookies from "js-cookie";
+import elementEnLocale from "element-ui/lib/locale/lang/en"; // element-ui lang
+import elementZhLocale from "element-ui/lib/locale/lang/zh-CN"; // element-ui lang
+import enLocale from "./local/en/";
+import zhLocale from "./local/zh/";
+
+/**
+ * 详细文档
+ * https://kazupon.github.io/vue-i18n/zh/guide/formatting.html#%E5%85%B7%E5%90%8D%E6%A0%BC%E5%BC%8F
+ */
+Vue.use(VueI18n);
+
+const messages = {
+  en: {
+    ...enLocale,
+    ...elementEnLocale,
+  },
+  zh: {
+    ...zhLocale,
+    ...elementZhLocale,
+  },
+};
+export function getLanguage() {
+  const chooseLanguage = Cookies.get("language");
+  if (chooseLanguage) return chooseLanguage;
+
+  // if has not choose language
+  const language = (
+    navigator.language || navigator.browserLanguage
+  ).toLowerCase();
+  const locales = Object.keys(messages);
+  for (const locale of locales) {
+    if (language.indexOf(locale) > -1) {
+      return locale;
+    }
+  }
+  return "en";
+}
+const i18n = new VueI18n({
+  // set locale
+  // options: en | zh | es
+  locale: getLanguage(),
+  // set locale messages
+  messages,
+});
+
+export default i18n;

src/lang/local/en/index.js

+export default {
+  tagsView: {
+    refresh: "Refresh",
+    close: "Close",
+    closeOthers: "Close Others",
+    closeAll: "Close All",
+  },
+};

src/lang/local/zh/codeTable.js

+/**
+ * 码表值
+ */
+export default {
+    
+}
\ No newline at end of file

src/lang/local/zh/common.js

+/**
+ * 页面中的公共部分（顶部、左侧菜单栏、页签等）
+ */
+export default {
+  tagsView: {
+    refresh: "刷新",
+    close: "关闭",
+    closeOthers: "关闭其它",
+    closeAll: "关闭所有",
+  },
+	login: {
+
+	},
+	sideMenu: {
+
+	},
+	home: {
+		
+	}
+};

src/lang/local/zh/index.js

+import codeTable from "./codeTable";
+import common from "./common";
+import tx from "./tx";
+
+export default {
+  ...common,
+  codeTable,
+  tx,
+};

src/lang/local/zh/tx/index.js

+const modulesFiles = require.context('./', true, /\.js$/)
+const modules = modulesFiles.keys().reduce((modules, modulePath) => {
+  const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, '$1')
+  const value = modulesFiles(modulePath)
+  modules[moduleName] = value.default
+  return modules
+}, {})
+
+/**
+ * 交易模块
+ */
+export default {
+	...modules
+}
\ No newline at end of file

src/lang/local/zh/tx/modules/ditopn.js

+export default {
+    
+}
\ No newline at end of file

src/lang/local/zh/tx/public/index.js

+/**
+ * 交易中的公共模块
+ */
+export default {
+
+}
\ No newline at end of file

src/main.js

-import Vue from 'vue'
+import Vue from "vue";
 
+import ElementUI from "element-ui";
 
-import ElementUI from 'element-ui'
+import "element-ui/lib/theme-chalk/index.css";
+import "es6-promise/auto";
 
-import 'element-ui/lib/theme-chalk/index.css'
-import 'es6-promise/auto'
+import App from "./App.vue";
+import RootRouter from "./routers";
+import store from "./store";
 
-import App from './App.vue'
-import RootRouter from './routers'
-import store from "./store"
+import "~/assets/css/common.css";
 
-import '~/assets/css/common.css'
+import i18n from "./lang";
+import CustomComponent from "./components";
+import VueFunc from "./utils/vuefunc";
+import "./permission";
 
-import CustomComponent from "./components" 
-import VueFunc from "./utils/vuefunc"
+window.SUCCESS = "AAAAAA";
 
-window.SUCCESS="AAAAAA"
-
-Vue.use(ElementUI, { size: 'small' })
-Vue.use(CustomComponent)
-Vue.use(VueFunc)
+Vue.use(ElementUI, { size: "small", i18n: (key, value) => i18n.t(key, value) });
+Vue.use(CustomComponent);
+Vue.use(VueFunc);
 
 new Vue({
-  el: '#app',
+  el: "#app",
   store,
-  router:RootRouter,
-  render: h => h(App)
-})
+  i18n,
+  router: RootRouter,
+  render: (h) => h(App),
+});

src/model/Bdtdcr/Check.js

+import Utils from "~/utils"
+
+/**
+* Bdtdcr Check规则
+*/
+let checkObj = {
+    "liaall.misamt"                      :null,
+    "liaall.limmod.limpts.oth.pts.extkey"                      :null,
+    "bdtp.oth.pts.extkey"                      :null,
+    "liaall.limmod.ownref"                      :null,
+    "liaall.limmod.ecifno"                      :null,
+    "bdtp.oth.namelc"                      :null,
+    "liaall.limmod.othp.ptsget.sdamod.dadsnd"                      :null,
+    "bddgrp.rec.orddat"                      :null,
+    "bddgrp.blk.docdis"                      :null,
+    "liaall.limmod.limpts.oth.pts.nam"                      :null,
+    "setmod.dspflg"                      :null,
+    "expmno"                      :null,
+    "bddgrp.prb.pts.ref"                      :null,
+    "bddgrp.rec.sndref"                      :null,
+    "bddgrp.prb.pts.extkey"                      :null,
+    "bddgrp.rec.advdocflg"                      :null,
+    "bddgrp.apl.pts.nam"                      :null,
+    "bdtp.oth.adrelc"                      :null,
+    "liaall.limmod.limpts.wrk.pts.nam"                      :null,
+    "advdisflg"                      :null,
+    "bddgrp.prb.pts.nam"                      :null,
+    "bddgrp.ben.pts.nam"                      :null,
+    "liaall.limmod.limpts.wrk.pts.extkey"                      :null,
+    "bddgrp.prb.pts.dizhii"                      :null,
+    "bddgrp.prb.pts.bankno"                      :null,
+    "bdtp.othp.ptsget.sdamod.dadsnd"                      :null,
+    "bddgrp.blk.disdoc"                      :null,
+    "mtabut.coninf.conexedat"                      :null,
+    "bddgrp.rec.bilpro"                      :null,
+    "bdtp.recget.sdamod.dadsnd"                      :null,
+    "liaall.limmod.limpts.nonrevflg1"                      :null,
+    "liaall.limmod.wrkp.ptsget.sdamod.dadsnd"                      :null,
+    "bdtp.oth.pts.adrblk"                      :null,
+    "setmod.docamt"                      :null,
+    "bdtp.didget.sdamod.dadsnd"                      :null,
+    "bddgrp.prb.pts.jigomc"                      :null,
+    "mtabut.clsflg"                      :null,
+}
+
+for (const key in checkObj) {
+    if (Object.hasOwnProperty.call(checkObj, key)) {
+        checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
+    }
+}
+export default checkObj
+

src/model/Bdtdcr/Default.js

+
+/**
+* Bdtdcr Default规则
+*/
+import Api from "~/service/Api";
+import Utils from "~/utils/index"
+
+export default {
+    "bddgrp.rec.advdocflg"                      :Utils.defaultFunction,
+    "bddgrp.blk.docdis"                      :Utils.defaultFunction,
+    "advdisflg"                      :Utils.defaultFunction,
+    "advrefflg"                      :Utils.defaultFunction,
+    "advbwdflg"                      :Utils.defaultFunction,
+    "liaall.limmod.limpts.oth.pts.extkey"                      :Utils.defaultFunction,
+    "liaall.limmod.comamt"                      :Utils.defaultFunction,
+    "liaall.limmod.ccvamt"                      :Utils.defaultFunction,
+    "bddgrp.blk.docdisflg"                      :Utils.defaultFunction,
+    "liaall.limmod.limpts.wrk.pts.extkey"                      :Utils.defaultFunction,
+    "liaall.limmod.limpts.wrk.pts.nam"                      :Utils.defaultFunction,
+    "setmod.doccur"                      :Utils.defaultFunction,
+    "setmod.dspflg"                      :Utils.defaultFunction,
+    "setmod.docamt"                      :Utils.defaultFunction,
+    "bddgrp.blk.disdocflg"                      :Utils.defaultFunction,
+    "bddgrp.rec.ownref"                      :Utils.defaultFunction,
+    "bddgrp.prb.pts.extkey"                      :Utils.defaultFunction,
+    "bddgrp.rec.docprbrol"                      :Utils.defaultFunction,
+    "bddgrp.ben.pts.nam"                      :Utils.defaultFunction,
+    "bdtp.oth.pts.adrblk"                      :Utils.defaultFunction,
+    "mtabut.coninf.usr.extkey"                      :Utils.defaultFunction,
+    "bdtp.oth.pts.extkey"                      :Utils.defaultFunction,
+    "liaall.limmod.limpts.nonrevflg2"                      :Utils.defaultFunction,
+    "liaall.limmod.limpts.nonrevflg1"                      :Utils.defaultFunction,
+    "bddgrp.cbs.max.amt"                      :Utils.defaultFunction,
+    "bddgrp.rec.docflg"                      :Utils.defaultFunction,
+    "bddgrp.cbs.max.cur"                      :Utils.defaultFunction,
+    "didgrp.rec.expdat"                      :Utils.defaultFunction,
+    "didgrp.cbs.opn1.amt"                      :Utils.defaultFunction,
+    "mtabut.coninf.oitset.oit.inftxt"                      :Utils.defaultFunction,
+    "bdtp.oth.adrelc"                      :Utils.defaultFunction,
+    "bdtp.oth.namelc"                      :Utils.defaultFunction,
+    "bdtp.oth.dbfadrblkcn"                      :Utils.defaultFunction,
+    "bddgrp.apl.pts.nam"                      :Utils.defaultFunction,
+    "liaall.misamt"                      :Utils.defaultFunction,
+    "bddgrp.rec.stadat"                      :Utils.defaultFunction,
+    "mtabut.coninf.oitinf.oit.inftxt"                      :Utils.defaultFunction,
+    "mtabut.coninf.oitinf.oit.inflev"                      :Utils.defaultFunction,
+    "rejpenins"                      :Utils.defaultFunction,
+    "mtabut.clsflg"                      :Utils.defaultFunction,
+    "mtabut.coninf.conexedat"                      :Utils.defaultFunction,
+    "bddgrp.rec.payrol"                      :Utils.defaultFunction,
+    "liaall.limmod.limpts.oth.pts.nam"                      :Utils.defaultFunction,
+    "bddgrp.blk.disdoc"                      :Utils.defaultFunction,
+    "bddgrp.rec.sndref"                      :Utils.defaultFunction,
+    "mtabut.coninf.oitset.oit.inflev"                      :Utils.defaultFunction,
+    "didgrp.rec.ownref"                      :Utils.defaultFunction,
+    "bddgrp.prb.pts.nam"                      :Utils.defaultFunction,
+}
+//你可以添加自动default处理

src/model/Bdtdcr/Event.js

+import Api from "~/service/Api"
+import Utils from "~/utils"
+
+export default {
+                async onOthpDet(){
+                let rtnmsg = await this.executeRule("othp.det")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onDisdocButtxmsel(){
+                let rtnmsg = await this.executeRule("disdoc.buttxmsel")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onDocdisButtxmsel(){
+                let rtnmsg = await this.executeRule("docdis.buttxmsel")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onLiaallButmisamt(){
+                let rtnmsg = await this.executeRule("liaall.butmisamt")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onLiaallButmissig(){
+                let rtnmsg = await this.executeRule("liaall.butmissig")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onSetmodDet(){
+                let rtnmsg = await this.executeRule("setmod.det")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onWrkpDet(){
+                let rtnmsg = await this.executeRule("wrkp.det")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onOthp1Det(){
+                let rtnmsg = await this.executeRule("othp1.det")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onLimptsGet1(){
+                let rtnmsg = await this.executeRule("limpts.get1")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onLimptsGet2(){
+                let rtnmsg = await this.executeRule("limpts.get2")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+        async onLimmodTrycal(){
+                let rtnmsg = await this.executeRule("limmod.trycal")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+            },
+
+}
\ No newline at end of file

src/model/Bdtdcr/index.js

+import Api from "~/service/Api"
+import Pts from "../Common/Pts"
+
+export default class Bdtdcr {
+	constructor() {
+		this.data = {
+			bddgrp: {
+				rec: {
+					docflg: "",			//  单据类型		.bddgrp.rec.docflg
+					rcvdat: "",			//  到单日期		.bddgrp.rec.rcvdat
+					predat: "",			//  到单日期		.bddgrp.rec.predat
+					docprbrol: "",			//  单据类型		.bddgrp.rec.docprbrol
+					payrol: "",			//  发送承付电		.bddgrp.rec.payrol
+					ownref: "",			//  单据参考号		.bddgrp.rec.ownref
+					nam: "",			//  Name of Bill Contract		.bddgrp.rec.nam
+					docsta: "",			//  单据状态		.bddgrp.rec.docsta
+					matdat: "",			//  Maturity Date		.bddgrp.rec.matdat
+					tenmaxday: "",			//  单据到期日		.bddgrp.rec.tenmaxday
+					stadat: "",			//  Start Date		.bddgrp.rec.stadat
+					igndisflg: "",			//  Ignore Discrepancies		.bddgrp.rec.igndisflg
+					advtyp: "",			//  Type of Advice Received		.bddgrp.rec.advtyp
+					totdat: "",			//  付款日期		.bddgrp.rec.totdat
+					disdat: "",			//  不符点通知日期		.bddgrp.rec.disdat
+					approvcod: "",			//  Documents on Approval Basis		.bddgrp.rec.approvcod
+					relgodflg: "",			//  Release of Goods		.bddgrp.rec.relgodflg
+					reltyp: "",			//  Release Type		.bddgrp.rec.reltyp
+					relgoddat: "",			//  issue date		.bddgrp.rec.relgoddat
+					expdat: "",			//  Expiry Date of Shipping Guarantee		.bddgrp.rec.expdat
+					trpdoctyp: "",			//  Transport Doc. Type		.bddgrp.rec.trpdoctyp
+					trpdocnum: "",			//  Transport Doc. No.		.bddgrp.rec.trpdocnum
+					tradat: "",			//  shipment date		.bddgrp.rec.tradat
+					tramod: "",			//  Mode of Transport		.bddgrp.rec.tramod
+					rtoaplflg: "",			//  Release Goods to Applicant ?		.bddgrp.rec.rtoaplflg
+					ngrcod: "",			//  Goods code		.bddgrp.rec.ngrcod
+					blnum: "",			//  B/L Number		.bddgrp.rec.blnum
+					totcur: "",			//  Total Amount Claimed		.bddgrp.rec.totcur
+					totamt: "",			//  Total Amount to be Paid		.bddgrp.rec.totamt
+				},
+				cbs: {
+					max: {
+						cur: "",			//  单据金额		.bddgrp.cbs.max.cur
+						amt: "",			//  单据金额		.bddgrp.cbs.max.amt
+					},
+					opn1: {
+						cur: "",			//  单据余额		.bddgrp.cbs.opn1.cur
+						amt: "",			//  Balance		.bddgrp.cbs.opn1.amt
+					},
+				},
+				apl: {
+					pts: new Pts().data,
+				},
+				ben: {
+					pts: new Pts().data,
+				},
+				prb: {
+					pts: new Pts().data,
+				},
+				blk: {
+					comcon: "",			//  Comments and Conclusions		.bddgrp.blk.comcon
+					docdis: "",			//  Discrepancies		.bddgrp.blk.docdis
+					docdisflg: "",			//  discrepancies modified		.bddgrp.blk.docdisflg
+					accrmk: "",			//  到期付款确认备注		.bddgrp.blk.accrmk
+					vesnam: "",			//  Vessel Name		.bddgrp.blk.vesnam
+					pordis: "",			//  Port of Discharge		.bddgrp.blk.pordis
+					delplc: "",			//  Place of Delivery		.bddgrp.blk.delplc
+					roggod: "",			//  Covered Goods		.bddgrp.blk.roggod
+					relstoadr: "",			//  Release to Address		.bddgrp.blk.relstoadr
+					porlod: "",			//  Port of loading		.bddgrp.blk.porlod
+					voynum: "",			//  Voyage numer		.bddgrp.blk.voynum
+					notpty: "",			//  Notify Party		.bddgrp.blk.notpty
+					carnam: "",			//  Carrier		.bddgrp.blk.carnam
+					chaded: "",			//  Charges Deducted		.bddgrp.blk.chaded
+					chaadd: "",			//  Charges		.bddgrp.blk.chaadd
+				},
+				shp: {
+					pts: new Pts().data,
+					namelc: "",			//  名称		.bddgrp.shp.namelc
+					adrelc: "",			//  地址		.bddgrp.shp.adrelc
+					dbfadrblkcn: "",			//  Chinese address		.bddgrp.shp.dbfadrblkcn
+				},
+				acb: {
+					pts: new Pts().data,
+					namelc: "",			//  名称		.bddgrp.acb.namelc
+					adrelc: "",			//  地址		.bddgrp.acb.adrelc
+					dbfadrblkcn: "",			//  Chinese address		.bddgrp.acb.dbfadrblkcn
+				},
+				beb: {
+					pts: new Pts().data,
+					namelc: "",			//  名称		.bddgrp.beb.namelc
+					adrelc: "",			//  地址		.bddgrp.beb.adrelc
+					dbfadrblkcn: "",			//  Chinese address		.bddgrp.beb.dbfadrblkcn
+				},
+			},
+			advrefflg: "",			//  Advice of Refusal MT734		.advrefflg
+			advdisflg: "",			//  Advice of Discrepancy MT750		.advdisflg
+			mtabut: {
+				clsflg: "",			//  Close Flag		.mtabut.clsflg
+				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
+					},
+				},
+			},
+			rejpenins: "",			//  Rejection pending instructions		.rejpenins
+			didgrp: {
+				rec: {
+					ownref: "",			//  信用证参考号		.didgrp.rec.ownref
+					expdat: "",			//  Date of Expiry		.didgrp.rec.expdat
+				},
+				cbs: {
+					opn1: {
+						cur: "",			//  Currency		.didgrp.cbs.opn1.cur
+						amt: "",			//  Balance		.didgrp.cbs.opn1.amt
+					},
+				},
+			},
+			bdtp: {
+				didget: {
+					sdamod: {
+						seainf: "",			//  		.bdtp.didget.sdamod.seainf
+						dadsnd: "",			//  Drag  Drop Sender		.bdtp.didget.sdamod.dadsnd
+					},
+				},
+				recget: {
+					sdamod: {
+						dadsnd: "",			//  Drag  Drop Sender		.bdtp.recget.sdamod.dadsnd
+						seainf: "",			//  		.bdtp.recget.sdamod.seainf
+					},
+				},
+				matp: {
+					mattxtlab: "",			//  Label for MATTXT		.bdtp.matp.mattxtlab
+				},
+				oth: {
+					pts: new Pts().data,
+					namelc: "",			//  名称		.bdtp.oth.namelc
+					adrelc: "",			//  地址		.bdtp.oth.adrelc
+					dbfadrblkcn: "",			//  Chinese address		.bdtp.oth.dbfadrblkcn
+				},
+				othp: {
+					ptsget: {
+						sdamod: {
+							seainf: "",			//  		.bdtp.othp.ptsget.sdamod.seainf
+							dadsnd: "",			//  Drag  Drop Sender		.bdtp.othp.ptsget.sdamod.dadsnd
+						},
+					},
+				},
+				docgrdm: {
+					docdsclab: "",			//  Label of document description		.bdtp.docgrdm.docdsclab
+				},
+			},
+			rejtype: "",			//  退单方式		.rejtype
+			swtdat: "",			//  SWIFT发送时间		.swtdat
+			advbwdflg: "",			//  是否发送213拒付报文		.advbwdflg
+			expmno: "",			//  快递单号		.expmno
+			liaall: {
+				misamt: "",			//  Amount not yet assigned		.liaall.misamt
+				concur: "",			//  External Booking Amount		.liaall.concur
+				outpct: "",			//  Sight Amount Percentage		.liaall.outpct
+				outamt: "",			//  Sight Amount		.liaall.outamt
+				exttotoldamt: "",			//  Old Amount booked externally		.liaall.exttotoldamt
+				exttotamt: "",			//  Total booking amount external assinged		.liaall.exttotamt
+				limmod: {
+					limpts: {
+						wrklab: "",			//  Label		.liaall.limmod.limpts.wrklab
+						othlab: "",			//  Label		.liaall.limmod.limpts.othlab
+						othlabss: "",			//  Label		.liaall.limmod.limpts.othlabss
+						wrk: {
+							pts: new Pts().data,
+						},
+						oth: {
+							pts: new Pts().data,
+						},
+						lsh: "",			//  合同流�'号		.liaall.limmod.limpts.lsh
+						nonrevflg1: "",			//  Flag to Mark Non-revolving Limits		.liaall.limmod.limpts.nonrevflg1
+						pfcod1: "",			//  合同流�'号		.liaall.limmod.limpts.pfcod1
+						nonrevflg2: "",			//  Flag to Mark Non-revolving Limits		.liaall.limmod.limpts.nonrevflg2
+						pfcod2: "",			//  合同流�'号		.liaall.limmod.limpts.pfcod2
+					},
+					wrkp: {
+						ptsget: {
+							sdamod: {
+								dadsnd: "",			//  Drag  Drop Sender		.liaall.limmod.wrkp.ptsget.sdamod.dadsnd
+								seainf: "",			//  		.liaall.limmod.wrkp.ptsget.sdamod.seainf
+							},
+						},
+					},
+					othp: {
+						ptsget: {
+							sdamod: {
+								dadsnd: "",			//  Drag  Drop Sender		.liaall.limmod.othp.ptsget.sdamod.dadsnd
+								seainf: "",			//  		.liaall.limmod.othp.ptsget.sdamod.seainf
+							},
+						},
+					},
+					ownref: "",			//  国结业务编号		.liaall.limmod.ownref
+					comamt: "",			//  业务余额		.liaall.limmod.comamt
+					ccvamt: "",			//  保证金余额		.liaall.limmod.ccvamt
+					ecifno: "",			//  ECIFNO		.liaall.limmod.ecifno
+				},
+			},
+			setmod: {
+				docamt: "",			//  document amount		.setmod.docamt
+				doccur: "",			//  document currency		.setmod.doccur
+				docamttyplab: "",			//  settled amount description as label		.setmod.docamttyplab
+				retmsg: "",			//  Label showing Retry overflow condition		.setmod.retmsg
+				ref: "",			//  our reference		.setmod.ref
+				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: "",			//  Booking stream to Display		.setmod.glemod.gleshwstm
+				},
+			},
+			trnmod: {
+				trndoc: {
+					advlabel: "",			//  ADVLABEL		.trnmod.trndoc.advlabel
+					amdnam: "",			//  AMDNAM		.trnmod.trndoc.amdnam
+					advdoc: "",			//  国内证通知书		.trnmod.trndoc.advdoc
+					advnam: "",			//  国内证落款		.trnmod.trndoc.advnam
+					amdapl: "",			//  修改申请人名称		.trnmod.trndoc.amdapl
+					doceot: [],
+				},
+			},
+			pageId: ""			// ctx的key
+		}
+	}
+}
\ No newline at end of file

src/model/Bopsel/Event.js

@@ -146,5 +146,116 @@ export default {
                 this.$notify.error({title: '错误',message: '服务请求失败！'});
                 }
             },
+            async selpHandleSearch() {
+                
+                let res = await this.executeRule("serbut");
+  
+                if(res.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+               
+                this.stmData.data = res.data.dblstm.rows;
+                if(res.data.dblstm.rows.length == 0){
+                    this.$notify({
+                        title: '成功',
+                        message: '搜索完毕，无满足条件记录',
+                        type: 'success'
+                    });
+
+                }else{
+                    this.$notify({
+                        title: '成功',
+                        message: '查询成功',
+                        type: 'success'
+                    });
+
+                }
+
+                }
+                else
+                {
+                    let errorMsg = "";
+                    if(res.fieldErrors){
+                        let errorMsgkey = "";
+                        let errorMsgVal = "";
+                        for (const key in res.fieldErrors) {
+                            errorMsgkey = key;
+                            errorMsgVal = res.fieldErrors[key];
+                        }
+                        errorMsg = errorMsgkey+':'+errorMsgVal;
+                    }else if(res.respMsg){
+                        errorMsg = res.respMsg;
+                    }
+                    
+                this.$notify.error({title: '错误',message: '查询失败！错误信息['+errorMsg+']'});
+                }
+            },
+        
+            async selpHandleReset(){
+                this.model.bopquep.boptyp = "ALL";
+                this.model.bopquep.dattyp = "";
+                this.model.bopquep.frmdat = new Date();
+                this.model.bopquep.tildat = new Date();
+                this.model.bopquep.rptno = "";
+                this.model.bopquep.ownextkey = "";
+                this.model.bopquep.ptytyp = "";
+                this.model.bopquep.ptynam = "";
+                this.model.bopquep.medtyp = "";
+                this.model.bopquep.ownref = "";
+                this.model.bopquep.sum = "";
+                this.model.bopquep.staflg = "";
+            },
+
+            async errpHandleSearch() {
+                
+                let res = await this.executeRule("errsel.serbut");
+  
+                if(res.respCode == SUCCESS)
+                {
+                //TODO 处理数据逻辑
+               
+                this.stmData.data = res.data.errsel_msgstm.rows;
+                if(res.data.errsel_msgstm.rows.length == 0){
+                    this.$notify({
+                        title: '成功',
+                        message: '搜索完毕，无满足条件记录',
+                        type: 'success'
+                    });
+
+                }else{
+                    this.$notify({
+                        title: '成功',
+                        message: '查询成功',
+                        type: 'success'
+                    });
+
+                }
+
+                }
+                else
+                {
+                    let errorMsg = "";
+                    if(res.fieldErrors){
+                        let errorMsgkey = "";
+                        let errorMsgVal = "";
+                        for (const key in res.fieldErrors) {
+                            errorMsgkey = key;
+                            errorMsgVal = res.fieldErrors[key];
+                        }
+                        errorMsg = errorMsgkey+':'+errorMsgVal;
+                    }else if(res.respMsg){
+                        errorMsg = res.respMsg;
+                    }
+                    
+                this.$notify.error({title: '错误',message: '查询失败！错误信息['+errorMsg+']'});
+                }
+            },
+        
+            async errpHandleReset(){
+                this.model.errsel.rptno = "";
+                this.model.bopquep.ownextkey = "";
+                this.model.bopquep.frmdat = new Date();
+                this.model.bopquep.tildat = new Date();
+            }
 
 }
\ No newline at end of file

src/model/Ditame/index.js

@@ -157,6 +157,7 @@ export default class Ditame{
 									seainf:"",			//  		.trnmod.trndoc.rcvatt.seainf
 								},
 								filrecv:"",			//  File Receiver		.trnmod.trndoc.filrecv
+								doceot:[],
 							},
 						},
 						olddidgrp:{
@@ -290,6 +291,12 @@ export default class Ditame{
 							setglg:{
 								labdspflg:"",			//  Label for Type of Settlement		.setmod.setglg.labdspflg
 							},
+							setfog:{
+								setfol:[]
+							},
+							setfeg:{
+								setfel:[]
+							},
 							zmqacclab:"",			//  主�'�号LABEL		.setmod.zmqacclab
 							zmqacc:"",			//  自�'�区主�'�号		.setmod.zmqacc
 						},

src/permission.js

+import router from "./routers";
+import store from "./store";
+import { Message } from "element-ui";
+
+/**
+ * 可在这里做鉴权
+ */
+router.beforeEach(async (to, from, next) => {
+  // 限制页签的数量
+  if (to.path.startsWith("/business")) {
+    if (store.state.TagsView.visitedViews.length >= store.state.TagsView.visitedViewsMaxVal) {
+      Message.warning(
+        `页签数超过最大限制（${store.state.TagsView.visitedViewsMaxVal}），请先关闭其他页签！`
+      );
+      return;
+    }
+  }
+  next();
+});
+
+router.afterEach(() => {});

src/store/I18NStore.js

+import Cookies from "js-cookie";
+import { getLanguage } from "~/lang/index";
+
 const I18N = {
   namespaced: true,
-    state:{
-        lang:"cn"
-    },
-    mutations:{
-        setLang(state,lang){
-            state.lang = lang
-        }
-    }
-}
-export default I18N
\ No newline at end of file
+  state: {
+    lang: getLanguage(),
+  },
+  mutations: {
+    SET_LANG(state, lang) {
+      state.lang = lang;
+      Cookies.set("language", lang);
+    },
+  },
+  actions: {
+    setLang({ commit }, lang) {
+      commit("SET_LANG", lang);
+    },
+  },
+};
+export default I18N;

src/store/TagsView.js

 const state = {
+  visitedViewsMaxVal: 10,
   visitedViews: [],
   cachedViews: []
 }

src/views/Business/Bdtdcr/Brtdcrd.vue

+<template>
+  <div class="eibs-tab">
+    <c-row>
+      <c-col :span="12">
+        <c-row>
+          <c-col :span="24">
+            <el-form-item label="不符点">
+              <c-input
+                type="textarea"
+                :disabled="model.bddgrp.blk.docdisflg ? false : true"
+                :rows="6"
+                v-model="model.bddgrp.blk.docdis"
+                maxlength="65"
+                show-word-limit
+                placeholder="请输入不符点"
+              ></c-input>
+            </el-form-item>
+          </c-col>
+
+<c-col :span="24">
+            <c-istream-table
+              :list="model.bdtp.docgrdm.docgrd"
+              :columns="columns"
+            >
+            </c-istream-table>
+          </c-col>
+          
+        </c-row>
+      </c-col>
+
+      <c-col :span="12">
+        <c-row>
+          <c-col :span="24">
+            <div class="c-checkbox">
+              <c-checkbox v-model="model.bddgrp.blk.docdisflg" @change="changed"
+                >录入不符点</c-checkbox
+              >
+            </div>
+          </c-col>
+
+          
+        </c-row>
+      </c-col>
+    </c-row>
+  </div>
+</template>
+<script>
+import Api from "~/service/Api";
+import CommonProcess from "~/mixin/CommonProcess";
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Bdtdcr/Event";
+
+export default {
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [CommonProcess],
+  data() {
+    return {
+      columns: ['0 0 "lst1" 50 ', '1 1 "lst2" 50', '2 2 "document" 200'],
+    };
+  },
+  methods: {
+    ...Event,
+    changed(e) {
+      if (!e) {
+        this.model.bddgrp.blk.docdis = "";
+      }
+    },
+  },
+  created: function () {},
+};
+</script>
+<style>
+.c-checkbox {
+  text-align: center;
+  margin: 10px;
+  font-size: 16px;
+}
+</style>

src/views/Business/Bdtdcr/Coninfp.vue

+<template>
+  <div class="eibs-tab">
+                              
+	<c-col :span="12">
+	    <span  v-text="model.mtabut.coninf.oitinf.labinftxt"   data-path=".mtabut.coninf.oitinf.labinftxt" > </span>
+	</c-col>
+                                   
+       <c-col :span="12">
+        <el-form-item label="Infotext" prop="mtabut.coninf.oitinf.oit.inftxt">
+            <c-input type="textarea" v-model="model.mtabut.coninf.oitinf.oit.inftxt" maxlength="60" show-word-limit placeholder="请输入Infotext" ></c-input>
+        </el-form-item>
+        </c-col>
+                  
+       <c-col :span="12">
+        <el-form-item label="Infotext Level" prop="mtabut.coninf.oitinf.oit.inflev">
+            <c-select v-model="model.mtabut.coninf.oitinf.oit.inflev" style="width:100%" placeholder="请选择Infotext Level">
+              </c-select>
+        </el-form-item>
+       </c-col>
+                  
+	<c-col :span="12">
+	    <span  v-text="model.mtabut.coninf.oitset.labinftxt"   data-path=".mtabut.coninf.oitset.labinftxt" > </span>
+	</c-col>
+                                   
+       <c-col :span="12">
+        <el-form-item label="Infotext" prop="mtabut.coninf.oitset.oit.inftxt">
+            <c-input type="textarea" v-model="model.mtabut.coninf.oitset.oit.inftxt" maxlength="60" show-word-limit placeholder="请输入Infotext" ></c-input>
+        </el-form-item>
+        </c-col>
+                  
+       <c-col :span="12">
+        <el-form-item label="Infotext Level" prop="mtabut.coninf.oitset.oit.inflev">
+            <c-select v-model="model.mtabut.coninf.oitset.oit.inflev" style="width:100%" placeholder="请选择Infotext Level">
+              </c-select>
+        </el-form-item>
+       </c-col>
+                                   
+       <c-col :span="12">
+        <el-form-item label="执行日期" prop="mtabut.coninf.conexedat">
+            <c-date-picker type="date"  v-model="model.mtabut.coninf.conexedat" style="width:100%"  placeholder="请选择执行日期"></c-date-picker>
+        </el-form-item>
+       </c-col>
+                                   
+       <c-col :span="12">
+        <el-form-item label="User ID" prop="mtabut.coninf.usr.extkey">
+            <c-input  v-model="model.mtabut.coninf.usr.extkey" maxlength="8"  placeholder="请输入User ID"></c-input>
+        </el-form-item>
+       </c-col>
+  </div>
+</template>
+<script>
+import Api from "~/service/Api"
+import CommonProcess from "~/mixin/CommonProcess";
+import CodeTable from "~/config/CodeTable"
+import Event from "~/model/Bdtdcr/Event"
+
+export default {
+    inject: ['root'],
+    props:["model","codes"],
+    mixins: [CommonProcess],
+    data(){
+        return {
+
+        }
+    },
+    methods:{...Event},
+    created:function(){
+
+    }
+}
+</script>
+<style>
+
+</style>

src/views/Business/Bdtdcr/Docpan.vue

+<template>
+  <div class="eibs-tab">
+                                               
+	<c-col :span="12">
+	    <span  v-text="model.trnmod.trndoc.advlabel"   data-path=".trnmod.trndoc.advlabel" > </span>
+	</c-col>
+                  
+       <c-col :span="12">
+        <el-form-item label="国内证落款" prop="trnmod.trndoc.advnam">
+            <c-input  v-model="model.trnmod.trndoc.advnam" maxlength="50"  placeholder="请输入国内证落款"></c-input>
+        </el-form-item>
+       </c-col>
+                  
+       <c-col :span="12">
+        <el-form-item label="修改申请人名称" prop="trnmod.trndoc.amdapl">
+            <c-input type="textarea" v-model="model.trnmod.trndoc.amdapl" maxlength="50" show-word-limit placeholder="请输入修改申请人名称" ></c-input>
+        </el-form-item>
+        </c-col>
+                  
+	<c-col :span="12">
+	    <span  v-text="model.trnmod.trndoc.amdnam"   data-path=".trnmod.trndoc.amdnam" > </span>
+	</c-col>
+                  
+       <c-col :span="12">
+        <el-form-item label="国内证通知书" prop="trnmod.trndoc.advdoc">
+            <c-input  v-model="model.trnmod.trndoc.advdoc" maxlength="1"  placeholder="请输入国内证通知书"></c-input>
+        </el-form-item>
+       </c-col>
+  </div>
+</template>
+<script>
+import Api from "~/service/Api"
+import CommonProcess from "~/mixin/CommonProcess";
+import CodeTable from "~/config/CodeTable"
+import Event from "~/model/Bdtdcr/Event"
+
+export default {
+    inject: ['root'],
+    props:["model","codes"],
+    mixins: [CommonProcess],
+    data(){
+        return {
+
+        }
+    },
+    methods:{...Event},
+    created:function(){
+
+    }
+}
+</script>
+<style>
+
+</style>

src/views/Business/Bdtdcr/Engp.vue

+<template>
+  <div class="eibs-tab">
+                                                                
+       <c-col :span="12">
+        <el-form-item label="Sight Amount" prop="liaall.outamt">
+            <c-input  v-model="model.liaall.outamt"  placeholder="请输入Sight Amount"></c-input>
+        </el-form-item>
+       </c-col>
+                  
+       <c-col :span="12">
+        <el-form-item label="Sight Amount Percentage" prop="liaall.outpct">
+            <c-input  v-model="model.liaall.outpct"  placeholder="请输入Sight Amount Percentage"></c-input>
+        </el-form-item>
+       </c-col>
+                                                    
+       <c-col :span="12">
+        <el-form-item label="External Booking Amount" prop="liaall.concur">
+            <c-input  v-model="model.liaall.concur" maxlength="3"  placeholder="请输入External Booking Amount"></c-input>
+        </el-form-item>
+       </c-col>
+                  
+       <c-col :span="12">
+        <el-form-item label="Amount not yet assigned" prop="liaall.misamt">
+            <c-input  v-model="model.liaall.misamt"  placeholder="请输入Amount not yet assigned"></c-input>
+        </el-form-item>
+       </c-col>
+                  
+       <c-col :span="12">
+        <c-button size="small" type="primary"  @click="onLiaallButmisamt">
+            Add to Current Line
+        </c-button>
+       </c-col>
+                  
+       <c-col :span="12">
+        <c-button size="small" type="primary"  @click="onLiaallButmissig">
+            Add to Sight Amount
+        </c-button>
+       </c-col>
+                                   
+       <c-col :span="12">
+        <el-form-item label="Old Amount booked externally" prop="liaall.exttotoldamt">
+            <c-input  v-model="model.liaall.exttotoldamt"  placeholder="请输入Old Amount booked externally"></c-input>
+        </el-form-item>
+       </c-col>
+                                   
+       <c-col :span="12">
+        <el-form-item label="Total booking amount external assinged" prop="liaall.exttotamt">
+            <c-input  v-model="model.liaall.exttotamt"  placeholder="请输入Total booking amount external assinged"></c-input>
+        </el-form-item>
+       </c-col>
+                   </div>
+</template>
+<script>
+import Api from "~/service/Api"
+import CommonProcess from "~/mixin/CommonProcess";
+import CodeTable from "~/config/CodeTable"
+import Event from "~/model/Bdtdcr/Event"
+
+export default {
+    inject: ['root'],
+    props:["model","codes"],
+    mixins: [CommonProcess],
+    data(){
+        return {
+
+        }
+    },
+    methods:{...Event},
+    created:function(){
+
+    }
+}
+</script>
+<style>
+
+</style>

src/views/Business/Bdtdcr/index.vue

+<template>
+  <c-page title="国内证不符点/拒付">
+    <div class="eContainer">
+      <!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
+      <c-function-btn
+        :handleSubmit="handleSubmit"
+        :handleCheck="handleCheck"
+        :handleStash="handleStash"
+      >
+        <el-button size="small">流程附言</el-button>
+        <el-button size="small">交易历史</el-button>
+        <el-button size="small">备忘录</el-button>
+        <el-button size="small">影像信息</el-button>
+        <!-- <el-button size="small">保存模板</el-button> -->
+        <!-- <el-button size="small">使用模板</el-button> -->
+        <el-button size="small">制裁信息</el-button>
+        <!-- <el-button size="small">拆分报文</el-button> -->
+        <el-button size="small">智能提示</el-button>
+      </c-function-btn>
+      <el-form
+        :model="model"
+        :rules="rules"
+        ref="modelForm"
+        label-width="150px"
+        label-position="right"
+        size="small"
+        :validate-on-rule-change="false"
+      >
+        <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
+          <!--PD000037 -->
+          <el-tab-pane label="内容" name="utlp">
+            <c-content>
+            <m-utlp :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
+
+          <!--PD000059 -->
+          <el-tab-pane label="不符点详情" name="brtdcrd">
+            <m-brtdcrd :model="model" :codes="codes" />
+          </el-tab-pane>
+
+          <!--PD000027 -->
+          <el-tab-pane label="或有" name="engp">
+            <m-engp :model="model" :codes="codes" />
+          </el-tab-pane>
+
+          <!--PD000000 -->
+          <el-tab-pane label="帐务" name="setpan">
+            <c-content>
+              <m-setpan :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
+
+          <!--PD000000 -->
+          <el-tab-pane label="附言" name="coninfp">
+            <m-coninfp :model="model" :codes="codes" />
+          </el-tab-pane>
+
+          <!--PD000529 -->
+          <el-tab-pane label="报文及面函" name="docpan">
+            <m-docpan :model="model" :codes="codes" />
+          </el-tab-pane>
+
+          <!--PD000001 -->
+          <el-tab-pane label="统一授信" name="limitbody">
+            <m-limitbody :model="model" :codes="codes" />
+          </el-tab-pane>
+        </c-tabs>
+      </el-form>
+      <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
+	  </c-grid-ety-prompt-dialog>
+    </div>
+  </c-page>
+</template>
+<script>
+import Api from "~/service/Api";
+import Utils from "~/utils/index";
+import CodeTable from "~/config/CodeTable";
+import Bdtdcr from "~/model/Bdtdcr";
+
+import CommonProcess from "~/mixin/CommonProcess";
+import CommonFuncs from "~/mixin/CommonFuncs";
+import Pattern from "~/model/Bdtdcr/Pattern";
+import Default from "~/model/Bdtdcr/Default";
+import Check from "~/model/Bdtdcr/Check";
+import Utlp from "./Utlp";
+import Brtdcrd from "./Brtdcrd";
+import Engp from  "~/views/Public/Engp";
+//import Setpan from "./Setpan";
+import Setpan from "~/views/Public/Setpan";
+import Coninfp from "~/views/Public/Coninfp";
+import Docpan from "~/views/Public/Docpan";
+import Limitbody from "./Limitbody";
+
+export default {
+  name: "Bdtdcr",
+  components: {
+    "m-utlp": Utlp,
+    "m-brtdcrd": Brtdcrd,
+    "m-engp": Engp,
+    "m-setpan": Setpan,
+    "m-coninfp": Coninfp,
+    "m-docpan": Docpan,
+    "m-limitbody": Limitbody,
+  },
+  provide() {
+    return {
+      root: this,
+    };
+  },
+  mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理
+  computed: {},
+  data() {
+    return {
+      tabVal: "utlp",
+      trnName: "bdtdcr",
+      model: new Bdtdcr().data,
+      //checkRules: Check,
+      defaultRules: Default,
+      pattern: Pattern,
+      rules: null,
+      codes: { ...CodeTable },
+    };
+  },
+  methods: {
+    tabClick() {},
+  },
+  created: async function () {
+    console.log("进入bdtdcr交易");
+    let rtnmsg =await this.init();
+    if (rtnmsg.respCode == SUCCESS) {
+      //TODO 处理数据逻辑
+      Utils.copyValueFromVO(this.model, rtnmsg.data);
+      if (this.isInDisplay) {
+        this.restoreDisplay();
+      }
+    } else {
+      this.$notify.error({ title: "错误", message: "服务请求失败！" });
+    }
+  },
+};
+</script>
+<style>
+</style>

src/views/Business/Bopsel/Errp.vue

 <template>
   <div class="eibs-tab">
+    <c-list-search
+      @form-reset="errpHandleReset"
+      @form-search="errpHandleSearch"
+    >
+      <template v-slot="searchSlot">
+        <el-form
+          class="m-table-search-form"
+          ref="paramsForm"
+          :inline="true"
+          label-position="right"
+          label-width="110px"
+          size="small"
+        >
         
+        <el-row>
+          <c-col :span="8">
+            <el-form-item label="申报编号" prop="errsel.rptno"  style="width: 100%">
+              <c-input
+                v-model="model.errsel.rptno"
+                maxlength="22"
+                placeholder="请输入申报编号"
+              ></c-input>
+            </el-form-item>
+          </c-col>
+
+          <c-col :span="8">
+            <el-form-item label="业务所属行" prop="bopquep.ownextkey"  style="width: 100%">
+              <c-select
+                v-model="model.bopquep.ownextkey"
+                style="width: 100%"
+                placeholder="请选择业务所属行"
+              >
+              </c-select>
+            </el-form-item>
+          </c-col>
+
+           <c-col :span="8" v-show="searchSlot.searchToggle">
+                <el-form-item label="起止日期" style="width: 100%">
+                  <c-col :span="11">
+                    <el-date-picker
+                      type="date"
+                      v-model="model.bopquep.frmdat"
+                      value-format="yyyy-MM-dd"
+                      style="width: 100%"
+                      placeholder="请选择From"
+                    ></el-date-picker>
+                  </c-col>
+                  <c-col :span="2" style="text-align: center">
+                    <label style="display: inline-block; width: 100%">-</label>
+                  </c-col>
+                  <c-col :span="11">
+                    <el-date-picker
+                      type="date"
+                      v-model="model.bopquep.tildat"
+                      value-format="yyyy-MM-dd"
+                      style="width: 100%"
+                      placeholder="请选择Until"
+                    ></el-date-picker>
+                  </c-col>
+                </el-form-item>
+              </c-col>
+        </el-row>
+        </el-form>
+      </template>
+    </c-list-search>
+
+     <el-row>
+      <c-istream-table :list="stmData.data" :columns="stmData.columns">
+        <el-table-column fixed="right" prop="op" label="操作" width="100">
+          <template slot-scope="scope">
+            <a href="javascript:void(0)" @click="continueEdit(scope.row)"
+              >correct</a
+            >
+          </template>
+        </el-table-column>
+      </c-istream-table>
+    </el-row>
+    <!--                                         
        <c-col :span="12">
         <el-form-item label="申报编号" prop="errsel.rptno">
             <c-input  v-model="model.errsel.rptno" maxlength="22"  placeholder="请输入申报编号"></c-input>
@@ -49,29 +126,36 @@
             Exit
         </c-button>
        </c-col>
+       -->
   </div>
 </template>
 <script>
-import Api from "~/service/Api"
+import Api from "~/service/Api";
 import CommonProcess from "~/mixin/CommonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Bopsel/Event"
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Bopsel/Event";
 
 export default {
-    inject: ['root'],
-    props:["model","codes"],
+  inject: ["root"],
+  props: ["model", "codes"],
   mixins: [CommonProcess],
-    data(){
+  data() {
      return {
-
-        }
+      stmData: {
+        columns: [
+          '4 1 "申报编号" 0 ',
+          '5 2 "反馈日期" 0',
+          '7 3 "业务编号" 0',
+          '20 4 "错误信息" 0',
+          '21 5 "接口" 0',
+        ],
+        data: [],
       },
-    methods:{...Event},
-    created:function(){
-
-    }
-}
+    };
+  },
+  methods: { ...Event },
+  created: function () {},
+};
 </script>
 <style>
-
 </style>

src/views/Business/Bopsel/index.vue

 <template>
   <div class="eContainer">
-    <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
+    <el-form
+      :model="model"
+      :rules="rules"
+      ref="modelForm"
+      label-width="150px"
+      label-position="right"
+      size="small"
+      :validate-on-rule-change="false"
+    >
       <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
-        
         <!--PD000000 -->
         <el-tab-pane label="接口信息选择" name="selp">
-                <m-selp :model="model" :codes="codes"/>
+          <m-selp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <!--PD000000 -->
         <el-tab-pane label="接口反馈文件差错返回" name="errp">
-                <m-errp :model="model" :codes="codes"/>
+          <m-errp :model="model" :codes="codes" />
         </el-tab-pane>
       </c-tabs>
     </el-form>
   </div>
 </template>
 <script>
-import Api from "~/service/Api"
-import CodeTable from "~/config/CodeTable"
-import Bopsel from "~/model/Bopsel"
-import CommonProcess from "~/mixin/CommonProcess"
-import Check from "~/model/Bopsel/Check"
-import Default from "~/model/Bopsel/Default"
-import Pattern from "~/model/Bopsel/Pattern"
-import Selp from "./Selp"
-import Errp from "./Errp"
-
+import Api from "~/service/Api";
+import CodeTable from "~/config/CodeTable";
+import Bopsel from "~/model/Bopsel";
+import CommonProcess from "~/mixin/CommonProcess";
+import Check from "~/model/Bopsel/Check";
+import Default from "~/model/Bopsel/Default";
+import Pattern from "~/model/Bopsel/Pattern";
+import Selp from "./Selp";
+import Errp from "./Errp";
 
 export default {
   name: "Bopsel",
-    components:{
-        "m-selp" : Selp,
-        "m-errp" : Errp,
+  components: {
+    "m-selp": Selp,
+    "m-errp": Errp,
   },
   provide() {
     return {
-            root: this
-        }
+      root: this,
+    };
   },
   mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
-    data(){
+  data() {
     return {
-            tabVal: "",
+      tabVal: "selp",
       trnName: "bopsel",
       model: new Bopsel().data,
       checkRules: Check,
@@ -50,28 +56,59 @@ export default {
       pattern: Pattern,
       rules: null,
       codes: {
+        boptyp: [],
+        dattyp: [
+          { label: "按收付汇日期", value: "A" },
+          { label: "按经办日期", value: "B" },
+        ],
+        ptytyp: [
+          { label: "对公", value: "C" },
+          { label: "对私中国居民", value: "D" },
+          { label: "对私非中国居民", value: "F" },
+        ],
+        medtyp:[
+		{label:"票汇",value:"D" },
+		{label:"信用证",value:"L" },
+		{label:"托收",value:"C" },
+		{label:"保函",value:"G" },
+		{label:"光票托收",value:"Y" },
+		{label:"其他",value:"O" },
+		{label:"电汇",value:"T" },
+		{label:"支票代收",value:"Z" },
+		{label:"信汇",value:"M" },
+	],
+    staflg:[
+        {label:"待确认",value:"P" },
+        {label:"待发送",value:"W" },
+		{label:"已发送",value:"S" },
+        {label:"已撤销",value:"D" },
+		{label:"已删除",value:"G" },
+		{label:"待修改",value:"E" },
+	],
       },
-        }
+    };
   },
-    methods:{
-        tabClick(){
-        }
+  methods: {
+    tabClick() {},
   },
-    created:async function(){
+  created: async function () {
     console.log("进入bopsel交易");
-        let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           //TODO 处理数据逻辑
 
+    // 查询码表
+    Api.post("getCodetable", { tbl: "BOPTYP", lang: "EN" }).then((res) => {
+      if (res.respCode == SUCCESS) {
+        this.codes.boptyp = res.data;
       }
-        else
-        {
-            this.$notify.error({title: '错误',message: '服务请求失败！'});
-        }
+    });
+
+    let rtnmsg = await this.init({});
+    if (rtnmsg.respCode == SUCCESS) {
+      //TODO 处理数据逻辑
+    } else {
+      this.$notify.error({ title: "错误", message: "服务请求失败！" });
     }
-}
+  },
+};
 </script>
 <style>
-
 </style>

src/views/Business/BusRouter.js

@@ -10,6 +10,7 @@ import Sptsel from "./Sptsel"
 import Trnrel from "./Trnrel"
 import Tstopn from "./Tstopn"
 import Bdtudp from "./Bdtudp"
+import Bdtdcr from "./Bdtdcr"
 import Trndtl from "./Trnrel/Trndtl"
 import Infpta from "./Infpta"
 
@@ -45,6 +46,7 @@ import Trtame from "./Trtame"
  */
 const BusRouter = [
   { path: 'bdtudp', component: Bdtudp, name: 'Bdtudp', meta: { title: '国内证承兑' } },
+  { path: 'bdtdcr', component: Bdtdcr, name: 'Bdtdcr', meta: { title: '国内证不符点/拒付' } },
   { path: 'cptadv', component: Cptadv, name: 'Cptadv', meta: { title: '汇入汇款' } },
   { path: 'cptopn', component: Cptopn, name: 'Cptopn', meta: { title: '汇出汇款' } },
   { path: 'diasel', component: Diasel, name: 'Diasel', meta: { title: '备忘录选择交易' } },

src/views/Business/Ditame/Coninfp.vue

-<template>
-    <c-row>
-        <c-col :span="24">
-            <c-col :span="12">
-                <el-form-item
-                style="height=200px;"
-                    label="General"
-                    prop="mtabut.coninf.oitinf.oit.inftxt"
-                >
-                    <c-input
-                        type="textarea"
-                        v-model="model.mtabut.coninf.oitinf.oit.inftxt"
-                        maxlength="60"
-                        :autosize="{ minRows: 4, maxRows: 6 }"
-                        show-word-limit
-                        placeholder="请输入Infotext"
-                    ></c-input>
-                </el-form-item>
-            </c-col>
-
-            <c-col :span="12">
-                <el-form-item
-                    label="Display Type"
-                    prop="mtabut.coninf.oitinf.oit.inflev"
-                >
-                    <c-select
-                        v-model="model.mtabut.coninf.oitinf.oit.inflev"
-                        style="width: 50%"
-                        disabled
-                        placeholder="请选择Infotext Level"
-                    >
-                        <el-option
-                            v-for="item in codes.inflev"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </c-select>
-                </el-form-item>
-            </c-col>
-        </c-col>
-
-        <c-col :span="24">
-            <c-col :span="12">
-                <el-form-item
-                    label="Settlement"
-                    prop="mtabut.coninf.oitset.oit.inftxt"
-                >
-                    <c-input
-                        type="textarea"
-                        v-model="model.mtabut.coninf.oitset.oit.inftxt"
-                        maxlength="60"
-                        :autosize="{ minRows: 4, maxRows: 6 }"
-                        show-word-limit
-                        placeholder="请输入Infotext"
-                    ></c-input>
-                </el-form-item>
-            </c-col>
-
-            <c-col :span="12">
-                <el-form-item
-                    label="Display Type"
-                    prop="mtabut.coninf.oitset.oit.inflev"
-                >
-                    <c-select
-                        v-model="model.mtabut.coninf.oitset.oit.inflev"
-                        style="width: 50%"
-                        disabled
-                        placeholder="请选择Infotext Level"
-                    >
-                        <el-option
-                            v-for="item in codes.inflev"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </c-select>
-                </el-form-item>
-            </c-col>
-        </c-col>
-
-        <c-col :span="12">
-            <el-form-item label="执行日期" prop="mtabut.coninf.conexedat">
-                <el-date-picker
-                    type="date"
-                    v-model="model.mtabut.coninf.conexedat"
-                    style="width: 40%"
-                    placeholder="请选择执行日期"
-                ></el-date-picker>
-            </el-form-item>
-        </c-col>
-
-        <c-col :span="12">
-            <el-form-item
-                label="Send for Release to"
-                prop="mtabut.coninf.usr.extkey"
-            >
-                <c-input
-                    v-model="model.mtabut.coninf.usr.extkey"
-                    maxlength="8"
-                    style="width: 40%"
-                    disabled="disabled"
-                    placeholder="请输入User ID"
-                ></c-input>
-            </el-form-item>
-        </c-col>
-    </c-row>
-</template>
-<script>
-import CommonProcess from "~/mixin/CommonProcess";
-import Event from "~/model/Ditopn/Event";
-
-export default {
-    inject: ['root'],
-    props: ["model", "codes"],
-    mixins: [CommonProcess],
-    data() {
-        return {};
-    },
-    methods: { ...Event },
-    created: function () {},
-};
-</script>
-<style>
-</style>

src/views/Business/Ditame/Engp.vue

-<template>
-  <div class="eibs-tab">
-    <c-col :span="24" style="margin-bottom:18px">
-        Liability
-    </c-col>
-    <c-col :span="22" :offset="1">
-      <c-table :list="model.liaall.liaallg" style="width:80%,text-align:center,margin-bottom:18px" :border="true">
-        <el-table-column prop="cbtpfx" label="Type" width="auto"> </el-table-column>
-        <el-table-column prop="matdat" label="Maturity" width="auto"> </el-table-column>
-        <el-table-column prop="tenday" label="Tenor" width="auto"> </el-table-column>
-        <el-table-column prop="rol" label="Dbt." width="auto"> </el-table-column>
-        <el-table-column prop="nam" label="Name" width="auto"> </el-table-column>
-        <el-table-column prop="cdtrol" label="Cdt." width="auto"> </el-table-column>
-        <el-table-column prop="cur" label="Cur" width="auto"> </el-table-column>
-        <el-table-column prop="oldamt" label="Old Amount" width="auto"> 
-         <template slot-scope="scope">
-                  {{moneyFormat(scope.row.oldamt)}}
-         </template>
-        </el-table-column>
-        <el-table-column prop="amt" label="Booking Amo" width="auto">
-        <template slot-scope="scope">
-                  {{moneyFormat(scope.row.amt)}}
-         </template>
-         </el-table-column>
-        <el-table-column prop="tenpct" label="%" width="auto"> </el-table-column>
-        <el-table-column prop="acc" label="Account" width="auto"> </el-table-column>
-        <el-table-column prop="valdat" label="Value Date" width="auto">
-         <template slot-scope="scope">
-                  {{dateFormat(scope.row.valdat)}}
-         </template>
-        </el-table-column>
-      </c-table>
-    </c-col>
-                                                                
-       <!-- <c-col :span="12">
-        <el-form-item label="Sight Amount">
-            <c-input style="width:50%"  v-model="model.liaall.outamt"  placeholder="请输入Sight Amount"></c-input>
-        </el-form-item>
-       </c-col>                 
-                  
-       <c-col :span="12">
-        <el-form-item label="Sight Amount Percentage">
-            <c-input style="width:50%"  v-model="model.liaall.outpct"  placeholder="请输入Sight Amount Percentage"></c-input>
-        </el-form-item>
-       </c-col>             
-                                                    
-       <c-col :span="12">
-        <el-form-item label="External Booking Amount">
-            <c-input style="width:70%"  v-model="model.liaall.concur" maxlength="3"  placeholder="请输入External Booking Amount"></c-input>
-        </el-form-item>
-       </c-col>              -->
-                  
-       <c-col :span="12">
-        <el-form-item label="Amount not yet assigned">
-            <c-input style="width:20%" disabled  v-model="model.liaall.concur" maxlength="3"  placeholder="请输入External Booking Amount"></c-input>
-            <c-input style="width:50%" disabled v-model="model.liaall.misamt"  placeholder="请输入Amount not yet assigned"></c-input>
-        </el-form-item>
-       </c-col>                 
-                  
-       <c-col :span="12">
-           <el-form-item label="">
-            <c-button size="small" disabled type="primary"  @click="onLiaallButmisamt">
-                Add to Current Line
-            </c-button>
-           </el-form-item>
-       </c-col>
-                  
-       <!-- <c-col :span="12">
-        <el-form-item label="">
-            <c-button size="small" type="primary"  @click="onLiaallButmissig">
-                Add to Sight Amount
-            </c-button>
-        </el-form-item>
-       </c-col>
-                                   
-       <c-col :span="12">
-        <el-form-item label="Old Amount booked externally">
-            <c-input style="width:50%"  v-model="model.liaall.exttotoldamt"  placeholder="请输入Old Amount booked externally"></c-input>
-        </el-form-item>
-       </c-col>                 
-                                   
-       <c-col :span="12">
-        <el-form-item label="Total booking amount external assinged">
-            <c-input style="width:50%"  v-model="model.liaall.exttotamt"  placeholder="请输入Total booking amount external assinged"></c-input>
-        </el-form-item>
-       </c-col>                  -->
-                   </div>
-</template>
-<script>
-import Api from "~/service/Api"
-import CommonProcess from "~/mixin/CommonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Ditopn/Event"
-
-export default {
-    inject: ['root'],
-    mixins: [CommonProcess],
-    props:["model","codes"],
-    data(){
-        return {
-
-        }
-    },
-    methods:{...Event},
-    created:function(){
-
-    }
-}
-</script>
-<style>
-
-</style>

src/views/Business/Ditame/Ovwp.vue

@@ -711,16 +711,16 @@ export default {
     mixins: [CommonProcess],
     data() {
         return {
-            declareParams: {
-                fileName: "ditopn.json",
-                basePath: "{{basePath}}",
-                method: "post",
-                scheme: "{{schemes}}",
-                host: "{{host}}",
-                consume: "0",
-                produce: "0",
-                uri: "/ditopn/getElcsRef",
-            },
+            // declareParams: {
+            //     fileName: "ditopn.json",
+            //     basePath: "{{basePath}}",
+            //     method: "post",
+            //     scheme: "{{schemes}}",
+            //     host: "{{host}}",
+            //     consume: "0",
+            //     produce: "0",
+            //     uri: "/ditopn/getElcsRef",
+            // },
             jigomcFlag:false,
             trade: ""
         };

src/views/Business/Ditame/index.vue

@@ -129,14 +129,15 @@ import Dogpame from "./Dogpame";
 import Dorpame from "./Dorpame";
 import Adcpame from "./Adcpame";
 import Inspame from "./Inspame";
-import Engp from "./Engp";
-import Ccvpan from "./Ccvpan";
-import Setpan from "./Setpan";
 import Addbcb from "./Addbcb";
-import Coninfp from "./Coninfp";
-import Docpan from "./Docpan";
 import Doctre from "./Doctre";
-import Limitbody from "./Limitbody";
+
+import Setpan from "~/views/Public/Setpan";
+import Engp from "~/views/Public/Engp";
+import Ccvpan from "~/views/Public/Ccvpan";
+import Coninfp from "~/views/Public/Coninfp";
+import Docpan from "~/views/Public/Docpan";
+import Limitbody from "~/views/Public/Limitbody";
 
 export default {
     name: 'Ditame',

src/views/Business/Ditopn/Coninfp.vue

-<template>
-    <c-row>
-        <c-col :span="24">
-            <c-col :span="12">
-                <el-form-item
-                style="height=200px;"
-                    label="General"
-                    prop="mtabut.coninf.oitinf.oit.inftxt"
-                >
-                    <c-input
-                        type="textarea"
-                        v-model="model.mtabut.coninf.oitinf.oit.inftxt"
-                        maxlength="60"
-                        :autosize="{ minRows: 4, maxRows: 6 }"
-                        show-word-limit
-                        placeholder="请输入Infotext"
-                    ></c-input>
-                </el-form-item>
-            </c-col>
-        </c-col>
-        <c-col :span="24">
-        <c-col :span="6">
-                <el-form-item
-                    label="Display Type"
-                    prop="mtabut.coninf.oitinf.oit.inflev"
-                >
-                    <c-select
-                        v-model="model.mtabut.coninf.oitinf.oit.inflev"
-                        style="width: 100%"
-                        disabled
-                        placeholder="请选择Infotext Level"
-                    >
-                        <el-option
-                            v-for="item in codes.inflev"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </c-select>
-                </el-form-item>
-            </c-col>
-            </c-col>
-
-        <c-col :span="24">
-            <c-col :span="12">
-                <el-form-item
-                    label="Settlement"
-                    prop="mtabut.coninf.oitset.oit.inftxt"
-                >
-                    <c-input
-                        type="textarea"
-                        v-model="model.mtabut.coninf.oitset.oit.inftxt"
-                        maxlength="60"
-                        :autosize="{ minRows: 4, maxRows: 6 }"
-                        show-word-limit
-                        placeholder="请输入Infotext"
-                    ></c-input>
-                </el-form-item>
-            </c-col>
-        </c-col>
-        <c-col :span="24">
-            <c-col :span="6">
-                <el-form-item
-                    label="Display Type"
-                    prop="mtabut.coninf.oitset.oit.inflev"
-                >
-                    <c-select
-                        v-model="model.mtabut.coninf.oitset.oit.inflev"
-                        style="width: 100%"
-                        disabled
-                        placeholder="请选择Infotext Level"
-                    >
-                        <el-option
-                            v-for="item in codes.inflev"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </c-select>
-                </el-form-item>
-            </c-col>
-            </c-col>
-
-        <c-col :span="6">
-            <el-form-item label="执行日期" prop="mtabut.coninf.conexedat">
-                <el-date-picker
-                    type="date"
-                    v-model="model.mtabut.coninf.conexedat"
-                    style="width: 100%"
-                    placeholder="请选择执行日期"
-                ></el-date-picker>
-            </el-form-item>
-        </c-col>
-
-        <c-col :span="6" style="text-align:right">
-            <el-form-item
-                label="Send for Release to"
-                prop="mtabut.coninf.usr.extkey"
-                label-width="140px"
-            >
-                <c-input
-                    v-model="model.mtabut.coninf.usr.extkey"
-                    maxlength="8"
-                    style="width: 100%"
-                    disabled="disabled"
-                    placeholder="请输入User ID"
-                ></c-input>
-            </el-form-item>
-        </c-col>
-    </c-row>
-</template>
-<script>
-import CommonProcess from "~/mixin/CommonProcess";
-import Event from "~/model/Ditopn/Event";
-
-export default {
-    inject: ['root'],
-    props: ["model", "codes"],
-    mixins: [CommonProcess],
-    data() {
-        return {};
-    },
-    methods: { ...Event },
-    created: function () {},
-};
-</script>
-<style>
-</style>

src/views/Business/Ditopn/Engp.vue

-<template>
-  <div class="eibs-tab">
-    <!-- <c-col :span="24" style="margin-bottom:18px">
-        Liability
-    </c-col> -->
-    <c-col :span="23" style="margin-left:9px">
-      <c-table :list="model.liaall.liaallg" style="width:80%,text-align:center,margin-bottom:18px" :border="true">
-        <el-table-column prop="bussec" label="BS" width="40px"> </el-table-column>
-        <el-table-column prop="cbtpfx" label="Type" width="60px"> </el-table-column>
-        <el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column>
-        <el-table-column prop="tenday" label="Tenor" width="70px"> </el-table-column>
-        <el-table-column prop="rol" label="Dbt." width="70px"> </el-table-column>
-        <el-table-column prop="nam" label="Name" width="170px"> </el-table-column>
-        <el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
-        <el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
-        <el-table-column prop="oldamt" label="Old Amount" width="150px">
-         <!-- <template slot-scope="scope">
-                  {{moneyFormat(scope.row.oldamt)}}
-         </template> -->
-        </el-table-column>
-        <el-table-column prop="amt" label="Booking Amo" width="100px">
-        <!-- <template slot-scope="scope">
-                  {{moneyFormat(scope.row.amt)}}
-         </template> -->
-         </el-table-column>
-        <el-table-column prop="tenpct" label="%" width="80px"> 
-        </el-table-column>
-        <el-table-column prop="acc" label="Account" width="150px"> </el-table-column>
-        <el-table-column prop="valdat" label="Value Date" width="200px">
-         <!-- <template slot-scope="scope">
-                  {{dateFormat(scope.row.valdat)}}
-         </template> -->
-        </el-table-column>
-        <el-table-column label="" prop="det" width="80px">
-                    <template slot-scope="scope" slot="header">
-                        <el-button
-                            circle
-                            style="padding:4px"
-                            class="el-icon-plus"
-                            size="mini"
-                            @click="addRow(scope)"
-                        >
-                        </el-button>
-                        <el-button
-                            style="padding:4px"
-                            circle
-                            class="el-icon-minus"
-                            size="mini"
-                            @click="removeRow(scope)"
-                        >
-                        </el-button>
-                    </template>
-                    <template slot-scope="scoped">
-                        <el-button
-                            style="margin-left:0"
-                            size="small"
-                            type="primary"
-                            @click="detail1(scoped.$index, scoped.row)"
-                            >详情</el-button
-                        >
-                    </template>
-                </el-table-column>
-      </c-table>
-    </c-col>
-                                                                
-       <!-- <c-col :span="12">
-        <el-form-item label="Sight Amount">
-            <c-input style="width:50%"  v-model="model.liaall.outamt"  placeholder="请输入Sight Amount"></c-input>
-        </el-form-item>
-       </c-col>                 
-                  
-       <c-col :span="12">
-        <el-form-item label="Sight Amount Percentage">
-            <c-input style="width:50%"  v-model="model.liaall.outpct"  placeholder="请输入Sight Amount Percentage"></c-input>
-        </el-form-item>
-       </c-col>             
-                                                    
-       <c-col :span="12">
-        <el-form-item label="External Booking Amount">
-            <c-input style="width:70%"  v-model="model.liaall.concur" maxlength="3"  placeholder="请输入External Booking Amount"></c-input>
-        </el-form-item>
-       </c-col>              -->
-                  
-       <c-col :span="16" style="margin-top:10px">
-        <el-form-item label="Amount not yet assigned">
-            <c-input style="width:15%" disabled  v-model="model.liaall.concur" maxlength="3"  placeholder="请输入External Booking Amount"></c-input>
-            <c-input style="width:40%" disabled v-model="model.liaall.misamt"  placeholder="请输入Amount not yet assigned"></c-input>
-            <c-button style="width:20%" size="small" disabled type="primary"  @click="onLiaallButmisamt">
-                Add to Current Line
-            </c-button>
-        </el-form-item>
-       </c-col>                 
-                  
-       <!-- <c-col :span="1" style="text-align:left;margin-left:0">
-           <el-form-item label="">
-            <c-button size="small" disabled type="primary"  @click="onLiaallButmisamt">
-                Add to Current Line
-            </c-button>
-           </el-form-item>
-       </c-col> -->
-                  
-       <!-- <c-col :span="12">
-        <el-form-item label="">
-            <c-button size="small" type="primary"  @click="onLiaallButmissig">
-                Add to Sight Amount
-            </c-button>
-        </el-form-item>
-       </c-col>
-                                   
-       <c-col :span="12">
-        <el-form-item label="Old Amount booked externally">
-            <c-input style="width:50%"  v-model="model.liaall.exttotoldamt"  placeholder="请输入Old Amount booked externally"></c-input>
-        </el-form-item>
-       </c-col>                 
-                                   
-       <c-col :span="12">
-        <el-form-item label="Total booking amount external assinged">
-            <c-input style="width:50%"  v-model="model.liaall.exttotamt"  placeholder="请输入Total booking amount external assinged"></c-input>
-        </el-form-item>
-       </c-col>                  -->
-                   </div>
-</template>
-<script>
-import Api from "~/service/Api"
-import CommonProcess from "~/mixin/CommonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Ditopn/Event"
-
-export default {
-    inject: ['root'],
-    mixins: [CommonProcess],
-    props:["model","codes"],
-    data(){
-        return {
-
-        }
-    },
-    methods:{...Event},
-    created:function(){
-
-    }
-}
-</script>
-<style>
-
-</style>

src/views/Business/Ditopn/index.vue

@@ -145,15 +145,15 @@ import Mt799 from "./Mt799";
 import Litbenl1 from "./Litbenl1";
 import Litapll1 from "./Litapll1";
 import Litrmbl1 from "./Litrmbl1";
-import Engp from "./Engp";
 import Addbcb from "./Addbcb";
-import Limitbody from "./Limitbody";
-import Coninfp from "./Coninfp";
 
-import Ccvpan from "~/views/Public/Ccvpan";
-import Glepan from "~/views/Public/Glepan";
 import Setpan from "~/views/Public/Setpan";
+import Glepan from "~/views/Public/Glepan";
+import Engp from "~/views/Public/Engp";
+import Ccvpan from "~/views/Public/Ccvpan";
+import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/views/Public/Docpan";
+import Limitbody from "~/views/Public/Limitbody";
 
 export default {
   name: 'Ditopn',

src/views/Business/Sptsel/Menu.vue

@@ -79,8 +79,8 @@
               </el-form-item>
             </c-col>
             <c-col :span="8" v-show="searchSlot.searchToggle">
-              <el-form-item label="来源" style="width: 100%">
-                <c-select
+              <el-form-item label="来源" style="width: 100%" prop="sourceModel">
+                <el-select
                   v-model="sourceModel"
                   style="width: 70%"
                   placeholder="请选择来源"
@@ -94,7 +94,7 @@
                     :value="item.value"
                   >
                   </el-option>
-                </c-select>
+                </el-select>
               </el-form-item>
             </c-col>
           </el-row>
@@ -184,12 +184,15 @@
                 </el-form-item>
             </c-col>
 
-            <c-col :span="8" v-if="model.usfmod.flt==='<SELB>'">
+            <c-col :span="8" v-else-if="model.usfmod.flt==='<SELB>'">
                 <el-form-item label="归属机构" style="width:100%">
                     <c-input></c-input>
                 </el-form-item>
             </c-col>
-
+            <c-col :span="8" v-else>
+                <el-form-item label="" style="width:100%;height: 36.8px;margin:0 0 0 0">
+                </el-form-item>
+            </c-col>
               
               <!-- <c-col :span="12" style="text-align:center" >
                             <c-checkbox v-model="model.chkypt">云平台</c-checkbox>
@@ -273,7 +276,7 @@
       </c-col> -->
       <c-col :span="24">
         <c-istream-table :list="stmData.data" :columns="stmData.columns">
-          <el-table-column fixed="right" prop="op" label="OP" width="200px">
+          <el-table-column fixed="right" prop="op" label="OP" width="140px">
             <template>
               <c-button
                 style="margin-left: 0"
@@ -348,7 +351,7 @@ export default {
   mixins: [CommonProcess],
   data() {
     return {
-      sourceModel: "",
+      //sourceModel: [],
       sourceData: [
         { label: "Incoming", value: "chkinc" },
         { label: "E-Trade", value: "chkdzt" },
@@ -372,26 +375,26 @@ export default {
       stmData: {
         columns: [
           '4 1 "交易代码" 70 ',
-          '5 2 "业务编号" 120',
-          '6 3 "交易名称" 110',
+          '5 2 "业务编号" 230',
+          '6 3 "交易名称" 140',
           '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
-          '18 5 "报文类型" 100',
-          '19 6 "对方银行BIC" 90',
-          '7 7 "创建时间" 101 20 DateTime 1',
-          '20 8 "币种" 50',
-          '21 9 "金额" 69 2 8 1 16',
+          '17 5 "报文类型" 100',
+          '18 6 "对方银行BIC" 110',
+          '7 7 "创建时间" 160 20 DateTime 1',
+          '19 8 "币种" 50',
+          '20 9 "金额" 69 2 8 1 16',
 
           // "20 7 \"Cur\" 30",
           // "21 8 \"Amt\" 69 2 8 1 16",
           // "1 9 \"Status\" 60 1 tdViewTypeEdit:0 1 SPT:STA",
           '8 10 "创建人" 80',
-          '15 11 "Work User" 90',
-          '17 12 "Work Branch" 126',
-          '16 13 "Last User" 76',
-          '1 14 "来源" 50', //新加列，值暂设为第一个
+          '3 11 "当前操作柜员" 100',
+          '3 12 "当前组别" 100',
+          '3 13 "上次操作柜员" 100',
+          '3 14 "来源" 50',
           '3 15 "提示" 50 1 20:0 1 FormatINFDSP',
           // "19 15 \"Key\" 90",
-          '10 16 "提示信息" 300',
+          '3 16 "提示信息" 300',
         ],
         data: [],
       },
@@ -462,7 +465,30 @@ export default {
         this.model.chkcan = val ? "t" : "";
       },
     },
+    sourceModel:{
+      get(){
+        let arr = [];
+        this.sourceData.forEach(element => {
+          if(this.model[element.value]){
+            arr.push(element.value);
+          }
+        });
+        return arr;
+      },
+      set(val){
+        let set = new Set(val);
+        this.sourceData.forEach(element => {
+          if(set.has(element.value)){
+            this.model[element.value]=true;
+          }
+          else{
+            this.model[element.value]=false;
+          }
+        });
+      }
+    }
   },
+
   methods: { ...Event },
   created: function () {},
 };

src/views/Business/Trnrel/index.vue

 <template>
     <div class="eContainer">
-        <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" :validate-on-rule-change="false" label-width="170px" size="small">
+        
+        <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" :validate-on-rule-change="false" label-width="150px" size="small" >
             <!-- <el-tabs ref="elment" type="card" @tab-click="tabClick">
                 <el-tab-pane label="复核夹查询"> -->
+                    <c-content>
                         <m-inftrnps :model="model" :codes="codes" ref="inftrnps" />
+                    </c-content>
                 <!-- </el-tab-pane>
             </el-tabs> -->
 

src/views/Home/cells/CustomerAnalyse.vue

@@ -56,7 +56,7 @@ export default {
           "盛世饮料",
           "中国华润总公司",
           "东风汽车公司",
-          "万科",
+          "万科集团",
           "万康食品",
         ],
       },

src/views/Layout/Header.vue

 <template>
   <div class="self-header">
     <div style="display: inline-block;margin: 5px 15px 5px 0;height: 50px;">
-      <img src="../../assets/logo.png" alt="" style="height: 100%;"/>
+      <img src="../../assets/logo.png" alt="" style="height: 100%;" />
     </div>
     <div class="self_header_label">
       <h2>新一代银行国际结算系统</h2>
@@ -68,14 +68,20 @@
         placement="bottom"
         width="80"
         trigger="hover"
+        v-model="langSelectVisible"
       >
         <ul class="header-tool-item-list">
-          <li @click="handleLangCn">中文</li>
-          <li @click="handleLangEn">English</li>
+          <li
+            v-for="(item, idx) in languageOptions"
+            :key="idx"
+            @click="handleLang(item.lang)"
+          >
+            {{ item.fullName }}
+          </li>
         </ul>
         <div class="header-tool-item header-tool-item-text" slot="reference">
           <i class="el-icon-setting" style="font-size:14px;"></i>
-          {{ lang == "cn" ? "中文" : "En" }}
+          {{ displayLangName }}
           <i class="el-icon-arrow-down" style="font-size:12px;"></i>
         </div>
       </el-popover>
@@ -85,9 +91,18 @@
             <el-col :span="24">
               <c-page title="公告">
                 <c-table :data="noticeboardData">
-									<el-table-column label="公告内容" prop="noticeContent"></el-table-column>
-									<el-table-column label="发布人" prop="publisher"></el-table-column>
-									<el-table-column label="发布日期" prop="publishDate"></el-table-column>
+                  <el-table-column
+                    label="公告内容"
+                    prop="noticeContent"
+                  ></el-table-column>
+                  <el-table-column
+                    label="发布人"
+                    prop="publisher"
+                  ></el-table-column>
+                  <el-table-column
+                    label="发布日期"
+                    prop="publishDate"
+                  ></el-table-column>
                 </c-table>
               </c-page>
             </el-col>
@@ -95,7 +110,9 @@
         </div>
         <div class="header-tool-item" slot="reference">
           <i class="el-icon-bell"></i>
-          <span class="header-tool-item-text" style="padding-left:7px;">通知</span>
+          <span class="header-tool-item-text" style="padding-left:7px;"
+            >通知</span
+          >
         </div>
       </el-popover>
       <span class="header-tool-item-text">会计日期: {{ accDate }}</span>
@@ -104,12 +121,11 @@
 </template>
 
 <script>
-import cPage from '../../components/c-page.vue';
+import cPage from "../../components/c-page.vue";
 export default {
   components: { cPage },
   data() {
     return {
-      lang: this.$store.state.I18n.lang,
       txName: "",
       user: {
         userName: this.$store.state.UserContext.userName || "Admin",
@@ -125,7 +141,12 @@ export default {
       loading: false,
       count: "",
       accDate: window.sessionStorage.accDate || "",
-			noticeboardData: []
+      noticeboardData: [],
+      langSelectVisible: false,
+      languageOptions: [
+        { lang: "zh", shortName: "中文", fullName: "中文" },
+        { lang: "en", shortName: "En", fullName: "English" },
+      ],
     };
   },
   computed: {
@@ -135,19 +156,28 @@ export default {
       // return subStrList[length - 1];
       return "北京分行";
     },
+    lang() {
+      return this.$store.state.I18n.lang;
+    },
+    displayLangName() {
+      for (let i = 0; i < this.languageOptions.length; i++) {
+        const op = this.languageOptions[i];
+        if (this.lang === op.lang) {
+          return op.shortName;
+        }
+      }
+      return "";
+    },
   },
   methods: {
     logout() {
       this.$store.commit("UserContext/setLogout");
       this.$router.push("/login");
     },
-    handleLangCn() {
-      this.$store.commit("I18n/setLang", "cn");
-      this.lang = "cn";
-    },
-    handleLangEn() {
-      this.$store.commit("I18n/setLang", "en");
-      this.lang = "en";
+    handleLang(lang) {
+      this.$i18n.locale = lang;
+      this.$store.dispatch("I18n/setLang", lang);
+      this.langSelectVisible = false;
     },
     showLogoutDialog(flg) {
       this.$refs.logoutform.show(flg);

src/views/Layout/SideMenu.vue

@@ -58,6 +58,7 @@ export default {
         { inifrm: "ditsel", ininam: "信用证查询", pntmiu: "2" },
         { inifrm: "infbdd", ininam: "买方信用证单据查询", pntmiu: "2" },
         { inifrm: "bdtudp", ininam: "国内证承兑", pntmiu: "2" },
+        { inifrm: "bdtdcr", ininam: "国内证不符点/拒付", pntmiu: "2" },
         { inifrm: "3", ininam: "出口信用证", pntmiu: "", icon: require("~/assets/icons/sideMenu/出口信用证.svg") },
         //{ inifrm: "3", ininam: "出口信用证", pntmiu: "" },
         { inifrm: "letsel", ininam: "出口信用证查询", pntmiu: "3" },

src/views/Layout/components/TagsView/index.vue

@@ -30,12 +30,12 @@
       :style="{ left: left + 'px', top: top + 'px' }"
       class="contextmenu"
     >
-      <li @click="refreshSelectedTag(selectedTag)">刷新</li>
+      <li @click="refreshSelectedTag(selectedTag)">{{ $t('tagsView.refresh') }}</li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
-        关闭
+        {{ $t('tagsView.close') }}
       </li>
-      <li @click="closeOthersTags">关闭其他</li>
-      <li @click="closeAllTags(selectedTag)">关闭所有</li>
+      <li @click="closeOthersTags">{{ $t('tagsView.closeOthers') }}</li>
+      <li @click="closeAllTags(selectedTag)">{{ $t('tagsView.closeAll') }}</li>
     </ul>
   </div>
 </template>
@@ -226,7 +226,6 @@ export default {
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
   /* box-sizing: inherit; */
   /* padding-top: 5px; */
-  /* padding-bottom: 5px; */
   padding-bottom: 1px;
 }
 

src/views/Login/index.vue

@@ -50,7 +50,7 @@ const { setLoginInfo } = mapMutations(["setLoginInfo"])
         this.$refs[formName].validate((valid) => {
           if (valid) {
             this.setLoginInfo({userId:this.loginForm.username})
-            this.$router.push("/business/office");
+            this.$router.push("/home");
           } else {
             console.log('error submit!!');
             return false;

src/views/Public/Ccvpan.vue

@@ -242,7 +242,7 @@
         </el-table-column>
         <el-table-column prop="acccovamt" label="Acc Amount" width="150px">
         </el-table-column>
-        <el-table-column label="OP" width="75px">
+        <el-table-column label="OP" width="75px" fixed="right">
           <template slot-scope="scope">
             <c-button style="margin-left:0" type="primary" size="small" @click="onLiaccvDel(scope.$index,scope.row)">
             Del</c-button>

src/views/Public/Coninfp.vue

 <template>
     <c-row>
         <c-col :span="24">
-      <c-col :span="15">
+            <c-col :span="12">
                 <el-form-item
                 style="height=200px;"
                     label="General"
@@ -9,81 +9,101 @@
                 >
                     <c-input
                         type="textarea"
-            :rows="6"
-            @change="valueChange($event, 'mtabut.coninf.oitinf.oit.inflev')"
                         v-model="model.mtabut.coninf.oitinf.oit.inftxt"
                         maxlength="60"
-            resize="none"
+                        :autosize="{ minRows: 4, maxRows: 6 }"
                         show-word-limit
                         placeholder="请输入Infotext"
                     ></c-input>
                 </el-form-item>
             </c-col>
-
-      <c-col :span="7" :offset="1">
+        </c-col>
+        <c-col :span="24">
+        <c-col :span="6">
                 <el-form-item
                     label="Display Type"
                     prop="mtabut.coninf.oitinf.oit.inflev"
                 >
                     <c-select
                         v-model="model.mtabut.coninf.oitinf.oit.inflev"
-            :disabled="model.mtabut.coninf.oitinf.oit.inftxt ? false : true"
+                        style="width: 100%"
+                        disabled
                         placeholder="请选择Infotext Level"
-            :code="inflev"
                     >
+                        <el-option
+                            v-for="item in codes.inflev"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </el-option>
                     </c-select>
                 </el-form-item>
             </c-col>
             </c-col>
 
         <c-col :span="24">
-      <c-col :span="15">
-        <el-form-item label="Settlement" prop="mtabut.coninf.oitset.oit.inftxt">
+            <c-col :span="12">
+                <el-form-item
+                    label="Settlement"
+                    prop="mtabut.coninf.oitset.oit.inftxt"
+                >
                     <c-input
                         type="textarea"
-            :rows="6"
-            @change="valueChange($event, 'mtabut.coninf.oitset.oit.inflev')"
                         v-model="model.mtabut.coninf.oitset.oit.inftxt"
                         maxlength="60"
-            resize="none"
+                        :autosize="{ minRows: 4, maxRows: 6 }"
                         show-word-limit
                         placeholder="请输入Infotext"
                     ></c-input>
                 </el-form-item>
             </c-col>
-
-      <c-col :span="7" :offset="1">
+        </c-col>
+        <c-col :span="24">
+            <c-col :span="6">
                 <el-form-item
                     label="Display Type"
                     prop="mtabut.coninf.oitset.oit.inflev"
                 >
                     <c-select
                         v-model="model.mtabut.coninf.oitset.oit.inflev"
-            :disabled="model.mtabut.coninf.oitset.oit.inftxt ? false : true"
+                        style="width: 100%"
+                        disabled
                         placeholder="请选择Infotext Level"
-            :code="inflev"
                     >
+                        <el-option
+                            v-for="item in codes.inflev"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </el-option>
                     </c-select>
                 </el-form-item>
             </c-col>
             </c-col>
 
-    <c-col :span="11">
+        <c-col :span="6">
             <el-form-item label="执行日期" prop="mtabut.coninf.conexedat">
                 <el-date-picker
                     type="date"
                     v-model="model.mtabut.coninf.conexedat"
-          style="width: 50%"
+                    style="width: 100%"
                     placeholder="请选择执行日期"
                 ></el-date-picker>
             </el-form-item>
         </c-col>
 
-    <c-col :span="7" :offset="5">
-      <el-form-item label="Send for Release to" prop="mtabut.coninf.usr.extkey">
+        <c-col :span="6" style="text-align:right">
+            <el-form-item
+                label="Send for Release to"
+                prop="mtabut.coninf.usr.extkey"
+                label-width="140px"
+            >
                 <c-input
                     v-model="model.mtabut.coninf.usr.extkey"
                     maxlength="8"
+                    style="width: 100%"
                     disabled="disabled"
                     placeholder="请输入User ID"
                 ></c-input>
@@ -93,29 +113,16 @@
 </template>
 <script>
 import CommonProcess from "~/mixin/CommonProcess";
-import _ from "~/utils/Lodash.js";
-// zxk 附言页签
+import Event from "~/model/Ditopn/Event";
+
 export default {
-  inject: ["root"],
+    inject: ['root'],
     props: ["model", "codes"],
     mixins: [CommonProcess],
     data() {
-    return {
-      inflev: [
-        { label: "Show", value: "$" },
-        { label: "Do not show", value: "!" },
-        { label: "Warn", value: "0" },
-      ], //码表
-    };
-  },
-  methods: {
-    valueChange(event, type) {
-      if (!event) {
-        _.set(this.model, type, "");
-      }
+        return {};
     },
-  },
-
+    methods: { ...Event },
     created: function () {},
 };
 </script>

src/views/Public/Docpan.vue

@@ -130,7 +130,7 @@
                     </c-select>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="115px">
+            <el-table-column label="操作" width="115px" fixed="right">
                 <template slot-scope="scope">
                     <el-button
                         type="primary"

src/views/Public/Engp.vue

 <template>
-  <div class="eibs-tab" style="margin: 0 10px">
-    <c-col :span="24" style="margin-bottom: 1px"> Liability </c-col>
-    <c-col :span="24">
-      <c-table
-        :list="model.liaall.liaallg"
-        style="width:80%,text-align:center,margin-bottom:18px"
-        :border="true"
-      >
-        <el-table-column prop="cbtpfx" label="Type" width="auto">
-        </el-table-column>
-        <el-table-column prop="matdat" label="Maturity" width="auto">
-        </el-table-column>
-        <el-table-column prop="tenday" label="Tenor" width="auto">
+  <div class="eibs-tab">
+    <!-- <c-col :span="24" style="margin-bottom:18px">
+        Liability
+    </c-col> -->
+    <c-col :span="23" style="margin-left:9px">
+      <c-table :list="model.liaall.liaallg" style="width:80%,text-align:center,margin-bottom:18px" :border="true">
+        <el-table-column prop="bussec" label="BS" width="40px"> </el-table-column>
+        <el-table-column prop="cbtpfx" label="Type" width="60px"> </el-table-column>
+        <el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column>
+        <el-table-column prop="tenday" label="Tenor" width="70px"> </el-table-column>
+        <el-table-column prop="rol" label="Dbt." width="70px"> </el-table-column>
+        <el-table-column prop="nam" label="Name" width="170px"> </el-table-column>
+        <el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
+        <el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
+        <el-table-column prop="oldamt" label="Old Amount" width="150px">
+         <!-- <template slot-scope="scope">
+                  {{moneyFormat(scope.row.oldamt)}}
+         </template> -->
         </el-table-column>
-        <el-table-column prop="rol" label="Dbt." width="auto">
+        <el-table-column prop="amt" label="Booking Amo" width="100px">
+        <!-- <template slot-scope="scope">
+                  {{moneyFormat(scope.row.amt)}}
+         </template> -->
          </el-table-column>
-        <el-table-column prop="nam" label="Name" width="auto">
+        <el-table-column prop="tenpct" label="%" width="80px"> 
         </el-table-column>
-        <el-table-column prop="cdtrol" label="Cdt." width="auto">
+        <el-table-column prop="acc" label="Account" width="150px"> </el-table-column>
+        <el-table-column prop="valdat" label="Value Date" width="200px">
+         <!-- <template slot-scope="scope">
+                  {{dateFormat(scope.row.valdat)}}
+         </template> -->
         </el-table-column>
-        <el-table-column prop="cur" label="Cur" width="auto"> </el-table-column>
-        <el-table-column prop="oldamt" label="Old Amount" width="auto">
-          <template slot-scope="scope">
-            {{ moneyFormat(scope.row.oldamt) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="amt" label="Booking Amo" width="auto">
-          <template slot-scope="scope">
-            {{ moneyFormat(scope.row.amt) }}
+        <el-table-column label="" prop="det" width="80px" fixed="right">
+                    <template slot-scope="scope" slot="header">
+                        <el-button
+                            circle
+                            style="padding:4px"
+                            class="el-icon-plus"
+                            size="mini"
+                            @click="addRow(scope)"
+                        >
+                        </el-button>
+                        <el-button
+                            style="padding:4px"
+                            circle
+                            class="el-icon-minus"
+                            size="mini"
+                            @click="removeRow(scope)"
+                        >
+                        </el-button>
                     </template>
-        </el-table-column>
-        <el-table-column prop="tenpct" label="%" width="auto">
-        </el-table-column>
-        <el-table-column prop="acc" label="Account" width="auto">
-        </el-table-column>
-        <el-table-column prop="valdat" label="Value Date" width="auto">
-          <template slot-scope="scope">
-            {{ dateFormat(scope.row.valdat) }}
+                    <template slot-scope="scoped">
+                        <el-button
+                            style="margin-left:0"
+                            size="small"
+                            type="primary"
+                            @click="detail1(scoped.$index, scoped.row)"
+                            >详情</el-button
+                        >
                     </template>
                 </el-table-column>
       </c-table>
     </c-col>
                                                                 
+       <!-- <c-col :span="12">
+        <el-form-item label="Sight Amount">
+            <c-input style="width:50%"  v-model="model.liaall.outamt"  placeholder="请输入Sight Amount"></c-input>
+        </el-form-item>
+       </c-col>                 
+                  
        <c-col :span="12">
-      <el-form-item label="Amount not yet assigned">
-        <c-input
-          style="width: 20%"
-          disabled
-          v-model="model.liaall.concur"
-          maxlength="3"
-          placeholder="请输入External Booking Amount"
-        ></c-input>
-        <c-input
-          style="width: 50%"
-          disabled
-          v-model="model.liaall.misamt"
-          placeholder="请输入Amount not yet assigned"
-        ></c-input>
+        <el-form-item label="Sight Amount Percentage">
+            <c-input style="width:50%"  v-model="model.liaall.outpct"  placeholder="请输入Sight Amount Percentage"></c-input>
         </el-form-item>
        </c-col>             
                                                     
        <c-col :span="12">
+        <el-form-item label="External Booking Amount">
+            <c-input style="width:70%"  v-model="model.liaall.concur" maxlength="3"  placeholder="请输入External Booking Amount"></c-input>
+        </el-form-item>
+       </c-col>              -->
+                  
+       <c-col :span="16" style="margin-top:10px">
+        <el-form-item label="Amount not yet assigned">
+            <c-input style="width:15%" disabled  v-model="model.liaall.concur" maxlength="3"  placeholder="请输入External Booking Amount"></c-input>
+            <c-input style="width:40%" disabled v-model="model.liaall.misamt"  placeholder="请输入Amount not yet assigned"></c-input>
+            <c-button style="width:20%" size="small" disabled type="primary"  @click="onLiaallButmisamt">
+                Add to Current Line
+            </c-button>
+        </el-form-item>
+       </c-col>                 
+                  
+       <!-- <c-col :span="1" style="text-align:left;margin-left:0">
            <el-form-item label="">
-        <c-button
-          size="small"
-          disabled
-          type="primary"
-          @click="onLiaallButmisamt"
-        >
+            <c-button size="small" disabled type="primary"  @click="onLiaallButmisamt">
                 Add to Current Line
             </c-button>
            </el-form-item>
+       </c-col> -->
+                  
+       <!-- <c-col :span="12">
+        <el-form-item label="">
+            <c-button size="small" type="primary"  @click="onLiaallButmissig">
+                Add to Sight Amount
+            </c-button>
+        </el-form-item>
        </c-col>
+                                   
+       <c-col :span="12">
+        <el-form-item label="Old Amount booked externally">
+            <c-input style="width:50%"  v-model="model.liaall.exttotoldamt"  placeholder="请输入Old Amount booked externally"></c-input>
+        </el-form-item>
+       </c-col>                 
+                                   
+       <c-col :span="12">
+        <el-form-item label="Total booking amount external assinged">
+            <c-input style="width:50%"  v-model="model.liaall.exttotamt"  placeholder="请输入Total booking amount external assinged"></c-input>
+        </el-form-item>
+       </c-col>                  -->
                    </div>
 </template>
 <script>
-import Api from "~/service/Api";
+import Api from "~/service/Api"
 import CommonProcess from "~/mixin/CommonProcess";
-import CodeTable from "~/config/CodeTable";
-import Event from "~/model/Ditopn/Event";
+import CodeTable from "~/config/CodeTable"
+import Event from "~/model/Ditopn/Event"
 
 export default {
-  inject: ["root"],
+    inject: ['root'],
     mixins: [CommonProcess],
-  props: ["model", "codes"],
-  data() {
-    return {};
+    props:["model","codes"],
+    data(){
+        return {
+
+        }
     },
-  methods: { ...Event },
-  created: function () {},
-};
+    methods:{...Event},
+    created:function(){
+
+    }
+}
 </script>
 <style>
+
 </style>

src/views/Public/Setpan.vue

@@ -149,7 +149,7 @@
                 </el-table-column>
                 <el-table-column label="Amount" prop="amt" width="150px">
                 </el-table-column>
-                <el-table-column label="" prop="det" width="80px">
+                <el-table-column label="" prop="det" width="80px" fixed="right">
                     <template slot-scope="scope" slot="header">
                         <el-button
                             circle
@@ -312,7 +312,7 @@
                 </el-table-column>
                 <el-table-column label="Fee Amount" prop="amt" width="150px">
                 </el-table-column>
-                <el-table-column label="" prop="det" width="80px">
+                <el-table-column label="" prop="det" width="80px" fixed="right">
                      <template slot-scope="scope" slot="header">
                         <el-button
                             circle
@@ -419,7 +419,7 @@
                 </el-table-column>
                 <el-table-column label="Rate" prop="rat" width="120px">
                 </el-table-column>
-                <el-table-column label="" width="80px"> 
+                <el-table-column label="" width="80px" fixed="right"> 
                     <template>
                         <el-button
                             style="margin-left:0"

src/views/TaskList/index.vue

@@ -58,6 +58,6 @@ export default {
 
 <style scoped>
 .eContainer-taskList {
-  padding: 3px 10px;
+  padding: 3px 15px;
 }
 </style>