Skip to content

V
vue-gjjs
Commit 7e4a0d39 by 潘际乾
Options

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

parents d397263d 28be2316
Showing with 118 additions and 24 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"build": "rimraf dist && webpack -p --progress --hide-modules" "build": "rimraf dist && webpack -p --progress --hide-modules"
}, },
"dependencies": { "dependencies": {
"async-validator": "^3.5.2",
"axios": "^0.19.2", "axios": "^0.19.2",
"cluster": "^0.7.7", "cluster": "^0.7.7",
"element-ui": "^2.13.2", "element-ui": "^2.13.2",
......
src/components/IStreamTableDocpan.vue
<template> <template>
<div class="eContainer-table-block"> <div class="eContainer-table-block">
<el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" style="width: 100%" class="eContainer-table" :header-cell-style="{background: 'eef1f6', color: '#606266'}"> <el-table
:data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
style="width: 100%"
class="eContainer-table"
:row-class-name="tableRowClassName"
:header-cell-style="{background: 'eef1f6', color: '#606266'}">
<el-table-column <el-table-column
v-for="(item, key) in tableColumns" v-for="(item, key) in tableColumns"
:key="key" :key="key"
...@@ -84,6 +89,9 @@ export default { ...@@ -84,6 +89,9 @@ export default {
}, },
currentChange(currentPage) { currentChange(currentPage) {
this.currentPage = currentPage; this.currentPage = currentPage;
},
tableRowClassName(row) {
row.row.index = row.rowIndex + (this.currentPage - 1) * this.pageSize;
} }
} }
}; };
......
src/config/CodeTable/index.js
...@@ -5660,5 +5660,37 @@ const CodeTable = { ...@@ -5660,5 +5660,37 @@ const CodeTable = {
dspflg:[ dspflg:[
{label:"final",value:"CG" }, {label:"final",value:"CG" },
], ],
apftxt:[
{label:"BOL-Englisch",value:"BOL001" },
{label:"Copy",value:"CPY001" },
{label:"DTA/LCR",value:"DTA001" },
{label:"DTA/EA",value:"DTE001" },
{label:"eMail",value:"EML001" },
{label:"Telefax",value:"FAX001" },
{label:"Guarantee",value:"GUA001" },
{label:"Internal",value:"INT001" },
{label:"DTAUS/IZV",value:"IZV001" },
{label:"Letter",value:"LET001" },
{label:"not printable",value:"NOP001" },
{label:"Revers",value:"REV001" },
{label:"SWIFT Score",value:"SOC001" },
{label:"SEPA",value:"SPA001" },
{label:"SWIFT",value:"SWT001" },
{label:"TARGET",value:"TRA001" },
{label:"TradeConnect",value:"TCO001" },
{label:"Document Creation",value:"TCX001" },
{label:"Telex",value:"TLX001" },
{label:"Swift-TSU",value:"TSU001" },
],
docsnf:[
{label:"simple letter",value:"LET" },
{label:"by Airmail",value:"LETAML" },
{label:"by Courier",value:"LETCOU" },
{label:"DHL中外运",value:"LETDHC" },
{label:"DHL敦豪",value:"LETDHL" },
{label:"EMS",value:"LETEMS" },
{label:"send as MT999",value:"SWT999" },
]
} }
export default CodeTable; export default CodeTable;
\ No newline at end of file
src/mixin/commonApi.js
...@@ -6,7 +6,7 @@ export default { ...@@ -6,7 +6,7 @@ export default {
return {} return {}
}, },
mounted(){ mounted(){
this.restoreDisplay() //this.restoreDisplay()
}, },
methods:{ methods:{
init(params){ init(params){
......
src/mixin/commonProcess.js
...@@ -9,8 +9,10 @@ export default { ...@@ -9,8 +9,10 @@ export default {
}, },
created: function () {}, created: function () {},
mounted() { mounted() {
if(!this.isInDisplay){
this.ruleWatcher() this.ruleWatcher()
this.ruleCheck() this.ruleCheck()
}
}, },
methods: { methods: {
ruleWatcher() { ruleWatcher() {
...@@ -45,5 +47,10 @@ export default { ...@@ -45,5 +47,10 @@ export default {
} }
this.rules = res; this.rules = res;
} }
},
computed:{
isInDisplay(){
return this.$store.state.Status.mode === 'display'
}
} }
} }
\ No newline at end of file
src/model/Ditopn/Check.js
...@@ -541,8 +541,17 @@ function checkDidgrpBenPtsDihdigN1004() { ...@@ -541,8 +541,17 @@ function checkDidgrpBenPtsDihdigN1004() {
* source:ditopn.@0107.script * source:ditopn.@0107.script
* *
*/ */
function checkDidgrpRecShpdatN100() {
} function checkDidgrpRecShpdatN100(rule, value, callback) {
var a = new Date(value)
var b =new Date(this.model.didgrp.rec.opndat)
if (a.getTime()<b.getTime()) {
return callback(new Error('日期必须大于开证日期'));
}
}
// function checkDidgrpRecShpdatN100() {
// }
/** /**
* source:ditopn.@0002.script * source:ditopn.@0002.script
* *
...@@ -735,8 +744,16 @@ function checkDidgrpAdvPtsDihdigN1003() { ...@@ -735,8 +744,16 @@ function checkDidgrpAdvPtsDihdigN1003() {
* source:ditopn.@0003.script * source:ditopn.@0003.script
* *
*/ */
function checkDidgrpRecExpdatN100() {
} function checkDidgrpRecExpdatN100(rule, value, callback) {
var a = new Date(value)
var b =new Date(this.model.didgrp.rec.opndat)
if (a.getTime()<b.getTime()) {
return callback(new Error('日期必须大于开证日期'));
}
}
/** /**
* source:ptsget.@0009.script * source:ptsget.@0009.script
* ditp.benp.ptsget * ditp.benp.ptsget
......
src/model/Ditopn/Pattern.js
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
"didgrp.cbs.nom1.amt":[ "didgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
"didgrp.cbs.max.amt":[ "didgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -320,7 +320,7 @@ export default { ...@@ -320,7 +320,7 @@ export default {
], ],
"didgrp.rec.conamt":[ "didgrp.rec.conamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 16,message:"整数位不能超过13位"}, {max: 16,message:"整数位不能超过13位"},
{pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/, message: "小数位不能超过2位" } {pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/, message: "小数位不能超过2位" }
], ],
...@@ -471,7 +471,7 @@ export default { ...@@ -471,7 +471,7 @@ export default {
"setmod.docamt":[ "setmod.docamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -486,7 +486,7 @@ export default { ...@@ -486,7 +486,7 @@ export default {
"liaall.outamt":[ "liaall.outamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -499,19 +499,19 @@ export default { ...@@ -499,19 +499,19 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"liaall.misamt":[ "liaall.misamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"liaall.exttotoldamt":[ "liaall.exttotoldamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"liaall.exttotamt":[ "liaall.exttotamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -580,7 +580,7 @@ export default { ...@@ -580,7 +580,7 @@ export default {
], ],
"liaall.limmod.comamt":[ "liaall.limmod.comamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -593,7 +593,7 @@ export default { ...@@ -593,7 +593,7 @@ export default {
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"liaall.limmod.ccvamt":[ "liaall.limmod.ccvamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -635,7 +635,7 @@ export default { ...@@ -635,7 +635,7 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"liaall.liaccv.newamt":[ "liaall.liaccv.newamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -644,7 +644,7 @@ export default { ...@@ -644,7 +644,7 @@ export default {
{max: 5,message:"长度不能超过5"} {max: 5,message:"长度不能超过5"}
], ],
"liaall.liaccv.newresamt":[ "liaall.liaccv.newresamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -654,7 +654,7 @@ export default { ...@@ -654,7 +654,7 @@ export default {
], ],
"liaall.liaccv.pctresamt":[ "liaall.liaccv.pctresamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -662,7 +662,7 @@ export default { ...@@ -662,7 +662,7 @@ export default {
"liaall.liaccv.totcovamt":[ "liaall.liaccv.totcovamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
......
src/views/Business/Ditopn/Docpan.vue
...@@ -7,15 +7,25 @@ ...@@ -7,15 +7,25 @@
</el-col> </el-col>
<c-istream-table-docpan :list="stmData.data" :columns="stmData.columns"> <c-istream-table-docpan :list="stmData.data" :columns="stmData.columns">
<el-table-column label="传送方式">
<template slot-scope="scope">
<!-- <c-select v-model="model.trnmod_trndoc_doceot[scope.$index]" style="width:100%" placeholder="请选择"> -->
<c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].apflab1" style="width:100%" placeholder="请选择">
<el-option v-for="item in codes.apftxt" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</c-select>
</template>
</el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@click="handleDisplay(scope.$index, scope.row)">显示</el-button> @click="handleDisplay(scope.row.index, scope.row)">显示</el-button>
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="handleDetail(scope.$index, scope.row)">明细</el-button> @click="handleDetail(scope.row.index, scope.row)">明细</el-button>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table-docpan> </c-istream-table-docpan>
...@@ -126,7 +136,7 @@ export default { ...@@ -126,7 +136,7 @@ export default {
"cortyp 类型", "cortyp 类型",
"docsnf 报文格式", "docsnf 报文格式",
"docuil 语言", "docuil 语言",
"apf 传送方式" //"apf 传送方式"
], ],
data: [ data: [
] ]
......
src/views/Business/Ditopn/Mt799.vue
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-col :span="15"> <el-col :span="15">
<el-form-item label="MT799(79)备注" prop="ditp.remark"> <el-form-item label="MT799(79)备注" prop="ditp.remark">
<c-input type="textarea" v-model="model.ditp.remark" maxlength="280" :rows="6" ></c-input> <c-input type="textarea" v-model="model.ditp.remark" maxlength="800" :rows="6" ></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</div> </div>
......
src/views/Business/Ditopn/index.vue
...@@ -117,6 +117,7 @@ import Limitbody from "./Limitbody" ...@@ -117,6 +117,7 @@ import Limitbody from "./Limitbody"
import Coninfp from "./Coninfp" import Coninfp from "./Coninfp"
import Ccvpan from "./Ccvpan" import Ccvpan from "./Ccvpan"
export default { export default {
components:{ components:{
"m-ovwp" : Ovwp, "m-ovwp" : Ovwp,
...@@ -203,6 +204,9 @@ export default { ...@@ -203,6 +204,9 @@ export default {
console.log(rtnmsg) console.log(rtnmsg)
Utils.copyValueFromVO(this.model,rtnmsg.data) Utils.copyValueFromVO(this.model,rtnmsg.data)
console.log(this.model); console.log(this.model);
if(this.isInDisplay)
this.restoreDisplay()
} }
else else
{ {
......
src/views/Display/index.vue
...@@ -6,9 +6,22 @@ ...@@ -6,9 +6,22 @@
<script> <script>
import businessContainer from "../Business" import businessContainer from "../Business"
import { mapMutations } from 'vuex'
export default { export default {
components:{ components:{
businessContainer //复用业务容器 businessContainer //复用业务容器
},
created: function () {
console.log("进入快照界面")
this.setMode('display')
},
destroyed: function () {
this.setMode('normal')
},
methods: {
...mapMutations([
'setMode'
])
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment