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