Skip to content

V
vue-gjjs
Commit 121932ee by lianyang
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 9ea4a037 3b96ed7d
Showing with 79 additions and 22 deletions
src/config/CodeTable/index.js
......@@ -5013,6 +5013,11 @@ const CodeTable = {
{ label: "Reverse Booking (Document Set)", value: "N" },
{ label: "Reverse Booking (Doc. Set, L/C)", value: "B" },
],
rebkpflg2: [
{ label: "Reverse Booking (Claim)", value: "N" },
{ label: "Reverse Booking (Claim, Guarantee)", value: "B" },
// { label: "Contract already settled" ,value: "A"}
],
refper: [
{ label: "Same Week", value: "W=" },
{ label: "Same Half-Year", value: "H=" },
......
src/model/Botame/index.js
......@@ -5,6 +5,10 @@ import Pub from "../Public"
export default class Botame{
constructor () {
this.data = {
botcoll2blk:"",
botcoll1blk:"",
botdrrl1blk:"",
bodgrp:{
rec:{
ownref:"", // Reference .bodgrp.rec.ownref
......
src/views/Business/Bctset/Basp.vue
......@@ -357,6 +357,16 @@ export default {
}
},
watch:{
"model.bopmod.dbcp.baspp.acp" :{
immediate: true,
handler(val,oldval){
if(this.model.bopmod.dbcp.baspp.acp==""){
this.model.bopmod.dbcp.baspp.acp="X"
}
}
},
},
methods:{...Event},
created:function(){
......
src/views/Business/Bctset/Basp1.vue
......@@ -10,7 +10,7 @@
<c-col :span="24">
<el-form-item label="操作类型" prop="bopmod.dbfgrp.bas.actiontype">
<c-select disabled v-model="model.bopmod.dbfgrp.bas.actiontype" style="width:100%" >
<c-select disabled v-model="model.bopmod.dbfgrp.bas.actiontype" :code="codes.actiontype" style="width:100%" >
</c-select>
</el-form-item>
</c-col>
......@@ -29,7 +29,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="付款人类型" prop="bopmod.dbfgrp.bas.custype">
<c-select disabled v-model="model.bopmod.dbfgrp.bas.custype" style="width:100%" >
<c-select disabled v-model="model.bopmod.dbfgrp.bas.custype" :code="codes.custype" style="width:100%" >
</c-select>
</el-form-item>
</c-col>
......@@ -65,7 +65,7 @@
</c-col>
<c-col :span="12">
<el-form-item label="付款币种及金额" prop="bopmod.dbfgrp.bas.txccy">
<c-select v-model="model.bopmod.dbfgrp.bas.txccy" style="width:100%" >
<c-select v-model="model.bopmod.dbfgrp.bas.txccy" :code="codes.curtxt1" style="width:100%" >
</c-select>
</el-form-item>
</c-col>
......@@ -104,7 +104,7 @@
<c-col :span="24">
<el-form-item label="结算方式" prop="bopmod.dbfgrp.bas.methods">
<c-select disabled v-model="model.bopmod.dbfgrp.bas.methods" style="width:100%" >
<c-select disabled v-model="model.bopmod.dbfgrp.bas.methods" :code="codes.methods" style="width:100%" >
</c-select>
</el-form-item>
</c-col>
......@@ -259,6 +259,16 @@ export default {
}
},
watch:{
"model.bopmod.dbfp.baspp.acp" :{
immediate: true,
handler(val,oldval){
if(this.model.bopmod.dbfp.baspp.acp==""){
this.model.bopmod.dbfp.baspp.acp="X"
}
}
},
},
methods:{...Event},
created:function(){
......
src/views/Business/Botame/index.vue
......@@ -127,7 +127,7 @@ import Engp from "~/views/Public/Engp"
export default {
name: "botame",
name: "Botame",
components:{
"m-amep" : Amep,
"m-ovwp" : Ovwp,
......
src/views/Business/Botcan/index.vue
......@@ -95,6 +95,7 @@ import Engp from "~/views/Public/Engp";
import Glepan from "~/views/Public/Glepan";
export default {
name: "Botcan",
components: {
"m-canp": Canp,
"m-setpan": Setpan,
......
src/views/Business/Botdav/index.vue
......@@ -128,7 +128,7 @@
export default {
name: "botdav",
name: "Botdav",
components: {
"m-ovwp": Ovwp,
"m-inst": Inst,
......
src/views/Business/Botset/Basp2.vue
......@@ -172,7 +172,9 @@
<c-col :span="24">
<el-form-item label="" prop="bopmod.dbdp.baspp.acp">
<c-checkbox style=" margin: 0px 0 10px 150px;" disabled v-model="model.bopmod.dbdp.baspp.acp">确认</c-checkbox>
</el-form-item>
</c-col>
......@@ -281,6 +283,15 @@ export default {
},
},
},
// watch:{
// "model.lendoc.actflg":function(){
// if(this.model.bopmod.szflg=='2' && this.model.lendoc.actflg=='X'){
// this.model.bopmod.dbdp.baspp.acp="X"
// }else{
// this.model.bopmod.dbdp.baspp.acp=""
// }
// }
// },
methods:{},
created:function(){
......
src/views/Business/Botset/Setp.vue
......@@ -458,11 +458,11 @@ export default {
async change1(){
if(this.model.bodgrp.cbs.opn1.amt<=this.model.setmod.docamt){
this.flag1=false;
this.model.mtabut.clsflg = "O";
// this.model.mtabut.clsflg = "C";
}
else if(this.model.bodgrp.cbs.opn1.amt>this.model.setmod.docamt){
this.flag1=true;
this.model.mtabut.clsflg = "C";
// this.model.mtabut.clsflg = "O";
}},
// async change() {
// if (this.model.bodgrp.rec.focflg === "X") {
......
src/views/Business/BusRouter.js
......@@ -211,7 +211,7 @@ const BusRouter = [
{ path: 'cltdav', component: Cltdav, name: 'Cltdav', meta: { title: '打包托收开立' } },
{ path: 'clttra', component: Clttra, name: 'Clttra', meta: { title: '打包托收催收' } },
{ path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } },
{ path: 'infccd', component: Infccd, name: 'Infccd', meta: { title: '光票托收查询1' } },
{ path: 'infccd', component: Infccd, name: 'Infccd', meta: { title: '光票托收查询' } },
{ path: 'infcld', component: Infcld, name: 'Infcld', meta: { title: '光票托收查询2' } },
{ path: 'ccttra', component: Ccttra, name: 'Ccttra', meta: { title: '光票托收催收' } },
{ path: 'cctdav', component: Cctdav, name: 'Cctdav', meta: { title: '光票托收开立' } },
......
src/views/Business/Cctdav/Cctdav1.vue
......@@ -138,6 +138,7 @@
v-model="model.ccdgrp.rec.purflg"
style="width: 100%"
placeholder="请选择Payment Disposition "
:disabled="model.ccdgrp.rec.modset == '1'"
:code="codes.purflg"
>
</c-select>
......@@ -205,7 +206,7 @@
<c-input
v-model="model.cctp.usr.extkey"
maxlength="8"
placeholder="请输入User ID"
placeholder="请输入resp.usr"
disabled
></c-input>
</el-form-item>
......@@ -326,7 +327,7 @@
v-model="model.ccdgrp.col.pts.ref"
maxlength="16"
placeholder="请输入Coll. Bank参考号"
disabled
:disabled="model.ccdgrp.rec.modset == '2'"
></c-input>
</el-form-item>
</c-col>
......@@ -338,7 +339,10 @@
v-model="model.ccdgrp.col.pts.extkey"
maxlength="16"
placeholder="请输入Coll. Bank"
disabled
@keyup.enter.native="
showGridPromptDialog('ccdgrp.col.pts.extkey')
"
:disabled="model.ccdgrp.rec.modset == '2'"
></c-input>
<template slot="footer">
<c-button
......@@ -366,7 +370,7 @@
maxlength="150"
show-word-limit
placeholder="请输入名称地址"
disabled
:disabled="model.ccdgrp.rec.modset == '2'"
></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Gctcan/Gitsetp1.vue
......@@ -349,7 +349,7 @@
style="width: 100%"
placeholder="请选择Booking Procedure"
><el-option
v-for="item in rebkpflg"
v-for="item in codes.rebkpflg2"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -530,10 +530,7 @@ export default {
mixins: [commonProcess],
data() {
return {
rebkpflg: [
{ label: "Reverse Booking (Claim)", value: "1" },
{ label: "Reverse Booking (Claim, Guarantee)", value: "2" },
],
};
},
methods: { ...Event },
......
src/views/Business/Gitcrj/Gitsetp1.vue
......@@ -204,8 +204,8 @@
disabled
v-model="model.gidgrp.rec.gartyp"
style="width: 100%"
placeholder="请选择type of Undertaking"
:code="codes.typgar2"
placeholder="请选择type of Undertaking"
:code="typgar2"
>
</c-select>
</el-form-item>
......@@ -949,7 +949,11 @@ export default {
mixins: [commonProcess],
data() {
return {
rejtypsel: "1"
rejtypsel: "1",
typgar2: [
{ label: "农民工工资保函", value: "1" },
{ label: "农民工工资保函2", value: "2" },
],
};
},
methods: { ...Event },
......
src/views/Business/Gitset/Basp.vue
......@@ -418,6 +418,17 @@ export default {
data() {
return {};
},
watch:{
"model.bopmod.dbcp.baspp.acp" :{
immediate: true,
handler(val,oldval){
if(this.model.bopmod.dbcp.baspp.acp==""){
this.model.bopmod.dbcp.baspp.acp="X"
}
}
},
},
methods: { ...Event },
created: function () {},
};
......
src/views/Business/Infccd/Infsea.vue
......@@ -265,7 +265,7 @@
size="medium"
type="primary"
@click="toCctdav"
>光票托收建立</c-button
>光票托收开立</c-button
>
</c-col>
<c-col :span="24">
......
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