Skip to content

V
vue-gjjs
Commit 760f11ec by liuxin
Options

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

parents d935730b cd0841cb
Showing with 43 additions and 45 deletions
src/views/Business/Cptadv/CptAdvChangePanel.vue
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
<c-col :span="24"> <c-col :span="24">
<c-fullbox> <c-fullbox>
<el-form-item label=""> <el-form-item label="" prop="cpdgrp.pye.pts.extkey">
<c-input <c-input
v-model="model.cpdgrp.pye.pts.extkey" v-model="model.cpdgrp.pye.pts.extkey"
placeholder="请输入收款人客户号" placeholder="请输入收款人客户号"
......
src/views/Business/Cptadv/Sbxx.vue
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<c-input-currency v-model="model.bopmod.outchargeamt" <c-input-currency v-model="model.bopmod.outchargeamt"
style="text-align: right;" style="text-align: right;"
placeholder="请输入国外银行扣费（涉外收入申报专用）" placeholder="请输入国外银行扣费（涉外收入申报专用）"
:disabled="!model.bopmod.basflg" :disabled="!model.bopmod.basflg || model.bopmod.szflg === '2' || model.bopmod.szflg === '3' "
@keyup.enter.native="defaultFunction('bopmod.outchargeamt', model.bopmod.outchargeamt)" @keyup.enter.native="defaultFunction('bopmod.outchargeamt', model.bopmod.outchargeamt)"
></c-input-currency> ></c-input-currency>
</c-col> </c-col>
...@@ -232,6 +232,10 @@ export default { ...@@ -232,6 +232,10 @@ export default {
methods:{...Event, methods:{...Event,
handelSelChange(){ handelSelChange(){
//控制checkbox的逻辑 //控制checkbox的逻辑
if(this.model.bopmod.szflg == '3'){
this.model.bopmod.basflg = false;
}
}, },
}, },
created:function(){ created:function(){
......
src/views/Business/Cptopn/CptOpnp1Common.vue
...@@ -206,7 +206,8 @@ ...@@ -206,7 +206,8 @@
<c-col :span="24"> <c-col :span="24">
<c-fullbox> <c-fullbox>
<el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey"> <el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey">
<c-input placeholder="请输入发报行" disabled v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input> <c-input placeholder="请输入发报行" disabled v-model="model.cpdgrp.snd.pts.extkey"
@keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input>
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
...@@ -402,23 +403,21 @@ ...@@ -402,23 +403,21 @@
style="margin-top: 10px" style="margin-top: 10px"
> >
<c-col :span="24"> <c-col :span="24">
<c-col :span="18"> <c-fullbox>
<el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey"> <el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey">
<c-input placeholder="请输入发报行" v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input> <c-input placeholder="请输入发报行" disabled v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input>
</el-form-item> </el-form-item>
</c-col> <template slot="footer">
<c-col :span="6" style="text-align: right">
<el-form-item label="" label-width="15px">
<c-col :span="12">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
> >
</c-button> </c-button>
</c-col>
<c-col :span="12">
<c-button <c-button
style="margin:0 0"
size="small" size="small"
type="primary" type="primary"
@click="onSndpDet" @click="onSndpDet"
...@@ -426,9 +425,8 @@ ...@@ -426,9 +425,8 @@
> >
详情 详情
</c-button> </c-button>
</c-col> </template>
</el-form-item> </c-fullbox>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -468,27 +466,28 @@ ...@@ -468,27 +466,28 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="18"> <c-fullbox>
<el-form-item label=""> <el-form-item label="">
<c-input <c-input
v-model="model.cpdgrp.pye.pts.extkey" v-model="model.cpdgrp.pye.pts.extkey"
placeholder="请输入收款人客户号" placeholder="请输入收款人客户号"
@keyup.enter.native="
showGridPromptDialog('cpdgrp.pye.pts.extkey')
"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> <template slot="footer">
<c-col :span="6" style="text-align: right">
<el-form-item label="" label-width="15px">
<c-col :span="12">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
> >
</c-button> </c-button>
</c-col>
<c-col :span="12">
<c-button <c-button
style="margin:0 0"
size="small" size="small"
type="primary" type="primary"
@click="onSndpDet" @click="onSndpDet"
...@@ -496,9 +495,8 @@ ...@@ -496,9 +495,8 @@
> >
详情 详情
</c-button> </c-button>
</c-col> </template>
</el-form-item> </c-fullbox>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -522,23 +520,21 @@ ...@@ -522,23 +520,21 @@
style="margin-top: 10px" style="margin-top: 10px"
> >
<c-col :span="24"> <c-col :span="24">
<c-col :span="18"> <c-fullbox>
<el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey"> <el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey">
<c-input placeholder="请输入发报行" v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input> <c-input placeholder="请输入发报行" disabled v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input>
</el-form-item> </el-form-item>
</c-col> <template slot="footer">
<c-col :span="6" style="text-align: right">
<el-form-item label="" label-width="15px">
<c-col :span="12">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
> >
</c-button> </c-button>
</c-col>
<c-col :span="12">
<c-button <c-button
style="margin:0 0"
size="small" size="small"
type="primary" type="primary"
@click="onSndpDet" @click="onSndpDet"
...@@ -546,9 +542,8 @@ ...@@ -546,9 +542,8 @@
> >
详情 详情
</c-button> </c-button>
</c-col> </template>
</el-form-item> </c-fullbox>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -597,27 +592,27 @@ ...@@ -597,27 +592,27 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="18"> <c-fullbox>
<el-form-item label="" prop="cpdgrp.pye.pts.extkey"> <el-form-item label="" prop="cpdgrp.pye.pts.extkey">
<c-input <c-input
v-model="model.cpdgrp.pye.pts.extkey" v-model="model.cpdgrp.pye.pts.extkey"
placeholder="请输入收款人客户号" placeholder="请输入收款人客户号"
@keyup.enter.native="
showGridPromptDialog('cpdgrp.pye.pts.extkey')
"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> <template slot="footer">
<c-col :span="6" style="text-align: right">
<el-form-item label="" label-width="15px">
<c-col :span="12">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
> >
</c-button> </c-button>
</c-col>
<c-col :span="12">
<c-button <c-button
style="margin:0 0"
size="small" size="small"
type="primary" type="primary"
@click="onSndpDet" @click="onSndpDet"
...@@ -625,9 +620,8 @@ ...@@ -625,9 +620,8 @@
> >
详情 详情
</c-button> </c-button>
</c-col> </template>
</el-form-item> </c-fullbox>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
......
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