Skip to content

V
vue-gjjs
Commit 15e2a191 by 潘际乾
Options

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

parents 26b087c5 f420d52b
Showing with 88 additions and 60 deletions
src/views/Business/Ditopn/Setpan.vue
......@@ -158,7 +158,7 @@
<template slot-scope="scoped">
<el-button
size="mini"
@click="detail1(scoped.index, scoped.row)"
@click="detail1(scoped.$index, scoped.row)"
>details</el-button
>
</template>
......@@ -386,6 +386,7 @@
<script>
import Event from "~/model/Ditopn/Event";
import SetpanDialog from "./SetpanDialog.vue";
import Api from "~/service/Api"
export default {
components: { SetpanDialog },
......@@ -418,14 +419,19 @@ export default {
this.model.setmod.setfog.setfol.pop();
},
detail1(index, row) {
this.dialogVisible = true;
Api.post("ditopn/executeRule/det",this.model).then(res=>{
this.dialogVisible = true;
this.dialog = row;
this.index = index;
})
},
detail2(index, row) {
Api.post("ditopn/executeRule/det",this.model).then(res=>{
this.dialogVisible2 = true;
this.index = index;
this.dialog2 = row
})
},
saveDialog() {
this.visiable = false;
......
src/views/Business/Ditopn/SetpanDialog.vue
......@@ -139,69 +139,92 @@
</el-col>
<el-col>
<el-form-item
label="Per mile fee depending on duration"
:label="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.'"
/>
</el-col>
<el-col :span="12">
<el-col>
<el-form-item label="千分率">
<el-input
v-model="model.setmod.setfeg.setfel[idx].fecp1.ratcal"
style="width: 200px"
/>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="最小值">
<el-select
v-model="model.setmod.setfeg.setfel[idx].fecp1.mincur"
style="width: 200px" >
<el-option
v-for="item in codes.mincur"
:label="item.label"
:value="item.value"
:key="item.value"
<el-col :span="12">
<el-col v-if="idx==0">
<el-col>
<el-form-item label="千分率">
<el-input
v-model="model.setmod.setfeg.setfel[idx].fecp1.ratcal"
style="width: 200px"
/>
</el-select>
<!-- v-model="model.setmod.setfeg.setfel[idx].fecp1.fec.minamt" -->
<el-input
style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.minamt"
/>
<el-input
style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.minfcc"
/>
</el-form-item>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="最小值">
<el-select
v-model="model.setmod.setfeg.setfel[idx].fecp1.mincur"
style="width: 200px" >
<el-option
v-for="item in codes.mincur"
:label="item.label"
:value="item.value"
:key="item.value"
/>
</el-select>
<!-- v-model="model.setmod.setfeg.setfel[idx].fecp1.fec.minamt" -->
<el-input
style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.minamt"
/>
<el-input
style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.minfcc"
/>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="最大值">
<el-select
v-model="model.setmod.setfeg.setfel[idx].fecp1.maxcur"
style="width: 200px" >
<el-option
v-for="item in codes.maxcur"
:label="item.label"
:value="item.value"
:key="item.value"
/>
</el-select>
<el-input
style="width: 200px;"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.maxamt"/>
<el-input
style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.maxfcc"
/>
</el-form-item>
</el-col>
<el-col>
<el-form-item>
<el-checkbox
label="CG000652"
v-model="model.setmod.setfeg.setfel[idx].fecp1.jnwshx"
/>
</el-form-item>
</el-col>
</el-col>
<el-col>
<el-form-item label="最大值">
<el-select
v-model="model.setmod.setfeg.setfel[idx].fecp1.maxcur"
style="width: 200px" >
<el-col v-else>
<el-form-item label="Amount">
<el-select v-model="model.setmod.setfeg.setfel[idx].wrkfec.ratcur">
<el-option
v-for="item in codes.maxcur"
:label="item.label"
:value="item.value"
:key="item.value"
/>
v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-input
style="width:200px;"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.untamt "
>
<el-input
style="width: 200px;"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.maxamt"/>
<el-input
style="width: 200px"
v-model="model.setmod.setfeg.setfel[idx].wrkfec.maxfcc"
/>
</el-form-item>
</el-col>
<el-col>
<el-form-item>
<el-checkbox
label="CG000652"
v-model="model.setmod.setfeg.setfel[idx].fecp1.jnwshx"
/>
</el-input>
</el-form-item>
</el-col>
<el-col>
......@@ -223,7 +246,7 @@
</el-form-item>
</el-col>
</el-col>
<el-col :span="12">
<el-col v-if="idx==0" :span="12">
<el-form-item label="Caiculation Base">
<el-input
v-model="model.setmod.setfeg.setfel[idx].fecp1.calcbs"
......
src/views/Business/Ditopn/index.vue
......@@ -175,7 +175,6 @@ export default {
}
if (label === "分录") {
this.executeRule("setmod.glemod.glepan").then(res => {
debugger;
const data = res.data;
this.$refs.glepan.stmData.data = res.data.setmod_glemod_gleshwstm.rows;
//Utils.copyValueFromVO(this.model, data)
......
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