Skip to content

V
vue-gjjs
Commit 3856cbb1 by WH
Options

Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

parents 4784a9b0 1db73006
Showing with 160 additions and 30 deletions
src/business/betcan/event/buildCommons.js
......@@ -113,9 +113,9 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
objtyp: 'bed',
objinr: model.bedgrp.rec.objinr,
ownref: model.bedgrp.rec.ownref,
},
};
return params
......@@ -124,9 +124,9 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'lid',
objinr: model.brdgrp.rec.objinr,
ownref: model.brdgrp.rec.ownref,
objtyp: 'bed',
objinr: model.bedgrp.rec.objinr,
ownref: model.bedgrp.rec.ownref,
swiftflg: model.brtp.swiftflg,
},
};
......
src/business/betcan/model/index.js
......@@ -3,8 +3,141 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Betcan {
constructor() {
this.data = {
brdgrp: {
adv: {
pts: new Pts().data,
},
prb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
acb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
apl: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
ben: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
blk: {
chaded: '',
docdisflg: '',
chaadd: '',
docdis: '',
},
rec: {
inr: '',
branchinr: '',
totcur: '',
ownref: '',
disdat: '',
totamt: '',
nam: '',
docprbrol: ''
},
cbs: {
opn1: {
cur: ''
},
opn2: {
cur: ''
},
max: {
cur: '',
amt: ''
},
max2: {
amt: ''
}
},
matp: {
mattxtlab: ''
}
},
brtp: {
furide: '',
matp: {
mattxtlab: ''
}
},
gidgrp: {
blk: {
chaded: '',
amtspc: '',
accspc: '',
},
acb: {
pts: new Pts().data,
},
apl: {
pts: new Pts().data,
},
ben: {
pts: new Pts().data,
},
ctr: {
pts: new Pts().data,
},
iss: {
pts: new Pts().data,
},
rec: {
expdat: '',
purpos: '',
liadat: '',
ownref: '',
exptyp: '',
purcan: '',
nam: '',
gartyp: '',
purposin: '',
reddat: '',
redamt: '0',
outcur: '',
redcur: '',
outamt: '0',
branchinr: '',
},
cbs: {
opn1: {
cur: '',
amt: '0',
},
max: {
cur: '',
amt: '0',
},
},
},
sndmsg: '',
ledgrp: {
adv: {
pts: new Pts().data,
},
prb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
acb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
rec: {
ownref: ''
},
......
src/business/betcan/views/Canp.vue
......@@ -43,8 +43,8 @@
</c-col>
<c-col :span="7">
<el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt">
<c-input-currency v-model="model.bedgrp.cbs.max.amt" style="text-align: left; width: 100%"
placeholder="请输入金额" @keyup.enter.native="
<c-input-currency v-model="model.bedgrp.cbs.max.amt" style="text-align: left; width: 100%" placeholder="请输入金额"
@keyup.enter.native="
defaultFunction(
'bedgrp.cbs.max.amt',
model.bedgrp.cbs.max.amt
......@@ -213,6 +213,4 @@ export default {
created: function () { },
}
</script>
<style>
</style>
<style></style>
src/business/betcan/views/index.vue
......@@ -28,11 +28,7 @@
<!--PD000027 -->
<el-tab-pane label="费用/账务" name="setmod">
<c-content>
<m-setmod
:model="model"
:codes="codes"
@changeSetmodModel="changeSetmodModel"
/>
<m-setmod :model="model" :codes="codes" @changeSetmodModel="changeSetmodModel" />
</c-content>
</el-tab-pane>
......@@ -64,8 +60,8 @@
</el-tab-pane>
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog>
<!-- <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog> -->
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
<!-- <el-button size="small">用户确认</el-button>
<el-button size="small">检核</el-button>
......@@ -79,21 +75,26 @@
</div>
</template>
<script>
import Betcan from "~/model/Betcan";
import event from '../event';
import operationFunc from "~/mixin/operationFunc";
import CodeTable from "~/config/CodeTable"
import formRules from '../model/check'
import Betcan from "../model";
import Ovwp from './Ovwp'
import Canp from './Canp'
import Addbcb from "./Addbcb"
import Limitbody from "~/components/business/limitbody/views";
import Engp from "~/components/business/engp/views";
// import Ccvpan from "~/components/business/ccvpan/views";
import Setmod from "~/components/business/setmod/views";
// import Glepan from "~/components/business/glepan/views";
import Glentry from "~/components/business/glentry/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
import Limitbody from "~/components/business/limitbody/views";
import Glepan from "~/components/business/glentry/views";
export default {
name: 'Betcan',
......@@ -103,10 +104,10 @@ export default {
'm-canp': Canp,
'm-limitbody': Limitbody,
'm-engp': Engp,
"m-ccvpan": Ccvpan,
// "m-ccvpan": Ccvpan,
"m-setmod": Setmod,
"m-glentry": Glentry,
// 'm-glepan': Glepan,
'm-glepan': Glepan,
'm-addbcb': Addbcb,
'm-docpan': Docpan,
'm-doctre': Doctre,
......@@ -131,12 +132,10 @@ export default {
}
},
methods: {},
mounted () {
mounted() {
this.init()
},
}
</script>
<style>
</style>
<style></style>
src/business/litdck/model/index.js
......@@ -22,7 +22,7 @@ export default class Litdck {
tenmaxday: '',
rcvdat: '',
predat: '',
advtyp: '750',
advtyp: '',
docflg: '',
approvcod: '',
ownref: '',
......
src/business/litopn/model/check.js
......@@ -463,8 +463,8 @@ export default {
'lidgrp.rec.stagod': [{ required: true, message: '必输项' }],
'lidgrp.rec.tenmaxday': [
{ type: 'number', required: true, message: '请输入数字' },
{ type: 'number', max: 999, message: '不能超过999' },
{ type: 'string', required: true, message: '请输入数字' },
{ type: 'string', max: 999, message: '不能超过999' },
{ pattern: /(^-?[1-9][0-9]{0,2}$)|0/, message: '-999至999之间' },
// ^-?[1-9]\d*$　　 //匹配整数
],
......
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