Commit 144bcd69 by zhouqian

Merge branch 'development-202206' into 'development-202206'

Development 202206

See merge request !26
parents 756d91d7 8c539e36
......@@ -58,7 +58,7 @@ export default {
"ledgrp.cbs.nom1.amt": [
{ required: true, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" },
{ max: 18, message: "整数位不能超过15位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -89,7 +89,7 @@ export default {
"ledgrp.cbs.max.amt":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{max: 18,message:"整数位不能超过15位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"ledgrp.iss.pts.ref":[
......@@ -641,10 +641,7 @@ export default {
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"ledgrp.blk.addamtcov":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"ledgrp.blk.spcben":[
{type: "string", required: false, message: "必输项"},
{max: 52000,message:"长度不能超过52000"}
......
......@@ -25,7 +25,7 @@
<c-button
style="margin: 0 0"
:disabled="!this.flag && model.gidgrp.rec.ownref == ''? false:true"
:disabled="this.flag && model.gidgrp.rec.ownref == ''? false:true"
size="small"
type="primary"
@click="onGitpButgetref"
......@@ -1393,7 +1393,7 @@ export default {
},
computed: {
flag() {
return this.model.gidgrp.apl.pts.extkey == "";
return this.model.gidgrp.apl.pts.extkey != "" && this.model.gidgrp.rec.hndtyp !="" && (this.model.gidgrp.rec.hndtyp=="OL" || this.model.gidgrp.rec.hndtyp=="OC");
},
amtwidth(){
return this.model.gitp.swiftflg != 'Y'? 'width:80%' : 'width:100%';
......
......@@ -450,6 +450,9 @@ export default {
},
immediate: true,
},
"model.ledgrp.rec.tenmaxday":function(val){
this.model.ledgrp.rec.tenmaxday = val.replace(/\D/g, '');
}
},
}
</script>
......
......@@ -449,6 +449,14 @@ export default {
data() {
return {};
},
watch:{
"model.ledgrp.rec.nomtop":function(val){
this.model.ledgrp.rec.nomtop = val.replace(/\D/g, '');
},
"model.ledgrp.rec.nomton":function(val){
this.model.ledgrp.rec.nomton = val.replace(/\D/g, '');
}
},
methods: {
...Event,
nomtopChange(){
......
......@@ -112,6 +112,11 @@ export default {
},
methods: { ...Event },
created: function () {},
watch:{
"model.ledgrp.rec.revtimes":function(val){
this.model.ledgrp.rec.revtimes = val.replace(/\D/g, '');
}
},
}
</script>
<style></style>
......@@ -50,7 +50,7 @@
<c-col v-if="isAdrblk" :span="24">
<el-form-item label="名称地址" :prop="`${argadr.grp}.${argadr.rol}.pts.adrblk`">
<c-input type="textarea" :rows="4" v-model="model[argadr.grp][argadr.rol].pts.adrblk" maxlength="150"
show-word-limit placeholder="请输入名称地址" :disabled="disabled"></c-input>
show-word-limit placeholder="请输入名称地址" :disabled="model[argadr.grp][argadr.rol].pts.extkey!=''?true:false"></c-input>
</el-form-item>
</c-col>
<c-col v-else-if="!haveAdrLabel" :span="24">
......
......@@ -273,19 +273,19 @@
<c-col :span="16">
<c-col :span="18">
<el-form-item label="费用">
<c-select v-model="dialog.cur" style="width: 100%">
<el-option
<c-select v-model="dialog.cur" style="width: 100%" :code="codes.curtxt1">
<!-- <el-option
v-for="item in codes.cur"
:key="item.value"
:labelF="item.label"
:value="item.value"
/>
/> -->
</c-select>
</el-form-item>
</c-col>
<c-col :span="6">
<el-form-item label="" label-width="20px">
<c-input v-model="dialog.amt" style="width: 100%" />
<c-input-currency v-model="dialog.amt" style="width: 100%" />
</el-form-item>
</c-col>
</c-col>
......@@ -1352,6 +1352,7 @@
<script>
// import Event from "~/model/Ditopn/Event";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import SetpanDialog from "./SetpanDialog.vue";
import Api from "~/service/Api";
import Utils from "~/utils/index";
......
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