Skip to content

V
vue-gjjs
Commit 0c5c9ca8 by zhengxiaokui
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 21627e93 af021a6c
Showing with 156 additions and 167 deletions
src/components/GridEtyPromptDialog.vue
...@@ -65,7 +65,6 @@ export default { ...@@ -65,7 +65,6 @@ export default {
const obj = {} const obj = {}
for (let i = 0; i < lines.length; i++) { for (let i = 0; i < lines.length; i++) {
let line = lines[i]; let line = lines[i];
line = line.replace(/Quote/g, "\"");
if (etyReg.test(line)) { if (etyReg.test(line)) {
const gs = line.match(etyReg) const gs = line.match(etyReg)
const columnName = gs[1] const columnName = gs[1]
......
src/views/Business/Ditopn/index.vue
...@@ -172,15 +172,13 @@ export default { ...@@ -172,15 +172,13 @@ export default {
}, },
methods:{ methods:{
}, },
mounted:async function(){ created:async function(){
console.log("进入ditopn交易"); console.log("进入ditopn交易");
let rtnmsg = await this.init(this.$route.query) let rtnmsg = await this.init(this.$route.query)
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//更新数据 //更新数据
console.log(rtnmsg)
Utils.copyValueFromVO(this.model,rtnmsg.data) Utils.copyValueFromVO(this.model,rtnmsg.data)
console.log(this.model);
if(this.isInDisplay){ if(this.isInDisplay){
this.restoreDisplay() this.restoreDisplay()
} }
......
src/views/Public/Setpan.vue
...@@ -169,34 +169,46 @@ ...@@ -169,34 +169,46 @@
</c-col> </c-col>
<c-col> <c-col>
<el-dialog :visible.sync="dialogVisible" center> <el-dialog :visible.sync="dialogVisible" center>
<el-form :model="dialog"> <c-col>
<el-form :model="dialog" label-width="200px">
<c-col :span="16" >
<el-form-item label="收款人"> <el-form-item label="收款人">
<el-select v-model="dialog.ptypay"> <el-select v-model="dialog.ptypay" style="width: 100%">
<el-option <el-option
v-for="item in codes.ptypay" v-for="item in codes.payee"
:key="item.value" :key="item.value"
:labelF="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="收款人摘要" </c-col>
><c-input v-model="dialog.txtpay" /> <c-col :span="16">
<el-form-item label="收款人摘要">
<c-input v-model="dialog.txtpay" style="width: 100%"/>
</el-form-item> </el-form-item>
</c-col>
<c-col :span="16">
<el-form-item label="付款人"> <el-form-item label="付款人">
<el-select v-model="dialog.ptydbt"> <el-select v-model="dialog.ptydbt" style="width: 100%">
<el-option <el-option
v-for="item in codes.ptydbt" v-for="item in codes.ptydbt"
:key="item.value" :key="item.value"
:labelF="item.label" :labelF="item.label"
:value="item.value" :value="item.value"
/> </el-select />
></el-form-item> </el-select>
<el-form-item label="付款人摘要" </el-form-item>
><c-input v-model="dialog.txtdbp" /> </c-col>
<c-col :span="16">
<el-form-item label="付款人摘要">
<c-input v-model="dialog.txtdbp" style="width: 100%"/>
</el-form-item> </el-form-item>
<el-form-item label="费用" </c-col>
><c-select v-model="dialog.cur"> <c-col :span="16">
<c-col :span="18">
<el-form-item label="费用">
<c-select v-model="dialog.cur" style="width: 100%">
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.cur"
:key="item.value" :key="item.value"
...@@ -204,21 +216,24 @@ ...@@ -204,21 +216,24 @@
:value="item.value" :value="item.value"
/> />
</c-select> </c-select>
<c-input v-model="dialog.amt" style="width: 200px"
/></el-form-item>
<el-form-item label-width="10em">
<c-checkbox v-model="dialog.forflg"
>CG00005</c-checkbox
>
</el-form-item> </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%"/>
</el-form-item>
</c-col>
</c-col>
<c-col :span="16">
<el-form-item>
<c-checkbox v-model="dialog.forflg">CG00005</c-checkbox>
</el-form-item>
</c-col>
</el-form> </el-form>
</c-col>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveDialog" <el-button type="primary" @click="saveDialog">确 定</el-button>
>确 定</el-button
>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
</span> </span>
</el-dialog> </el-dialog>
</c-col> </c-col>
...@@ -292,7 +307,7 @@ ...@@ -292,7 +307,7 @@
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col>
<setpan-dialog v-if="dialogVisible2" :visible="dialogVisible2" :model="model" :idx="index" :codes="codes"/> <setpan-dialog ref="setpanDialog" :model="model" :idx="index" :codes="codes"/>
<c-col :span="24" style="text-align: left"> <c-col :span="24" style="text-align: left">
<el-form-item label="Settlement:" label-width="100px"> <el-form-item label="Settlement:" label-width="100px">
</el-form-item> </el-form-item>
...@@ -403,7 +418,6 @@ export default { ...@@ -403,7 +418,6 @@ export default {
data() { data() {
return { return {
dialogVisible: false, dialogVisible: false,
dialogVisible2: false,
dialog: { dialog: {
payee: "", payee: "",
ptydbt: "", ptydbt: "",
...@@ -449,10 +463,12 @@ export default { ...@@ -449,10 +463,12 @@ export default {
}, },
// 第三个表格 // 第三个表格
detail2(index, row) { detail2(index, row) {
this.executeRule("det").then(res=>{ const that = this;
this.dialogVisible2 = true; that.executeRule("det").then(res=>{
this.index = index; that.$refs.setpanDialog.visiable = true;
this.dialog2 = row that.$refs.setpanDialog.formData = Object.assign({}, that.model.setmod.setfeg.setfel[index]);
that.index = index;
that.dialog2 = row
}) })
}, },
}, },
......
src/views/Public/SetpanDialog.vue
<template> <template>
<el-dialog :visible.sync="visiable" center fullscreen destroy-on-close><c-col> <el-dialog
<el-form v-model="model.setmod.setfeg.setfel[idx]" inline> v-if="visiable"
:visible.sync="visiable"
center
fullscreen
destroy-on-close
:before-close="beforeClose"
>
<c-col>
<el-form v-model="formData" inline>
<c-col> <c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="费用代码"> <el-form-item label="费用代码">
<c-input <c-input v-model="formData.feecod" disabled />
v-model="model.setmod.setfeg.setfel[idx].feecod"
disabled/>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="16"> <c-col :span="16">
<el-form-item label="中文描述"> <el-form-item label="中文描述">
<c-input v-model="formData.feetxt" style="width: 350px" />
<c-input <c-input
v-model="model.setmod.setfeg.setfel[idx].feetxt" v-model="formData.modflg"
style="width: 350px"/>
<c-input
v-model="model.setmod.setfeg.setfel[idx].modflg"
disabled disabled
style="width: 350px; margin-left: 100px"/> style="width: 350px; margin-left: 100px"
/>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col> <c-col>
<c-col :span="6"> <c-col :span="6">
<el-form-item label="详细信息"> <el-form-item label="详细信息">
<c-input <c-input v-model="formData.feetxtinf" />
v-model="model.setmod.setfeg.setfel[idx].feetxtinf" </el-form-item>
/>
</el-form-item
>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<el-form-item label="起算时间"> <el-form-item label="起算时间">
<c-input <!-- <c-input v-model="formData.dat1" type="date" /> -->
v-model="model.setmod.setfeg.setfel[idx].dat1" <c-date-picker
type="date" type="date"
/> v-model="formData.dat1"
</el-form-item format="yyyy-MM-dd"
> style="width: 100%"
placeholder="请选择起算时间"
></c-date-picker>
</el-form-item>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<el-form-item label="结束时间"> <el-form-item label="结束时间">
<c-input <c-date-picker
v-model="
model.setmod.setfeg.setfel[idx].dat2
"
type="date" type="date"
/> v-model="formData.dat2"
</el-form-item format="yyyy-MM-dd"
> style="width: 100%"
placeholder="请选择结束时间"
></c-date-picker>
</el-form-item>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<el-form-item label="收取份数"> <el-form-item label="收取份数">
<c-input <c-input v-model="formData.unt" />
v-model="model.setmod.setfeg.setfel[idx].unt" </el-form-item>
/>
</el-form-item
>
</c-col> </c-col>
</c-col> </c-col>
<c-col> <c-col>
<el-form-item label="费用换算"> <el-form-item label="费用换算">
<c-select <c-select v-model="formData.usrcur">
v-model="model.setmod.setfeg.setfel[idx].usrcur">
<el-option <el-option
v-for="item in codes.usrcur" v-for="item in codes.cur"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
/> />
</c-select> </c-select>
<c-input <c-input
v-model="model.setmod.setfeg.setfel[idx].usramt" v-model="formData.usramt"
style="width: 200px; margin-left: 50px" style="width: 200px; margin-left: 50px"
/> />
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col> <c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="应收费用" <el-form-item label="应收费用">
>
<c-input <c-input
v-model="model.setmod.setfeg.setfel[idx].cur" v-model="formData.cur"
disabled disabled
style="width: 100px; margin-right: 10px" style="width: 100px; margin-right: 10px"
/> />
<c-input <c-input
v-model="model.setmod.setfeg.setfel[idx].ogiamt" v-model="formData.ogiamt"
disabled disabled
style="width: 200px" style="width: 200px"
/> />
</el-form-item </el-form-item>
>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="优惠百分比" <el-form-item label="优惠百分比">
> <c-input v-model="formData.dctrat">
<c-input v-model="model.setmod.setfeg.setfel[idx].dctrat" >
<template #append>%</template> <template #append>%</template>
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="Period calculation starting at"> <el-form-item label="Period calculation starting at">
<c-input <c-input v-model="formData.datrefbeg" disabled />
v-model="model.setmod.setfeg.setfel[idx].datrefbeg" </el-form-item>
disabled/>
</el-form-item
>
</c-col> </c-col>
</c-col> </c-col>
<c-col> <c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="付款方"> <el-form-item label="付款方">
<c-select <c-select v-model="formData.rol">
v-model="model.setmod.setfeg.setfel[idx].rol">
<el-option <el-option
v-for="item in codes.rol" v-for="item in codes.setfelRol"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
...@@ -126,63 +120,57 @@ ...@@ -126,63 +120,57 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="优惠金额"> <el-form-item label="优惠金额">
<c-input <c-input v-model="formData.dctamt" />
v-model="model.setmod.setfeg.setfel[idx].dctamt"/>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="优惠后实收费用金额"> <el-form-item label="优惠后实收费用金额">
<c-input <c-input v-model="formData.amt" />
v-model="model.setmod.setfeg.setfel[idx].amt"/>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col> <c-col>
<el-form-item <el-form-item
:label="idx==0?'Per mile fee depending on duration': :label="
'A fixed amount per unit is caculated. This type will, for example, be used for correspondence charges.'" idx == 0
? 'Per mile fee depending on duration'
: 'A fixed amount per unit is caculated. This type will, for example, be used for correspondence charges.'
"
/> />
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-col v-if="idx==0"> <c-col v-if="idx == 0">
<c-col> <c-col>
<el-form-item label="千分率"> <el-form-item label="千分率">
<c-input <c-input v-model="formData.wrkfec.ratcal" style="width: 200px" />
v-model="model.setmod.setfeg.setfel[idx].fecp1.ratcal"
style="width: 200px"
/>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col> <c-col>
<el-form-item label="最小值"> <el-form-item label="最小值">
<c-select <c-select v-model="formData.wrkfec.mincur" style="width: 200px">
v-model="model.setmod.setfeg.setfel[idx].fecp1.mincur"
style="width: 200px" >
<el-option <el-option
v-for="item in codes.mincur" v-for="item in codes.cur"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
/> />
</c-select> </c-select>
<!-- v-model="model.setmod.setfeg.setfel[idx].fecp1.fec.minamt" --> <!-- v-model="formData.fecp1.fec.minamt" -->
<c-input <c-input
style="width: 200px" style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.minamt" v-model="formData.wrkfec.minamt"
/> />
<c-input <!-- <c-input
style="width: 200px" style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.minfcc" v-model="formData.wrkfec.minfcc"
/> /> -->
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col> <c-col>
<el-form-item label="最大值"> <el-form-item label="最大值">
<c-select <c-select v-model="formData.wrkfec.maxcur" style="width: 200px">
v-model="model.setmod.setfeg.setfel[idx].fecp1.maxcur"
style="width: 200px" >
<el-option <el-option
v-for="item in codes.maxcur" v-for="item in codes.cur"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
...@@ -191,46 +179,39 @@ ...@@ -191,46 +179,39 @@
<c-input <c-input
style="width: 200px;" style="width: 200px;"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.maxamt"/> v-model="formData.wrkfec.maxamt"
<c-input
style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.maxfcc"
/> />
<!-- <c-input
style="width: 200px"
v-model="formData.wrkfec.maxfcc"
/> -->
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col> <c-col>
<el-form-item> <el-form-item>
<c-checkbox <c-checkbox label="CG000652" v-model="formData.fecp1.jnwshx" />
label="CG000652"
v-model="model.setmod.setfeg.setfel[idx].fecp1.jnwshx"
/>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col v-else> <c-col v-else>
<el-form-item label="Amount"> <el-form-item label="Amount">
<c-select v-model="model.setmod.setfeg.setfel[idx].wrkfec.ratcur"> <c-select v-model="formData.wrkfec.ratcur">
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.cur"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
</c-select> </c-select>
<c-input <c-input style="width:200px;" v-model="formData.wrkfec.untamt">
style="width:200px;"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.untamt "
>
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col> <c-col>
<el-form-item label="销项税"> <el-form-item label="销项税">
<c-input <c-input
v-model="model.setmod.setfeg.setfel[idx].fecp1.taxrat" v-model="formData.fecp1.taxrat"
disabled disabled
style="width: 200px" style="width: 200px"
/> />
...@@ -239,24 +220,24 @@ ...@@ -239,24 +220,24 @@
<c-col> <c-col>
<el-form-item label="客户属性"> <el-form-item label="客户属性">
<c-input <c-input
v-model="model.setmod.setfeg.setfel[idx].fecp1.custyp" v-model="formData.fecp1.custyp"
disabled disabled
style="width: 200px" style="width: 200px"
/> />
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col v-if="idx==0" :span="12"> <c-col v-if="idx == 0" :span="12">
<el-form-item label="Caiculation Base"> <el-form-item label="Caiculation Base">
<c-input <c-input
v-model="model.setmod.setfeg.setfel[idx].fecp1.calcbs" v-model="formData.wrkfec.calcbs"
disabled disabled
style="width: 200px" style="width: 200px"
/> />
</el-form-item> </el-form-item>
<br />
<el-form-item label="Calc.Period"> <el-form-item label="Calc.Period">
<c-select <c-select v-model="formData.wrkfec.pertyp">
v-model="model.setmod.setfeg.setfel[idx].fecp1.pertyp">
<el-option <el-option
v-for="item in codes.pertyp" v-for="item in codes.pertyp"
:label="item.label" :label="item.label"
...@@ -265,66 +246,63 @@ ...@@ -265,66 +246,63 @@
/> />
</c-select> </c-select>
</el-form-item> </el-form-item>
<br />
<el-form-item label="Min.Periods"> <el-form-item label="Min.Periods">
<c-input <c-input v-model="formData.wrkfec.permin" style="width: 200px" />
v-model="model.setmod.setfeg.setfel[idx].fecp1.per"
style="width: 200px"
/>
</el-form-item> </el-form-item>
<el-form-item label="Rates to Apply per Period Tier"/> <br />
<el-form-item label="Rates to Apply per Period Tier" />
<br />
<el-form-item label="from Perimod"> <el-form-item label="from Perimod">
<c-input <c-input style="width: 200px" v-model="formData.wrkfec.perbegtr2" />
style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.perbegtr2"
/>
<c-input <c-input
disabled disabled
style="width: 200px; margin-left: 50px" style="width: 200px; margin-left: 50px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.perrattr2" v-model="formData.wrkfec.perrattr2"
/> />
</el-form-item> </el-form-item>
<el-form-item label="from Perimod"> <el-form-item label="from Perimod">
<c-input <c-input
disabled disabled
style="width: 200px" style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.perbegtr3" v-model="formData.wrkfec.perbegtr3"
/> />
<c-input <c-input
disabled disabled
style="width: 200px; margin-left: 50px" style="width: 200px; margin-left: 50px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.perrattr3" v-model="formData.wrkfec.perrattr3"
/> />
</el-form-item> </el-form-item>
<el-form-item label="from Perimod"> <el-form-item label="from Perimod">
<c-input <c-input
disabled disabled
style="width: 200px" style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.perbegtr4" v-model="formData.wrkfec.perbegtr4"
/> />
<c-input <c-input
disabled disabled
style="width: 200px; margin-left: 50px" style="width: 200px; margin-left: 50px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.perrattr4" v-model="formData.wrkfec.perrattr4"
/> />
</el-form-item> </el-form-item>
<el-form-item label="from Perimod"> <el-form-item label="from Perimod">
<c-input <c-input
disabled disabled
style="width: 200px" style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.perbegtr5" v-model="formData.wrkfec.perbegtr5"
/> />
<c-input <c-input
disabled disabled
style="width: 200px; margin-left: 50px" style="width: 200px; margin-left: 50px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.perrattr5" v-model="formData.wrkfec.perrattr5"
/> />
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col>&nbsp;</c-col> <c-col>&nbsp;</c-col>
<c-col :span="18" :offset="6"> <c-col :span="18" :offset="6">
<el-form-item label="收费的说明信息" > <el-form-item label="收费的说明信息">
<c-input <c-input
v-model="model.setmod.setfeg.setfel[idx].inftxt" v-model="formData.inftxt"
disabled disabled
rows="10" rows="10"
type="textarea" type="textarea"
...@@ -338,40 +316,38 @@ ...@@ -338,40 +316,38 @@
确 定 确 定
</c-button> </c-button>
</c-col> </c-col>
<c-col :span="6" > <c-col :span="6">
<c-button @click="visiable = false">取 消</c-button> <c-button @click="visiable = false">取 消</c-button>
</c-col> </c-col>
<c-col>&nbsp;</c-col>
</c-col> </c-col>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
visible: Boolean,
model: Object, model: Object,
idx: Number, idx: Number,
codes:Object, codes: Object,
},
data() {
return {
formData: {},
visiable: false,
};
}, },
methods: { methods: {
saveDialog() { saveDialog() {
this.model.setmod.setfeg.setfel[this.idx] = this.formData;
this.visiable = false; this.visiable = false;
}, },
}, beforeClose(done) {
computed:{ this.visiable = false;
visiable:{ done()
get:function () {return this.visible;},
set:function (value) {
this.$parent.$parent.dialogVisible2 =value;
}
}
} }
},
}; };
</script> </script>
<style> <style></style>
</style>
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