Skip to content

V
vue-gjjs
Commit bee651e5 by liyixun
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 6d08c223 84584dad
Showing with 160 additions and 94 deletions
src/model/Botame/Default.js
...@@ -68,5 +68,7 @@ export default { ...@@ -68,5 +68,7 @@ export default {
"oldbodgrp.rec.matpertyp" :Utils.defaultFunction, "oldbodgrp.rec.matpertyp" :Utils.defaultFunction,
"botamep.amedat" :Utils.defaultFunction, "botamep.amedat" :Utils.defaultFunction,
"oldbodgrp.rec.matpercnt" :Utils.defaultFunction, "oldbodgrp.rec.matpercnt" :Utils.defaultFunction,
"bodgrp.blk.docpre" :Utils.defaultFunction,
"botp.docgrdm.docgrd" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/model/Botset/index.js
...@@ -213,6 +213,7 @@ export default class Botset{ ...@@ -213,6 +213,7 @@ export default class Botset{
account:"", // ACT .lendoc.account account:"", // ACT .lendoc.account
vercerref:"", // Verification Certificate Number .lendoc.vercerref vercerref:"", // Verification Certificate Number .lendoc.vercerref
decnum:"", // Declaration Number .lendoc.decnum decnum:"", // Declaration Number .lendoc.decnum
botsetl1blk:"",
}, },
bopmod:{ bopmod:{
szflg:"", // 申报类型 .bopmod.szflg szflg:"", // 申报类型 .bopmod.szflg
......
src/views/Business/Bctame/Detp.vue
...@@ -12,7 +12,17 @@ ...@@ -12,7 +12,17 @@
</c-col> </c-col>
<c-col :span="1"> <c-col :span="1">
<c-button size="small" type="primary" icon="el-icon-search" @click="onColinsButtxmsel"> <c-button size="small" type="primary" icon="el-icon-search"
@click="
showGridPromptDialog(
'bctp.colins.buttxmsel',
null,
null,
{ TXT: 'bcdgrp.blk.colins' },
{ TXT: false },
'doxpDialog'
)
">
</c-button> </c-button>
</c-col> </c-col>
</c-col> </c-col>
...@@ -25,7 +35,17 @@ ...@@ -25,7 +35,17 @@
</c-col> </c-col>
<c-col :span="1"> <c-col :span="1">
<c-button size="small" type="primary" icon="el-icon-search" @click="onDftinsButtxmsel"> <c-button size="small" type="primary" icon="el-icon-search"
@click="
showGridPromptDialog(
'bctp.dftins.buttxmsel',
null,
null,
{ TXT: 'bcdgrp.blk.dftins' },
{ TXT: false },
'doxpDialog'
)
">
</c-button> </c-button>
</c-col> </c-col>
</c-col> </c-col>
...@@ -48,7 +68,17 @@ ...@@ -48,7 +68,17 @@
</c-col> </c-col>
<c-col :span="1"> <c-col :span="1">
<c-button size="small" type="primary" icon="el-icon-search" @click="onOthins1Buttxmsel"> <c-button size="small" type="primary" icon="el-icon-search"
@click="
showGridPromptDialog(
'bctp.othins.buttxmsel',
null,
null,
{ TXT: 'bcdgrp.blk.othins' },
{ TXT: false },
'doxpDialog'
)
">
</c-button> </c-button>
</c-col> </c-col>
</c-col> </c-col>
......
src/views/Business/Bctame/Ovwp.vue
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
v-model="model.bcdgrp.blk.bcgdet" v-model="model.bcdgrp.blk.bcgdet"
maxlength="45" maxlength="45"
show-word-limit show-word-limit
disabled :disabled="model.bcdgrp.blk.bcgdetflg!='X'"
placeholder="请输入Maturity Text" placeholder="请输入Maturity Text"
></c-input> ></c-input>
</el-form-item> </el-form-item>
......
src/views/Business/Bctame/Ptyp.vue
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
v-model="model.bcdgrp.dre.pts.extkey" v-model="model.bcdgrp.dre.pts.extkey"
maxlength="50" maxlength="50"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bcdgrp.dre.pts.extkey')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
v-model="model.bcdgrp.co2.pts.extkey" v-model="model.bcdgrp.co2.pts.extkey"
maxlength="50" maxlength="50"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bcdgrp.co2.pts.extkey')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
...@@ -170,7 +171,7 @@ ...@@ -170,7 +171,7 @@
v-model="model.bcdgrp.rmi.pts.extkey" v-model="model.bcdgrp.rmi.pts.extkey"
maxlength="50" maxlength="50"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bcdgrp.rmi.pts.extkey')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
...@@ -226,7 +227,7 @@ ...@@ -226,7 +227,7 @@
v-model="model.bcdgrp.drr.pts.extkey" v-model="model.bcdgrp.drr.pts.extkey"
maxlength="50" maxlength="50"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bcdgrp.drr.pts.extkey')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
......
src/views/Business/Bctame/index.vue
...@@ -79,6 +79,13 @@ ...@@ -79,6 +79,13 @@
:promptData="promptData" :promptData="promptData"
v-on:select-ety="selectEty" v-on:select-ety="selectEty"
></c-grid-ety-prompt-dialog> ></c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
</div> </div>
</c-page> </c-page>
</template> </template>
......
src/views/Business/Botdav/Libp.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
v-model="model.cnybop.cnylib.sforeigncountrycode" v-model="model.cnybop.cnylib.sforeigncountrycode"
maxlength="3" maxlength="3"
placeholder="请输入境外企业国别地区代码" placeholder="请输入境外企业国别地区代码"
@keyup.enter.native="eventFunction('cnybop.cnylib.sforeigncountrycode')" @keyup.enter.native="showGridPromptDialog('cnybop.cnylib.sforeigncountrycode')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<!-- @click="showGridPromptDialog('cnybop.libcty.selbut1',null,null,{TXT:'cnybop.cnylib.sforeigncountrycode'},{TXT:false},'doxpDialog')" --> <!-- @click="showGridPromptDialog('cnybop.libcty.selbut1',null,null,{TXT:'cnybop.cnylib.sforeigncountrycode'},{TXT:false},'doxpDialog')" -->
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="onLibctySelbut1" @click="showGridPromptDialog('cnybop.codcny.selbut1', null, null,{COD: 'cnybop.cnylib.sforeigncountrycode'}, {TXT: false},'doxpDialog')"
> >
? ?
</c-button> </c-button>
......
src/views/Public/Doctre.vue
...@@ -180,7 +180,6 @@ export default { ...@@ -180,7 +180,6 @@ export default {
}, },
methods:{ methods:{
getType(idx) { getType(idx) {
console.log(this.codes);
for (let i = 0; i < this.codes.doceotCortyp.length; i++) { for (let i = 0; i < this.codes.doceotCortyp.length; i++) {
const c = this.codes.doceotCortyp[i]; const c = this.codes.doceotCortyp[i];
......
src/views/Public/Doxp.vue
...@@ -64,7 +64,6 @@ export default { ...@@ -64,7 +64,6 @@ export default {
getBlk(dtyp, rec) { getBlk(dtyp, rec) {
let blk = { blkMsg: {}, rulePath: "" }; let blk = { blkMsg: {}, rulePath: "" };
let tp = rec.slice(0, 2); let tp = rec.slice(0, 2);
console.log('tp is :',tp);
switch (dtyp) { switch (dtyp) {
case "dogp": case "dogp":
blk.blkMsg = { blk.blkMsg = {
......
src/views/Public/Setpan.vue
...@@ -258,7 +258,9 @@ ...@@ -258,7 +258,9 @@
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col>
<div style="height=500px">
<setpan-dialog ref="setpanDialog" :model="model" :idx="index" :codes="codes" /> <setpan-dialog ref="setpanDialog" :model="model" :idx="index" :codes="codes" />
</div>
<c-col :span="23" style="margin-left:9px;height:24px;margin-top:25px"> <c-col :span="23" style="margin-left:9px;height:24px;margin-top:25px">
<el-form-item class="formItemLabel" label="Settlement:" label-width="100px"> <el-form-item class="formItemLabel" label="Settlement:" label-width="100px">
<span style="color:red">{{ this.model.setmod.dspflg == 'C'? "temporary":"" }}</span> <span style="color:red">{{ this.model.setmod.dspflg == 'C'? "temporary":"" }}</span>
......
src/views/Public/SetpanDialog.vue
...@@ -3,31 +3,36 @@ ...@@ -3,31 +3,36 @@
v-if="visiable" v-if="visiable"
:visible.sync="visiable" :visible.sync="visiable"
center center
fullscreen
destroy-on-close destroy-on-close
:before-close="beforeClose" :before-close="beforeClose"
width="70%"
> >
<el-form v-model="formData" label-width="150px">
<c-row>
<c-col> <c-col>
<el-form v-model="formData" inline> <c-col :span="12">
<c-col>
<c-col :span="8">
<el-form-item label="费用代码"> <el-form-item label="费用代码">
<c-input v-model="formData.feecod" disabled /> <c-input v-model="formData.feecod" disabled />
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="16"> <c-col :span="12">
<el-form-item label="中文描述"> <el-form-item label="中文描述">
<c-input v-model="formData.feetxt" style="width: 350px" /> <c-col :span="13">
<c-input v-model="formData.feetxt" />
</c-col>
<c-col :span="11">
<el-form-item label="" label-width="5px">
<c-select <c-select
v-model="formData.modflg" v-model="formData.modflg"
disabled disabled
:code="codes.modflg" :code="codes.modflg"
style="width: 350px; margin-left: 100px"
/> />
</el-form-item> </el-form-item>
</c-col> </c-col>
</el-form-item>
</c-col> </c-col>
<c-col> </c-col>
<c-col :span="24">
<c-col :span="6"> <c-col :span="6">
<el-form-item label="详细信息"> <el-form-item label="详细信息">
<c-input v-model="formData.feetxtinf" /> <c-input v-model="formData.feetxtinf" />
...@@ -62,9 +67,14 @@ ...@@ -62,9 +67,14 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col> <c-col :span="24">
<c-col :span="12">
<el-form-item label="费用换算"> <el-form-item label="费用换算">
<c-select v-model="formData.usrcur"> <c-col :span="13">
<c-select
v-model="formData.usrcur"
style="width: 100%"
>
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.cur"
:label="item.label" :label="item.label"
...@@ -72,42 +82,47 @@ ...@@ -72,42 +82,47 @@
:key="item.value" :key="item.value"
/> />
</c-select> </c-select>
<c-input </c-col>
v-model="formData.usramt" <c-col :span="11">
style="width: 200px; margin-left: 50px" <el-form-item label="" label-width="5px">
/> <c-input v-model="formData.usramt" />
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col> </el-form-item>
<c-col :span="8"> </c-col>
<c-col :span="12">
<el-form-item label="应收费用"> <el-form-item label="应收费用">
<c-input <c-col :span="13">
v-model="formData.cur" <c-input v-model="formData.cur" disabled />
disabled </c-col>
style="width: 100px; margin-right: 10px" <c-col :span="11">
/> <el-form-item label="" label-width="5px">
<c-input <c-input
v-model="formData.ogiamt" v-model="formData.ogiamt"
disabled disabled
style="width: 200px"
/> />
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> </el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="优惠百分比"> <el-form-item label="优惠百分比">
<c-input v-model="formData.dctrat"> <c-input v-model="formData.dctrat">
<template #suffix>%</template> <template #suffix>%</template>
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="12">
<el-form-item label="Period calculation starting at"> <el-form-item label="Period calculation starting at">
<c-input v-model="formData.datrefbeg" disabled /> <c-input v-model="formData.datrefbeg" disabled />
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col> <c-col :span="24">
<c-col :span="8"> <c-col :span="12">
<c-col :span="12">
<el-form-item label="付款方"> <el-form-item label="付款方">
<c-select v-model="formData.rol"> <c-select v-model="formData.rol">
<el-option <el-option
...@@ -119,36 +134,43 @@ ...@@ -119,36 +134,43 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="12">
<el-form-item label="优惠金额"> <el-form-item label="优惠金额">
<c-input v-model="formData.dctamt" /> <c-input v-model="formData.dctamt" />
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> </c-col>
<c-col :span="12">
<el-form-item label="优惠后实收费用金额"> <el-form-item label="优惠后实收费用金额">
<c-input v-model="formData.amt" /> <c-input v-model="formData.amt" />
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col> <c-col :span="24">
<el-form-item <el-form-item
:label=" :label="
idx == 0 idx == 0
? 'Per mile fee depending on duration' ? 'Per mile fee depending on duration'
: 'A fixed amount per unit is caculated. This type will, for example, be used for correspondence charges.' : 'A fixed amount per unit is caculated. This type will, for example, be used for correspondence charges.'
" "
label-width="700px"
/> />
</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 v-model="formData.wrkfec.ratcal" style="width: 200px" /> <c-input v-model="formData.wrkfec.ratcal" />
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col> <c-col>
<el-form-item label="最小值"> <el-form-item label="最小值">
<c-select v-model="formData.wrkfec.mincur" style="width: 200px"> <c-col :span="13">
<c-select
v-model="formData.wrkfec.mincur"
style="width: 100%"
>
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.cur"
:label="item.label" :label="item.label"
...@@ -156,20 +178,23 @@ ...@@ -156,20 +178,23 @@
:key="item.value" :key="item.value"
/> />
</c-select> </c-select>
<!-- v-model="formData.fecp1.fec.minamt" --> </c-col>
<c-col :span="11">
<el-form-item label="" label-width="5px">
<c-input <c-input
style="width: 200px"
v-model="formData.wrkfec.minamt" v-model="formData.wrkfec.minamt"
/> />
<!-- <c-input </el-form-item>
style="width: 200px" </c-col>
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 v-model="formData.wrkfec.maxcur" style="width: 200px"> <c-col :span="13">
<c-select
v-model="formData.wrkfec.maxcur"
style="width: 100%"
>
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.cur"
:label="item.label" :label="item.label"
...@@ -177,25 +202,28 @@ ...@@ -177,25 +202,28 @@
:key="item.value" :key="item.value"
/> />
</c-select> </c-select>
</c-col>
<c-col :span="11">
<el-form-item label="" label-width="5px">
<c-input <c-input
style="width: 200px;"
v-model="formData.wrkfec.maxamt" v-model="formData.wrkfec.maxamt"
/> />
<!-- <c-input </el-form-item>
style="width: 200px" </c-col>
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 label="每个计费区间与最大值/最小值比较" v-model="formData.fecp1.jnwshx" /> <c-checkbox
label="每个计费区间与最大值/最小值比较"
v-model="formData.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-col :span="13">
<c-select v-model="formData.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"
...@@ -205,36 +233,29 @@ ...@@ -205,36 +233,29 @@
> >
</el-option> </el-option>
</c-select> </c-select>
<c-input style="width:200px;" v-model="formData.wrkfec.untamt"> </c-col>
<c-col :span="11">
<el-form-item label="" label-width="5px">
<c-input v-model="formData.wrkfec.untamt">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</el-form-item>
</c-col>
<c-col> <c-col>
<el-form-item label="销项税"> <el-form-item label="销项税">
<c-input <c-input v-model="formData.fecp1.taxrat" disabled />
v-model="formData.fecp1.taxrat"
disabled
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-input <c-input v-model="formData.fecp1.custyp" disabled />
v-model="formData.fecp1.custyp"
disabled
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="formData.wrkfec.calcbs" disabled />
v-model="formData.wrkfec.calcbs"
disabled
style="width: 200px"
/>
</el-form-item> </el-form-item>
<br /> <br />
<el-form-item label="Calc.Period"> <el-form-item label="Calc.Period">
...@@ -249,54 +270,57 @@ ...@@ -249,54 +270,57 @@
</el-form-item> </el-form-item>
<br /> <br />
<el-form-item label="Min.Periods"> <el-form-item label="Min.Periods">
<c-input v-model="formData.wrkfec.permin" style="width: 200px" /> <c-input v-model="formData.wrkfec.permin" />
</el-form-item> </el-form-item>
<br /> <br />
<el-form-item label="Rates to Apply per Period Tier" /> <el-form-item label="Rates to Apply per Period Tier" />
<br /> <br />
<el-form-item label="from Perimod"> <el-form-item label="from Perimod">
<c-input style="width: 200px" v-model="formData.wrkfec.perbegtr2" /> <c-col :span="12">
<c-input <c-input v-model="formData.wrkfec.perbegtr2" />
</c-col>
style="width: 200px; margin-left: 50px" <c-col :span="11" :offset="1">
v-model="formData.wrkfec.perrattr2" <c-input v-model="formData.wrkfec.perrattr2" />
/> </c-col>
</el-form-item> </el-form-item>
<el-form-item label="from Perimod"> <el-form-item label="from Perimod">
<c-input <c-col :span="12">
<c-input v-model="formData.wrkfec.perbegtr3" />
style="width: 200px" </c-col>
v-model="formData.wrkfec.perbegtr3" <c-col :span="11" :offset="1">
/>
<c-input <c-input
disabled disabled
style="width: 200px; margin-left: 50px"
v-model="formData.wrkfec.perrattr3" v-model="formData.wrkfec.perrattr3"
/> />
</c-col>
</el-form-item> </el-form-item>
<el-form-item label="from Perimod"> <el-form-item label="from Perimod">
<c-col :span="12">
<c-input <c-input
disabled disabled
style="width: 200px"
v-model="formData.wrkfec.perbegtr4" v-model="formData.wrkfec.perbegtr4"
/> />
</c-col>
<c-col :span="11" :offset="1">
<c-input <c-input
disabled disabled
style="width: 200px; margin-left: 50px"
v-model="formData.wrkfec.perrattr4" v-model="formData.wrkfec.perrattr4"
/> />
</c-col>
</el-form-item> </el-form-item>
<el-form-item label="from Perimod"> <el-form-item label="from Perimod">
<c-col :span="12">
<c-input <c-input
disabled disabled
style="width: 200px"
v-model="formData.wrkfec.perbegtr5" v-model="formData.wrkfec.perbegtr5"
/> />
</c-col>
<c-col :span="11" :offset="1">
<c-input <c-input
disabled disabled
style="width: 200px; margin-left: 50px"
v-model="formData.wrkfec.perrattr5" v-model="formData.wrkfec.perrattr5"
/> />
</c-col>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col>&nbsp;</c-col> <c-col>&nbsp;</c-col>
...@@ -307,11 +331,11 @@ ...@@ -307,11 +331,11 @@
disabled disabled
rows="10" rows="10"
type="textarea" type="textarea"
style="width: 500px;" style="width: 500px"
/> />
</el-form-item> </el-form-item>
</c-col> </c-col>
</el-form>
<c-col :span="4" :offset="8"> <c-col :span="4" :offset="8">
<c-button type="primary" @click="saveDialog"> <c-button type="primary" @click="saveDialog">
确 定 确 定
...@@ -321,7 +345,8 @@ ...@@ -321,7 +345,8 @@
<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>&nbsp;</c-col>
</c-col> </c-row>
</el-form>
</el-dialog> </el-dialog>
</template> </template>
...@@ -345,8 +370,8 @@ export default { ...@@ -345,8 +370,8 @@ export default {
}, },
beforeClose(done) { beforeClose(done) {
this.visiable = false; this.visiable = false;
done() done();
} },
}, },
}; };
</script> </script>
......
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