Skip to content

V
vue-gjjs
Commit b3ce8454 by lsk
Options

Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

parents f17f9b5b 01e9b52c
Showing with 193 additions and 44 deletions
src/components/GridEtyPromptDialog.vue
...@@ -154,13 +154,14 @@ export default { ...@@ -154,13 +154,14 @@ export default {
this.currentPage = currentPage; this.currentPage = currentPage;
}, },
selectEty(row, column, event) { selectEty(row, column, event) {
const str = this.data[row.IDX] // const str = this.data[row.IDX]
let v = ""; // let v = "";
if (this.type === 'extkey') { // if (this.type === 'extkey') {
v = str.split("\t")[4].trim() // v = str.split("\t")[4].trim()
} else if (this.type === 'bankno') { // } else if (this.type === 'bankno') {
v = str.split("\t")[0].trim() // v = str.split("\t")[0].trim()
} // }
const v = row[this.tableColumn[0].prop].split("\n")[0]
this.$emit("select-ety", v, this.rulePath) this.$emit("select-ety", v, this.rulePath)
this.show = false; this.show = false;
this.currentPage = 1; this.currentPage = 1;
......
src/config/CodeTable/index.js
...@@ -4145,10 +4145,10 @@ const CodeTable = { ...@@ -4145,10 +4145,10 @@ const CodeTable = {
{label:"终结付款",value:"FNAL" }, {label:"终结付款",value:"FNAL" },
], ],
paytype:[ paytype:[
{label:"票汇",value:"2" },
{label:"其他",value:"3" },
{label:"电汇",value:"0" }, {label:"电汇",value:"0" },
{label:"信汇",value:"1" }, {label:"信汇",value:"1" },
{label:"票汇",value:"2" },
{label:"其他",value:"3" },
], ],
payuil:[ payuil:[
{label:"English",value:"EN" }, {label:"English",value:"EN" },
...@@ -5164,9 +5164,9 @@ const CodeTable = { ...@@ -5164,9 +5164,9 @@ const CodeTable = {
{value:"3",label:"不申报" }, {value:"3",label:"不申报" },
], ],
sztyp:[ sztyp:[
{label:"1",value:"跨境收支" }, {label:"跨境收支",value:"1" },
{label:"2",value:"境内交易" }, {label:"境内交易",value:"2" },
{label:"3",value:"不申报" }, {label:"账户结售汇",value:"3" },
], ],
tag:[ tag:[
{label:"File Name",value:"N" }, {label:"File Name",value:"N" },
......
src/mixin/commonProcess.js
import _ from "lodash" import _ from "lodash"
import commonDeclare from "./commonDeclare" import commonDeclare from "./commonDeclare"
import commonApi from "./commonApi" import commonApi from "./commonApi"
import Utils from "~/utils"
export default { export default {
mixins: [commonApi,commonDeclare], mixins: [commonApi,commonDeclare],
data: function () { data: function () {
...@@ -86,6 +88,13 @@ export default { ...@@ -86,6 +88,13 @@ export default {
} }
} }
return "blur"; return "blur";
},
/**
* 更新Model
* @param {any} data model数据
*/
updateModel(data) {
Utils.copyValueFromVO(this.model, data);
} }
}, },
computed:{ computed:{
......
src/model/Cptopn/Pattern.js
...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
], ],
"cpdgrp.rec.amtf33b":[ "cpdgrp.rec.amtf33b":[
{type: "number", required: false, message: "必输项"}, {required: false, message: "必输项"},
{max: 16,message:"整数位不能超过12位"}, {max: 16,message:"整数位不能超过12位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
], ],
"cpdgrp.rec.amt71f":[ "cpdgrp.rec.amt71f":[
{type: "number", required: false, message: "必输项"}, {required: false, message: "必输项"},
{max: 16,message:"整数位不能超过12位"}, {max: 16,message:"整数位不能超过12位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
......
src/utils/index.js
...@@ -223,13 +223,14 @@ export default class Utils { ...@@ -223,13 +223,14 @@ export default class Utils {
return async function(rule, value, callback){ return async function(rule, value, callback){
//调用具体的check //调用具体的check
const res = await this.exeuteCheck(key) const res = await this.exeuteCheck(key)
if (res.respCode == SUCCESS){ // if (res.respCode == SUCCESS){
// }
if (Object.hasOwnProperty.call(res.fieldErrors, key)) { if (Object.hasOwnProperty.call(res.fieldErrors, key)) {
callback(res.fieldErrors[key]) callback(new Error(res.fieldErrors[key]))
} else { } else {
callback(); callback();
} }
} }
} }
}
} }
\ No newline at end of file
src/views/Business/Cptopn/Opnp1.vue
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
placeholder="请选择汇款性质" placeholder="请选择汇款性质"
> >
<el-option <el-option
v-for="item in codes.trntyp" v-for="item in trntyp"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -348,6 +348,7 @@ ...@@ -348,6 +348,7 @@
v-model="model.cptp.payeecountcode" v-model="model.cptp.payeecountcode"
maxlength="3" maxlength="3"
placeholder="请输入收款人常驻国家/地区代码" placeholder="请输入收款人常驻国家/地区代码"
@keyup.enter.native="payeecountcodeEvent"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -626,6 +627,7 @@ ...@@ -626,6 +627,7 @@
v-model="model.cptp.pyebchkey" v-model="model.cptp.pyebchkey"
maxlength="14" maxlength="14"
placeholder="请输入收款人" placeholder="请输入收款人"
@keyup.enter.native="pyebchkeyEvent"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1633,28 +1635,133 @@ ...@@ -1633,28 +1635,133 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<c-grid-ety-prompt-dialog ref="etyDialog"
:title="gridPromptDialog.title"
:columnStr="gridPromptDialog.columnStr"
:data="gridPromptDialog.data"
:type="gridPromptDialog.type"
:rulePath="gridPromptDialog.rulePath"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
</div> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import CommonProcess from "~/mixin/CommonProcess";
import Event from "~/model/Cptopn/Event"; import Event from "~/model/Cptopn/Event";
import Utils from "~/utils"; import Utils from "~/utils"
export default { export default {
inject: ["root"], inject: ["root"],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [CommonProcess],
data() { data() {
return { return {
liqtypOptions: [ model3:'',
{ value: "B", label: "人行支付系统" }, options1:[
{ value: "C", label: "代理行模式" }, {value:'AUD',label:'AUD 澳大利亚元'},
{ value: "O", label: "Other" }, {value:'CAD',label:'CAD 加拿大元'},
{ value: "S", label: "CIPS系统" }, {value:'CHF',label:'CHF 瑞士法郎'},
{value:'CNY',label:'CNY 人民币'},
{value:'DKK',label:'DKK 丹麦克郎'},
{value:'EUR',label:'EUR 欧元'},
{value:'FIM',label:'FIM 芬兰马克'},
{value:'FRF',label:'FRF 法国法郎'},
{value:'GBP',label:'GBP 英镑'},
{value:'HKD',label:'HKD 港币'},
{value:'JPY',label:'JPY 日元'},
{value:'KRW',label:'KRW 韩元'},
{value:'MOP',label:'MOP 澳门元'},
{value:'NOK',label:'NOK 挪威克郎'},
{value:'NZD',label:'NZD 新西兰元'},
{value:'SEK',label:'SEK 瑞典克郎'},
{value:'SGD',label:'SGD 新加坡元'},
{value:'THB',label:'THB 泰国铢'},
{value:'TWD',label:'TWD 新台湾元'},
{value:'USD',label:'USD 美元'},
],
trntyp:[
{value:'0',label:'贸易'},
{value:'1',label:'非贸易'},
{value:'2',label:'资本'},
{value:'3',label:'其他'},
],
options10:[
{value:'1',label:'工业企业'},
{value:'2',label:'私营企业'},
{value:'3',label:'三资企业'},
{value:'4',label:'外贸企业'},
{value:'5',label:'保险企业'},
{value:'6',label:'商业企业'},
{value:'7',label:'其他企业'},
{value:'8',label:'私人'},
],
liqtypOptions:[
{value:'B',label:'人行支付系统'},
{value:'C',label:'代理行模式'},
{value:'O',label:'Other'},
], ],
gridPromptDialog: {
title: '',
columnStr: '',
data: [],
type: '',
rulePath: ''
}
}; };
}, },
methods: { ...Event, onCptpGetmod() {} }, methods: {
payeecountcodeEvent() {
this.executeRule("cptp.payeecountcode").then((res) => {
if (res.respCode = "AAAAAA"){
if (res.data.params) {
this.updateModel(res.data);
} else {
this.$refs.etyDialog.show = true
this.gridPromptDialog.title = res.data.title
this.gridPromptDialog.columnStr = res.data.columns
this.gridPromptDialog.data = res.data.vals.rows
this.gridPromptDialog.type = 'extkey'
this.gridPromptDialog.rulePath = 'cptp.payeecountcode'
}
}
}
)
},
pyebchkeyEvent() {
this.executeRule("cptp.pyebchkey").then((res) => {
if (res.respCode = "AAAAAA"){
if (res.data.params) {
this.updateModel(res.data);
} else {
this.$refs.etyDialog.show = true
this.gridPromptDialog.title = res.data.title
this.gridPromptDialog.columnStr = res.data.columns
this.gridPromptDialog.data = res.data.vals.rows
this.gridPromptDialog.type = 'extkey'
this.gridPromptDialog.rulePath = 'cptp.pyebchkey'
}
}
}
)
},
selectEty(val, rulePath) {
const props = rulePath.replaceAll(".", "_")
const obj = {}
obj[props] = val;
Utils.copyValueFromVO(this.model, obj);
this.executeRule(rulePath).then((res) => {
if (res.respCode = "AAAAAA"){
Utils.copyValueFromVO(this.model, res.data);
}
});
},
onCptpGetmod() {},
...Event
},
created: function () {}, created: function () {},
}; };
</script> </script>
......
src/views/Business/Cptopn/Setpan.vue
<template> <template>
<div class="eibs-tab"> <el-row class="eibs-tab">
<!-- ===================顶部===================== --> <!-- ===================顶部===================== -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="Reference" label-width="100px" prop="setmod.ref"> <el-form-item label="Reference" label-width="100px" prop="setmod.ref">
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="Amount Settled" label-width="150px"> <el-form-item label="Amount Settled" label-width="150px">
<c-input <c-input
v-model="temp1" v-model="model.setmod.doccur"
style="width: 100%" style="width: 100%"
placeholder="" placeholder="CNY"
:readonly="true" :readonly="true"
></c-input> ></c-input>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="" label-width="20px"> <el-form-item label="" label-width="20px">
<c-input <c-input
v-model="temp2" v-model="model.setmod.docamt"
:readonly="true" :readonly="true"
placeholder="" placeholder=""
></c-input> ></c-input>
...@@ -34,14 +34,21 @@ ...@@ -34,14 +34,21 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="Type" label-width="100px"> <el-form-item label="类型" label-width="100px">
<c-input <c-select
v-model="temp3" v-model="model.setmod.dspflg"
readonly disabled
style="width: 100%" style="width: 100%"
placeholder="" placeholder="请选择Type of settlement"
>
<el-option
v-for="item in codes.dspflg"
:key="item.value"
:label="item.label"
:value="item.value"
> >
</c-input > </el-option>
</c-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -109,7 +116,7 @@ ...@@ -109,7 +116,7 @@
<el-col :span="22" style="margin-bottom: 18px" :offset="1"> <el-col :span="22" style="margin-bottom: 18px" :offset="1">
<c-table <c-table
style="text-align: center" style="text-align: center"
:list="data" :list="model.setmod.setfog.setfol"
:paginationShow="false" :paginationShow="false"
:border="true" :border="true"
> >
...@@ -265,6 +272,7 @@ ...@@ -265,6 +272,7 @@
</el-table-column> </el-table-column>
</c-table> </c-table>
</el-col> </el-col>
<setpan-dialog v-if="dialogVisible2" :visible="dialogVisible2" :model="model" :idx="index" :codes="codes"/>
<!--=================== Settlement:================== --> <!--=================== Settlement:================== -->
<el-col :span="24" style="text-align: left"> <el-col :span="24" style="text-align: left">
<el-form-item label="Settlement:" label-width="100px"> <el-form-item label="Settlement:" label-width="100px">
...@@ -273,7 +281,7 @@ ...@@ -273,7 +281,7 @@
<el-col :span="22" style="margin-bottom: 18px" :offset="1"> <el-col :span="22" style="margin-bottom: 18px" :offset="1">
<c-table <c-table
style="text-align: center" style="text-align: center"
:list="data" :list="model.setmod.setglg.setgll"
:paginationShow="false" :paginationShow="false"
:border="true" :border="true"
> >
...@@ -341,25 +349,49 @@ ...@@ -341,25 +349,49 @@
<el-table-column label="" width="auto"> </el-table-column> <el-table-column label="" width="auto"> </el-table-column>
</c-table> </c-table>
</el-col> </el-col>
</div> </el-row>
</template> </template>
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Event from "~/model/Cptopn/Event"; import Event from "~/model/Cptopn/Event";
import SetpanDialog from "./SetpanDialog.vue";
import Utils from "~/utils/index"
export default { export default {
inject: ['root'], inject: ['root'],
props: ["model", "codes"], props: ["model", "codes"],
components: { SetpanDialog },
data() { data() {
return { return {
temp1:'USD',
temp2:'0.00', dialogVisible2: false,
temp3:'final',
dialog2: {
feetxtinf:"",
feetxt:"",
},
index: 0,
data:[] data:[]
}; };
}, },
methods: { ...Event }, methods: {
...Event,
dispDefault(){
Api.post("cptopn/executeDefault/mac",Utils.getRequestDataFn.call(this)).then(res=>{
Utils.copyValueFromVO(this.model, res.data)
})
},
detail2(index, row) {
Api.post("cptopn/executeRule/det",Utils.getRequestDataFn.call(this)).then(res=>{
this.dialogVisible2 = true;
this.index = index;
this.dialog2 = row
})
},
},
created: function () {}, created: function () {},
}; };
</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