Skip to content

V
vue-gjjs
Commit dc24f88f by wangna
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 1b4ef3a0 535feaaa
Showing with 63 additions and 21 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/Bdtdcr/Pattern.js
......@@ -21,7 +21,8 @@ export default {
"didgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
//{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bdtp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
src/model/Bdteus/Pattern.js
......@@ -21,7 +21,8 @@ export default {
"didgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bdtp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
src/model/Ditdck/Pattern.js
......@@ -32,7 +32,8 @@ export default {
"didgrp.cbs.opn1.amt":[
{required: false, message: "必输项", trigger: 'blur'},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bddgrp.apl.pts.nam":[
{type: "string", required: false, message: "必输项"},
......@@ -97,7 +98,8 @@ export default {
"bddgrp.cbs.max.amt":[
{required: true, message: "必输项", trigger: 'blur'},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bddgrp.rec.docprbrol": [
{ type: "string", required: true, message: "必输项" },
......@@ -188,7 +190,8 @@ export default {
"bddgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
// "bddgrp.rec.rcvdat":[
// {type: "date", required: false, message: "输入正确的日期"}
......
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/Bdtdck/Brtdckp.vue
......@@ -67,7 +67,7 @@
</c-col>
<c-col :span="13">
<el-form-item label-width="0" prop="bddgrp.cbs.max.amt">
<c-input :disabled="model.mhtyp == 'R'" v-model="model.bddgrp.cbs.max.amt" maxlength="3"
<c-input disabled v-model="model.bddgrp.cbs.max.amt"
placeholder="请输入单据金额"></c-input>
</el-form-item>
</c-col>
......@@ -80,7 +80,7 @@
</c-col>
<c-col :span="13">
<el-form-item label-width="0" prop="bddgrp.cbs.opn1.amt">
<c-input v-model="model.bddgrp.cbs.opn1.amt" maxlength="3" placeholder="请输入单据余额" disabled>
<c-input v-model="model.bddgrp.cbs.opn1.amt" placeholder="请输入单据余额" disabled>
</c-input>
</el-form-item>
</c-col>
......@@ -153,7 +153,7 @@
</c-col>
<c-col :span="13">
<el-form-item label-width="0" prop="bddgrp.cbs.max.amt">
<c-input v-model="model.bddgrp.cbs.max.amt" maxlength="3" placeholder="请输入单据金额"
<c-input v-model="model.bddgrp.cbs.max.amt" placeholder="请输入单据金额"
:disabled="model.mhtyp == 'R'"></c-input>
</el-form-item>
</c-col>
......@@ -289,7 +289,7 @@
</c-col>
<c-col :span="13">
<el-form-item label-width="0" prop="didgrp.cbs.opn1.amt">
<c-input v-model="model.didgrp.cbs.opn1.amt" maxlength="3" placeholder="请输入信用证余额" disabled>
<c-input v-model="model.didgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled>
</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 () {},
};
......
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