Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/config/CodeTable/index.js

src/config/CodeTable/index.js

@@ -5736,6 +5736,49 @@ const CodeTable = {
 		{label:"需要加押的SWIFT报文（MT999）",value:"M"},
 		{label:"需要加押的TELEX报文",value:"T"},
 		// {label:"正常",value:"N"}
+	],
+	setfeldsp: [
+		{ label: "P 下收", value: "P" },
+		{ label: "X 现收", value: "X" }
+	],
+	setglldsp: [
+		{ label: "贷记暂收款项帐", value: "ARC" },
+		{ label: "借记暂收款项帐", value: "ARD" },
+		{ label: "出口贴现/买入票据帐", value: "BDF" },
+		{ label: "出口押汇帐", value: "BEF" },
+		{ label: "进出口垫款帐", value: "BRF" },
+		{ label: "借记客户保证金帐", value: "CCD" },
+		{ label: "贷记客户保证金帐", value: "CCC" },
+		{ label: "借记清算汇入帐", value: "CID" },
+		{ label: "贷记清算汇出帐", value: "COC" },
+		{ label: "贷记金融股机构存款", value: "FIC" },
+		{ label: "借记金融机构存款", value: "FID" },
+		{ label: "利息收入帐", value: "INC" },
+		{ label: "借记客户往来帐", value: "LOD" },
+		{ label: "贷记客户往来帐", value: "LOC" },
+		{ label: "第三方风险参贷帐", value: "NFR" },
+		{ label: "借记存放上级/国外帐", value: "NOD" },
+		{ label: "贷记存放上级/国外帐", value: "NOC" },
+		{ label: "贷记国结专户", value: "SPC" },
+		{ label: "借记国结专户", value: "SPD" },
+		{ label: "贷记国际结算临时帐", value: "TPC" },
+		{ label: "借记国际结算临时帐", value: "TPD" },
+		{ label: "信托收据/进口押汇帐", value: "TRF" },
+		{ label: "打包贷款帐（已取消）", value: "PCF" },
+		{ label: "通过Nostro付款", value: "PAC" },
+		{ label: "贷记其他保证金帐", value: "SCC" },
+		{ label: "国结系统融资过渡帐", value: "BF" }
+	],
+	setfelRol: [
+		{ label: "ISS Issuing Bank", value: "APL" }
+	],
+	ptydbt: [
+		{ label: "OWN Ourselves", value: "OWN" },
+		{ label: "ISS issuing Bank", value: "ISS" }
+	],
+	Payee: [
+		{ label: "OWN Ourselves", value: "OWN" },
+		{ label: "ISS issuing Bank", value: "ISS" }
 	]
 
 }

src/model/Ditopn/Pattern.js

@@ -415,21 +415,23 @@ export default {
         { type: "string", required: false, message: "必输项" },
         { max: 35, message: "长度不能超过35" }
     ],
+    "didgrp.cmb.pts.bankno": [
+        { type: "string", required: false, message: "必输项" },
+        { max: 20, message: "长度不能超过20" }
+    ],
+    // 申请行
     "didgrp.apc.pts.bankno": [
         { type: "string", required: false, message: "必输项" },
         { max: 20, message: "长度不能超过20" }
     ],
 
     "didgrp.apc.pts.jigomc": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
-    ],
-    "didgrp.cmb.pts.bankno": [
         { type: "string", required: false, message: "必输项" },
-        { max: 20, message: "长度不能超过20" }
+        { max: 35, message: "长度不能超过35" }
     ],
+
     "didgrp.apc.pts.dizhii": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 35, message: "长度不能超过35" }
     ],
     "didgrp.apc.pts.youzbm": [

src/views/Business/Ditopn/Docpan.vue

@@ -68,6 +68,7 @@
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
+                    :disabled="model.trnmod.trndoc.doceot[scope.row.index].apf=='SWT001'&&model.didgrp.iss.pts.bankno==model.didgrp.adv.pts.bankno"
                     @click="handleDisplay(scope.row.index, scope.row)">显示</el-button>
                     <el-button
                     size="mini"

src/views/Business/Ditopn/index.vue

@@ -150,31 +150,7 @@ export default {
            defaultRules: Default,
            pattern: Pattern,
            rules:null,
-           codes:{
-               cur:CodeTable.cur,
-               mylx:CodeTable.mylx,
-               mytype:CodeTable.mytype,
-               elcflg:CodeTable.elcflg,
-               dkflg:CodeTable.dkflg,
-               guaflg:CodeTable.guaflg,
-               jyqflg:CodeTable.jyqflg,
-               fenctg:CodeTable.fenctg,
-               bdflg:CodeTable.bdflg,
-               avbwth:CodeTable.avbwth,
-               lcrtyp:CodeTable.lcrtyp,
-               avbby:CodeTable.avbby0,
-               shppar:CodeTable.shppar,
-               tratyp:CodeTable.tratyp,
-               dspflg:CodeTable.dspflg,
-               inflev:CodeTable.inflev,
-               apftxt:CodeTable.apftxt,
-               nonrevflg1:CodeTable.nonrevflg1,
-               curtxt:CodeTable.curtxt,
-               litameadv:CodeTable.litameadv,
-               avbby0:CodeTable.avbby0,
-               uiltxt:CodeTable.uiltxt,
-               docsnf:CodeTable.docsnf,
-               swttlx:CodeTable.swttlx,
+           codes:{...CodeTable
            },
         }
     },