Skip to content

V
vue-gjjs
Commit 414e4cb1 by liyixun
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 96441c77 f9a51c58
Showing with 182 additions and 123 deletions
src/model/Gitcan/Check.js
...@@ -25,6 +25,7 @@ let checkObj = { ...@@ -25,6 +25,7 @@ let checkObj = {
"gidgrp.rec.redamt" :null, "gidgrp.rec.redamt" :null,
"liaall.liaccv.relcshpct" :null, "liaall.liaccv.relcshpct" :null,
"mtabut.clsflg" :null, "mtabut.clsflg" :null,
"gidgrp.rec.purcan" :null,
} }
for (const key in checkObj) { for (const key in checkObj) {
......
src/model/Gitcom/index.js
...@@ -31,6 +31,7 @@ export default class Gitcom{ ...@@ -31,6 +31,7 @@ export default class Gitcom{
liadat:"", // Liability until .gidgrp.rec.liadat liadat:"", // Liability until .gidgrp.rec.liadat
purpos:"", // Purpose of Message .gidgrp.rec.purpos purpos:"", // Purpose of Message .gidgrp.rec.purpos
exptyp:"", exptyp:"",
liatypc:"",
}, },
cbs:{ cbs:{
max:{ max:{
......
src/model/Gitcrj/Default.js
...@@ -49,5 +49,6 @@ export default { ...@@ -49,5 +49,6 @@ export default {
"mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction, "mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction, "mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
"gcdgrp.rec.docprbrol" :Utils.defaultFunction, "gcdgrp.rec.docprbrol" :Utils.defaultFunction,
"gcdgrp.rec.msgdat" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/model/Gitcrj/Pattern.js
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"gcdgrp.rec.msgdat":[ "gcdgrp.rec.msgdat":[
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "必输项"}
], ],
"gctp.prbp.ptsget.sdamod.dadsnd":[ "gctp.prbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
src/views/Business/Cctdav/Cctdav1.vue
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
size="small" size="small"
type="primary" type="primary"
@click="onCctmodButgetref" @click="onCctmodButgetref"
:disabled="model.ccdgrp.rec.ownref!=''" :disabled="model.ccdgrp.rec.ownref != ''"
> >
获取 获取
</c-button> </c-button>
...@@ -201,26 +201,27 @@ ...@@ -201,26 +201,27 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="22"> <c-col :span="24">
<el-form-item label="resp.usr" prop="cctp.usr.extkey"> <el-form-item label="resp.usr" prop="cctp.usr.extkey">
<c-input <c-fullbox>
v-model="model.cctp.usr.extkey" <c-input
maxlength="8" v-model="model.cctp.usr.extkey"
placeholder="请输入resp.usr" maxlength="8"
disabled placeholder="请输入resp.usr"
></c-input> disabled
></c-input>
<template slot="footer">
<c-button
size="small"
type="primary"
@click="onSeainf"
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
</template>
</c-fullbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="2">
<c-button
style="margin: 0 12px 0 14px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Drawer" prop="ccdgrp.cor.pts.extkey"> <el-form-item label="Drawer" prop="ccdgrp.cor.pts.extkey">
...@@ -394,43 +395,43 @@ export default { ...@@ -394,43 +395,43 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return { return {
flag1:false, flag1: false,
flag2:false, flag2: false,
flag3:false, flag3: false,
}; };
}, },
watch:{ watch: {
"model.ccdgrp.cor.pts.extkey" :{ "model.ccdgrp.cor.pts.extkey": {
immediate:true, immediate: true,
handler(val ,oldVal){ handler(val, oldVal) {
if(this.model.ccdgrp.cor.pts.extkey!=''){ if (this.model.ccdgrp.cor.pts.extkey != "") {
this.flag1=true; this.flag1 = true;
}else{ } else {
this.flag1=false; this.flag1 = false;
}
} }
}, },
"model.ccdgrp.dro.pts.extkey" :{ },
immediate:true, "model.ccdgrp.dro.pts.extkey": {
handler(val ,oldVal){ immediate: true,
if(this.model.ccdgrp.dro.pts.extkey!=''){ handler(val, oldVal) {
this.flag2=true; if (this.model.ccdgrp.dro.pts.extkey != "") {
}else{ this.flag2 = true;
this.flag2=false; } else {
} this.flag2 = false;
} }
}, },
"model.ccdgrp.col.pts.extkey" :{ },
immediate:true, "model.ccdgrp.col.pts.extkey": {
handler(val ,oldVal){ immediate: true,
if(this.model.ccdgrp.col.pts.extkey!=''){ handler(val, oldVal) {
this.flag3=true; if (this.model.ccdgrp.col.pts.extkey != "") {
}else{ this.flag3 = true;
this.flag3=false; } else {
} this.flag3 = false;
} }
}, },
"model.ccdgrp.rec.modset": function () { },
"model.ccdgrp.rec.modset": function () {
if (this.model.ccdgrp.rec.modset == "2") { if (this.model.ccdgrp.rec.modset == "2") {
this.model.ccdgrp.col.pts.extkey = ""; this.model.ccdgrp.col.pts.extkey = "";
this.model.ccdgrp.col.pts.adrblk = ""; this.model.ccdgrp.col.pts.adrblk = "";
......
src/views/Business/Gitcom/Gitsetp1.vue
...@@ -71,50 +71,48 @@ ...@@ -71,50 +71,48 @@
</c-col> </c-col>
</c-col> --> </c-col> -->
<c-col :span="24"> <c-col :span="12">
<c-col :span="12"> <el-form-item label="Guarantee Amount" prop="gidgrp.cbs.max.cur">
<el-form-item label="Guarantee Amount" prop="gidgrp.cbs.max.cur"> <c-select
<c-select v-model="model.gidgrp.cbs.max.cur"
v-model="model.gidgrp.cbs.max.cur" style="width: 100%"
style="width: 100%" placeholder="请选择Currency"
placeholder="请选择Currency" disabled
disabled >
<el-option
v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value"
> >
<el-option </el-option>
v-for="item in codes.cur" </c-select>
:key="item.value" </el-form-item>
:label="item.label" </c-col>
:value="item.value" <!-- <c-col :span="8">
>
</el-option>
</c-select>
</el-form-item>
</c-col>
<!-- <c-col :span="8">
<c-input <c-input
disabled disabled
v-model="model.gidgrp.cbs.max.amt" v-model="model.gidgrp.cbs.max.amt"
style="margin: 0 0 0 5px; width: 90%" style="margin: 0 0 0 5px; width: 90%"
></c-input> ></c-input>
</c-col> --> </c-col> -->
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
style="text-align: left" style="text-align: left"
label-width="5px" label-width="5px"
prop="gidgrp.cbs.max.amt" prop="gidgrp.cbs.max.amt"
> >
<c-input-currency <c-input-currency
disabled disabled
v-model="model.gidgrp.cbs.max.amt" v-model="model.gidgrp.cbs.max.amt"
style="margin: 0 0 0 5px; width: 90%" style="margin: 0 0 0 5px; width: 90%"
></c-input-currency> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="4" class="centerLable"> <c-col :span="4" class="centerLable">
<c-checkbox disabled v-model="model.gitp0.aamgid.addamtflg" <c-checkbox disabled v-model="model.gitp0.aamgid.addamtflg"
>Add. Amount</c-checkbox >Add. Amount</c-checkbox
> >
</c-col>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
...@@ -225,6 +223,36 @@ ...@@ -225,6 +223,36 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="13" >
<el-form-item v-show="model.gidgrp.rec.liatypc != ''" label="Liability" prop="gidgrp.rec.liadat">
<c-date-picker
disabled
type="date"
v-show="model.gidgrp.rec.liadat != ''"
v-model="model.gidgrp.rec.liadat"
style="width: 100%"
placeholder="请选择Liability"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="11" v-show="model.gidgrp.rec.liadat != ''">
<el-form-item
style="text-align: left"
label-width="5px"
prop="gidgrp.rec.liatypc"
>
<c-select
v-model="model.gidgrp.rec.liatypc"
style="width: 100%"
placeholder="请选择Liability Type"
:code="codes.liatypc"
disabled
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Reference Date " prop="setmod.refdat"> <el-form-item label="Reference Date " prop="setmod.refdat">
<c-date-picker <c-date-picker
......
src/views/Business/Gitcrj/Gitsetp1.vue
...@@ -332,11 +332,11 @@ ...@@ -332,11 +332,11 @@
<c-col :span="11" style="margin-top: 15px"> <c-col :span="11" style="margin-top: 15px">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Select Rejection type " prop="lettername"> <el-form-item label="信函名称" prop="lettername">
<c-input <c-input
v-model="model.lettername" v-model="model.lettername"
maxlength="40" maxlength="40"
placeholder="请输入Select Rejection type" placeholder="请输入信函名称"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -354,21 +354,17 @@ ...@@ -354,21 +354,17 @@
</el-radio-group> </el-radio-group>
</div> </div>
</c-col> --> </c-col> -->
<c-col :span="12"> <c-col :span="24">
<el-card class="box-card"> <el-form-item label="Select Reject Type" prop="rejtypsel">
<template> <c-select
<el-radio v-model="model.rejtypsel"
v-model="rejtypsel" style="width:100%"
label="1" placeholder=""
>Pending instructions</el-radio> :code="rejtypsel"
<el-radio ></c-select>
v-model="rejtypsel" </el-form-item>
label="2"
>Outright,return documents</el-radio>
</template>
</el-card>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="18">
<el-form-item label=" Message Date" prop="gcdgrp.rec.msgdat"> <el-form-item label=" Message Date" prop="gcdgrp.rec.msgdat">
<c-date-picker <c-date-picker
type="date" type="date"
...@@ -378,11 +374,11 @@ ...@@ -378,11 +374,11 @@
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="6">
<c-checkbox <c-checkbox
v-model="model.mtabut.clsflgp" v-model="model.mtabut.clsflg"
style="margin-left: 32px" style="margin-left: 20px"
:disabled="model.rejtypsel != 'Outright,return documents'" :disabled="model.rejtypsel != 'R'"
>Close Contract</c-checkbox >Close Contract</c-checkbox
> >
</c-col> </c-col>
...@@ -949,14 +945,29 @@ export default { ...@@ -949,14 +945,29 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return { return {
rejtypsel: "1", rejtypsel: [
{ label: "Pending instructions", value: "I" },
{ label: "Outright, return documents", value: "R" },
],
typgar2: [ typgar2: [
{ label: "农民工工资保函", value: "1" }, { label: "农民工工资保函", value: "1" },
{ label: "农民工工资保函2", value: "2" }, { label: "农民工工资保函2", value: "2" },
], ],
}; };
}, },
watch:{
"model.rejtypsel" : {
immediate: true,
handler(val,oldval){
if(this.model.rejtypsel=="I"){
this.model.mtabut.clsflg=""
}else if(this.model.rejtypsel=="R"){
this.model.mtabut.clsflg="X"
}
}
},
},
methods: { ...Event }, methods: { ...Event },
created: function () {}, created: function () {},
......
src/views/Public/Docpan.vue
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
@change="executeDefault('trnmod.trndoc.doccur.docsnf')" @change="executeDefault('trnmod.trndoc.doccur.docsnf')"
:disabled="suppress"
> >
<el-option <el-option
v-for="item in codes.docsnf" v-for="item in codes.docsnf"
...@@ -55,6 +56,7 @@ ...@@ -55,6 +56,7 @@
" "
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
:disabled="suppress"
> >
<el-option <el-option
v-for="item in codes.uiltxt" v-for="item in codes.uiltxt"
...@@ -100,6 +102,7 @@ ...@@ -100,6 +102,7 @@
:readonly="true" :readonly="true"
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
:disabled="suppress"
> >
</c-input> </c-input>
</template> </template>
...@@ -112,7 +115,7 @@ ...@@ -112,7 +115,7 @@
" "
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
:disabled="suppress"
> >
</c-input> </c-input>
</template> </template>
...@@ -129,6 +132,7 @@ ...@@ -129,6 +132,7 @@
" "
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
:disabled="suppress"
> >
<el-option <el-option
v-for="item in codes.swttlx" v-for="item in codes.swttlx"
...@@ -147,9 +151,9 @@ ...@@ -147,9 +151,9 @@
type="primary" type="primary"
size="small" size="small"
:disabled=" :disabled="
scope.row (scope.row
.pandsc == 'MT799' && model.didgrp && model.didgrp.rec && .pandsc == 'MT799' && model.didgrp && model.didgrp.rec &&
model.didgrp.rec.elcflg == 'Y' model.didgrp.rec.elcflg == 'Y')||suppress
" "
@click="handleDisplay(scope.row.index, scope.row, model.trnmod.trndoc.doceot[scope.row.idx])" @click="handleDisplay(scope.row.index, scope.row, model.trnmod.trndoc.doceot[scope.row.idx])"
icon="el-icon-search" icon="el-icon-search"
...@@ -546,20 +550,24 @@ export default { ...@@ -546,20 +550,24 @@ export default {
}) })
}, },
activateDialog() { activateDialog() {
this.executeRule("trnmod.trndoc.doccur.butdel").then(res => { this.executeRule(`trnmod.trndoc.doceot(${this.index + 1}).butdel`).then(res => {
if(res.respCode==SUCCESS){ if(res.respCode==SUCCESS){
//TODO //TODO
this.updateModel(res.data)
this.dialog = this.model.trnmod.trndoc.doceot[this.index]
this.suppress=false;
}else{ }else{
this.$notify.error({ title: '错误', message: '服务请求失败！' }); this.$notify.error({ title: '错误', message: '服务请求失败！' });
} }
}) })
}, },
suppressDialog() { suppressDialog() {
this.executeRule("trnmod.trndoc.doccur.butdel").then(res => { this.executeRule(`trnmod.trndoc.doceot(${this.index + 1}).butdel`).then(res => {
if(res.respCode==SUCCESS){ if(res.respCode==SUCCESS){
//TODO //TODO
this.suppress=true; this.updateModel(res.data)
this.dialog = this.model.trnmod.trndoc.doceot[this.index]
this.suppress=true;
}else{ }else{
this.$notify.error({ title: '错误', message: '服务请求失败！' }); this.$notify.error({ title: '错误', message: '服务请求失败！' });
} }
......
src/views/Public/Setpan.vue
...@@ -1022,9 +1022,9 @@ export default { ...@@ -1022,9 +1022,9 @@ export default {
}, },
detail1(index, row) { detail1(index, row) {
this.executeDefault("setfel.det").then(res => { this.executeDefault("setfel.det").then(res => {
this.index = index;
this.dialogVisible = true; this.dialogVisible = true;
this.dialog = row; this.dialog = row;
this.index = index;
}) })
}, },
dispDefault(index) { dispDefault(index) {
...@@ -1037,9 +1037,9 @@ export default { ...@@ -1037,9 +1037,9 @@ export default {
const that = this; const that = this;
const rule = "setmod.setfeg.setfel(" + (index + 1) + ").det"; const rule = "setmod.setfeg.setfel(" + (index + 1) + ").det";
that.executeRule(rule).then(res => { that.executeRule(rule).then(res => {
that.$refs.setpanDialog.visiable = true;
that.$refs.setpanDialog.formData = Object.assign({}, that.model.setmod.setfeg.setfel[index]);
that.index = index; that.index = index;
that.$refs.setpanDialog.visiable = true;
// that.$refs.setpanDialog.formData = that.model.setmod.setfeg.setfel[index];
that.dialog2 = row that.dialog2 = row
}) })
}, },
...@@ -1054,10 +1054,10 @@ export default { ...@@ -1054,10 +1054,10 @@ export default {
const rule = "setmod.setglg.setgll(" + (index + 1) + ").det"; const rule = "setmod.setglg.setgll(" + (index + 1) + ").det";
let rtnmsg = await this.executeRule(rule) let rtnmsg = await this.executeRule(rule)
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
that.index = index;
that.$refs.detpDialog.visiable = true; that.$refs.detpDialog.visiable = true;
this.detpDialogVisible = true; this.detpDialogVisible = true;
that.dialog3 = Object.assign({}, that.model.setmod.setglg.setgll[index]); that.dialog3 = that.model.setmod.setglg.setgll[index];
that.index = index;
that.rattyp = that.strCalCode(that.dialog3.rattyp, that.codes.ratetype); that.rattyp = that.strCalCode(that.dialog3.rattyp, that.codes.ratetype);
that.dcbrattyp = that.strCalCode(that.dialog3.dcbrattyp, that.codes.ratetype); that.dcbrattyp = that.strCalCode(that.dialog3.dcbrattyp, that.codes.ratetype);
that.scbrattyp = that.strCalCode(that.dialog3.scbrattyp, that.codes.ratetype); that.scbrattyp = that.strCalCode(that.dialog3.scbrattyp, that.codes.ratetype);
......
src/views/Public/SetpanDialog.vue
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="优惠百分比"> <el-form-item label="优惠百分比">
<c-input v-model="formData.dctrat"> <c-input v-model="formData.dctrat" @keyup.enter.native="eventFunction('setmod.setfeg.setfel('+ (idx+1) +').dctrat')">
<template #suffix>%</template> <template #suffix>%</template>
</c-input> </c-input>
</el-form-item> </el-form-item>
...@@ -136,14 +136,14 @@ ...@@ -136,14 +136,14 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="优惠金额"> <el-form-item label="优惠金额">
<c-input v-model="formData.dctamt" /> <c-input v-model="formData.dctamt" @keyup.enter.native="eventFunction('setmod.setfeg.setfel('+ (idx+1) +').dctamt')" />
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="优惠后实收费用金额"> <el-form-item label="优惠后实收费用金额">
<c-input v-model="formData.amt" /> <c-input v-model="formData.amt" @keyup.enter.native="eventFunction('setmod.setfeg.setfel('+ (idx+1) +').amt')" />
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -355,7 +355,11 @@ ...@@ -355,7 +355,11 @@
</template> </template>
<script> <script>
import commonProcess from "~/mixin/commonProcess";
export default { export default {
inject: ['root'],
mixins: [commonProcess],
props: { props: {
model: Object, model: Object,
idx: Number, idx: Number,
...@@ -363,10 +367,14 @@ export default { ...@@ -363,10 +367,14 @@ export default {
}, },
data() { data() {
return { return {
formData: {},
visiable: false, visiable: false,
}; };
}, },
computed: {
formData() {
return this.model.setmod.setfeg.setfel[this.idx]
}
},
methods: { methods: {
saveDialog() { saveDialog() {
this.model.setmod.setfeg.setfel.splice(this.idx, 1, this.formData); this.model.setmod.setfeg.setfel.splice(this.idx, 1, this.formData);
......
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