Skip to content

V
vue-gjjs
Commit 163347a8 by liaoxing
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents 2ad60faf 8aabcc5f
Showing with 163 additions and 21 deletions
src/business/brtset/event/buildCommons.js
......@@ -165,5 +165,12 @@ export default {
setglg
};
return params
}
},
buildReccountrycode (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
reccountrycode: model.trtcre.trdgrp.rec.reccountrycode
};
return params
},
}
\ No newline at end of file
src/business/brtset/event/index.js
......@@ -124,6 +124,25 @@ export default {
this.model.trtcre.trdgrp.rec.ownref = res.data;
}
},
// 获取brtset国家代码
async queryReccountrycode() {
let params = buildFn.buildReccountrycode(this.model, this.trnName);
let res = await Api.post('/service/brtset/queryReccountrycode', params);
if (res.respCode == SUCCESS) {
this.root.$refs['cryDialog'].show = true;
this.root.cryData.data = res.data;
}
},
// 选中brtset国别代码
async selectReccountrycode(row) {
let params = {
...row,
};
let res = await Api.post('/service/brtset/fetch', params);
if (res.respCode == SUCCESS) {
this.$set(this.model.trtcre.trdgrp.rec, "reccountrycode", res.data);
}
},
// 获取brtset弹框表格数据
async queryGridEtyPromptDialogData(type, ptytyp) {
let params = {
......
src/business/brtset/model/check.js
......@@ -233,7 +233,24 @@ let checkObj = {
{type: 'string', required: false, message: '必输项'},
{max: 3, message: '长度不能超过3'},
],
'trtcre.trtmod.finmod.dinjdm': [
{type: 'string', required: true, message: '必输项'},
],
'trtcre.trdgrp.rec.lprtyp': [
{type: 'string', required: true, message: '必输项'},
],
'trtcre.trdgrp.rec.matdat': [
{type: 'string', required: true, message: '必输项'},
],
'trtcre.trdgrp.rec.actrat': [
{type: 'string', required: true, message: '必输项'},
],
'trtcre.trtmod.finmod.flttyp': [
{type: 'string', required: true, message: '必输项'},
],
'trtcre.trtmod.finmod.ovdintrat': [
{type: 'string', required: true, message: '必输项'},
],
'bcdgrp.dre.namelc': [
{type: 'string', required: true, message: '必输项'},
{max: 35, message: '长度不能超过35'},
......
src/business/brtset/model/index.js
......@@ -82,7 +82,7 @@ export default class Bctset {
rzkx4: '',
acc: '',
rzkx3: '',
rzkx2: '',
rzkx2: 'X',
rzkx1: '',
ref4: '',
ref3: '',
......
src/business/brtset/views/Dxzfp.vue
......@@ -34,7 +34,7 @@
v-model="model.trtcre.trdgrp.rec.reccountrycode"
maxlength="3"
placeholder=""
@keyup.enter.native="queryGridEtyPromptDialogData('PRB', 'B')"
@keyup.enter.native="queryReccountrycode()"
></c-input>
<template slot="footer">
<c-button
......@@ -76,7 +76,9 @@ export default {
props: ["model", "codes"],
mixins: [event],
data() {
return {};
return {
trnName: "brtset",
};
},
methods: { },
created: function () {},
......
src/business/brtset/views/Rzkx.vue
......@@ -106,7 +106,7 @@
v-model="model.financ.ref2"
maxlength="20"
placeholder="请输入业务编号"
:disabled="model.financ.rzkx1 == '' || model.financ.rzkx1 == null"
:disabled="model.financ.rzkx2 == '' || model.financ.rzkx2 == null"
></c-input>
</el-form-item>
</c-col>
......@@ -125,7 +125,7 @@
v-model="model.financ.ref3"
maxlength="20"
placeholder="请输入业务编号"
:disabled="model.financ.rzkx1 == '' || model.financ.rzkx1 == null"
:disabled="model.financ.rzkx3 == '' || model.financ.rzkx3 == null"
></c-input>
</el-form-item>
</c-col>
......@@ -144,7 +144,7 @@
v-model="model.financ.ref4"
maxlength="20"
placeholder="请输入业务编号"
:disabled="model.financ.rzkx1 == '' || model.financ.rzkx1 == null"
:disabled="model.financ.rzkx4 == '' || model.financ.rzkx4 == null"
></c-input>
</el-form-item>
</c-col>
......@@ -166,6 +166,62 @@ export default {
data() {
return {};
},
watch: {
"model.financ.rzkx2":{
deep: true,
immediate: true,
handler(val, oldVal) {
if(this.model.financ.rzkx2 == "X"){
this.model.financ.ref2 = this.model.lidgrp.rec.ownref;
this.model.financ.rzkx1 = '';
this.model.financ.rzkx3 = '';
this.model.financ.rzkx4 = '';
}
if (this.model.financ.rzkx2 == '' ||this.model.financ.rzkx2 == null){
this.model.financ.ref2 = "";
}
},
},
"model.financ.rzkx1":{
immediate: true,
handler(val, oldVal) {
if(this.model.financ.rzkx1 == 'X'){
this.model.financ.rzkx2 = '';
this.model.financ.rzkx3 = '';
this.model.financ.rzkx4 = '';
}
else{
this.model.financ.acc = "";
}
},
},
"model.financ.rzkx3":{
immediate: true,
handler(val, oldVal) {
if(this.model.financ.rzkx3 == 'X'){
this.model.financ.rzkx1 = '';
this.model.financ.rzkx2 = '';
this.model.financ.rzkx4 = '';
}
else{
this.model.financ.ref3 = "";
}
},
},
"model.financ.rzkx4":{
immediate: true,
handler(val, oldVal) {
if(this.model.financ.rzkx4 == 'X'){
this.model.financ.rzkx1 = '';
this.model.financ.rzkx3 = '';
this.model.financ.rzkx2 = '';
}
else{
this.model.financ.ref4 = "";
}
},
},
},
methods: {},
};
</script>
......
src/business/brtset/views/Trtcrep.vue
......@@ -836,7 +836,14 @@ export default {
flag: false,
};
},
watch: {},
watch: {
"model.trtcre.trtmod.finmod.dinjdm":{
immediate: true,
handler(val, oldVal) {
this.model.trtcre.trtmod.finmod.dinmod.dinjdm=this.model.trtcre.trtmod.finmod.dinjdm;
},
},
},
methods: {},
created: function () {},
computed:{
......
src/business/brtset/views/Utlp.vue
......@@ -441,7 +441,13 @@
</c-col>
<c-col :span="12">
<el-form-item label="预计核验日期" prop="brtp.prechkdat">
<el-form-item
label="预计核验日期"
prop="brtp.prechkdat"
:rules="[
{ required:model.brtp.ischktyp == 'Y', message:'必输项'},
]"
>
<c-date-picker
type="date"
v-model="model.brtp.prechkdat"
......@@ -723,7 +729,7 @@ export default {
"model.setmod.docamt":{
immediate: true,
handler(val, oldVal) {
this.model.brdgrp.cbs.max.amt=this.model.setmod.docamt;
//this.model.brdgrp.cbs.max.amt=this.model.setmod.docamt;
this.model.aamset.utlamt=this.model.setmod.docamt-this.model.aamset.utlamt2;
},
},
......
src/business/brtset/views/index.vue
......@@ -110,6 +110,11 @@
:promptData="promptData"
@select-ety="selectGridEtyPromptData">
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="cryDialog"
:promptData="cryData"
@select-ety="selectReccountrycode">
</c-grid-ety-prompt-dialog>
</c-page>
</div>
</template>
......@@ -235,6 +240,36 @@ export default {
}
],
data: []
},
cryData: {
title: 'Select a Country',
columns: [
{
prop: 'inr',
label: 'ID'
},
{
prop: 'cod',
label: '国家编号'
},
{
prop: 'numcod',
label: 'numcod'
},
{
prop: 'txt',
label: '国家简称'
},
{
prop: 'fultxt',
label: '国家全称'
},
{
prop: 'ver',
label: 'version'
}
],
data: []
}
};
},
......
src/business/litopn/event/buildCommons.js
......@@ -70,7 +70,7 @@ export default {
...this.buildCommonData(model, trnName),
liaall: model.liaall,
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
doceot: model.docpan.doceot,
};
return params
},
......@@ -132,7 +132,7 @@ export default {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'LID',
objinr: model.lidgrp.rec.objinr,
objinr: model.lidgrp.rec.inr,
ownref: model.lidgrp.rec.ownref,
// swiftflg: model.gitp.swiftflg,
},
......
src/business/litopn/model/index.js
......@@ -4,14 +4,6 @@ export default class Litopn {
constructor() {
this.data = {
busType: 'lid',
gidgrp: {
rec: {
purpos: '',
},
},
gitp: {
swiftflg: '',
},
litp: {
avblab: '',
usr: {
......
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