Commit 7f735df1 by liushikai

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

# Conflicts:
#	src/views/TaskList/index.vue
parents 3dca8c22 7063318c
No preview for this file type
src/assets/logo.png

74.7 KB | W: | H:

src/assets/logo.png

4.84 KB | W: | H:

src/assets/logo.png
src/assets/logo.png
src/assets/logo.png
src/assets/logo.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -9,13 +9,15 @@ export default { ...@@ -9,13 +9,15 @@ export default {
props: ['id', 'path'], props: ['id', 'path'],
data: function () { data: function () {
return { return {
process: '0' // process: '0'
process: '1'
} }
}, },
computed: { computed: {
showHighlight: { showHighlight: {
get () { get () {
return this.process == '1' || this.process == '2' // return this.process == '1' || this.process == '2'
return this.$route.path.startsWith("/review")
} }
}, },
highlight () { highlight () {
...@@ -34,7 +36,7 @@ export default { ...@@ -34,7 +36,7 @@ export default {
created: function () { created: function () {
if (this.$route.query.routeParams) { if (this.$route.query.routeParams) {
this.process = this.$route.query.routeParams.process; this.process = this.$route.query.routeParams.process;
this.busiTempInfoSriNo = this.$route.query.routeParams.busiTempInfoSriNo; // this.busiTempInfoSriNo = this.$route.query.routeParams.busiTempInfoSriNo;
} }
// this.process = '1' // this.process = '1'
}, },
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入Additional Conditions Amendment History" placeholder="请输入Additional Conditions Amendment History"
:rows="15" :rows="12"
disabled disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -46,14 +46,8 @@ ...@@ -46,14 +46,8 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1"> <c-col :span="1" style="text-align: right">
<c-button <c-button size="small" style="margin:0 0;" type="primary" icon="el-icon-search" @click="onAdlcndameButtxmsel">
size="small"
type="primary"
@click="onAdlcndameButtxmsel"
style="margin-left:5px"
>
...
</c-button> </c-button>
</c-col> </c-col>
</div> </div>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<c-input <c-input
v-model="model.godnam" v-model="model.godnam"
maxlength="40" maxlength="40"
style="width: 30%" style="width: 50%"
placeholder="货物服务名称" placeholder="货物服务名称"
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<c-col :span="8"> <c-col :span="8">
<c-select <c-select
v-model="model.litameadv" v-model="model.litameadv"
style="width: 70%" style="width: 150%"
placeholder="请选择特殊规定" placeholder="请选择特殊规定"
> >
<el-option <el-option
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="" prop="ameadvrmk" style="width: 60%"> <el-form-item label="" prop="ameadvrmk">
<c-input <c-input
:disabled="model.litameadv == '无特殊规定'" :disabled="model.litameadv == '无特殊规定'"
type="textarea" type="textarea"
v-model="model.ameadvrmk" v-model="model.ameadvrmk"
:autosize="{ minRows: 4, maxRows: 6 }" :rows="4"
maxlength="68" maxlength="68"
style="width: 50%" style="width: 50%"
show-word-limit show-word-limit
...@@ -50,55 +50,11 @@ ...@@ -50,55 +50,11 @@
<c-input <c-input
v-model="model.bchname" v-model="model.bchname"
maxlength="40" maxlength="40"
style="width: 50%" style="width: 81.2%"
placeholder="请输入branch name" placeholder="请输入branch name"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label="地址" prop="issadr" style="width: 65%">
<c-input
v-model="model.issadr"
maxlength="40"
style="width: 50%"
placeholder="请输入地址"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="邮编" prop="pobzip" style="width: 65%">
<c-input
v-model="model.pobzip"
maxlength="40"
style="width: 30%"
placeholder="请输入邮编"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="电话" prop="tel" style="width: 65%">
<c-input
v-model="model.tel"
maxlength="40"
style="width: 30%"
placeholder="请输入电话"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="传真" prop="fax" style="width: 65%">
<c-input
v-model="model.fax"
maxlength="40"
style="width: 30%"
placeholder="请输入传真"
></c-input>
</el-form-item>
</c-col>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
<el-form-item label="溢短装" prop="olddidgrp.rec.nomtop"> <el-form-item label="溢短装" prop="olddidgrp.rec.nomtop">
<c-input <c-input
v-model="model.olddidgrp.rec.nomtop" v-model="model.olddidgrp.rec.nomtop"
style="width: 45%" style="width: 46.9%"
disabled disabled
></c-input> ></c-input>
<label style="display: inline-block; width: 28px; text-align: center" <label style="display: inline-block; width: 28px; text-align: center"
>-</label> >-</label>
<c-input <c-input
v-model="model.olddidgrp.rec.nomton" v-model="model.olddidgrp.rec.nomton"
style="width: 45%" style="width: 47%"
disabled disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -233,12 +233,12 @@ ...@@ -233,12 +233,12 @@
<el-form-item prop="trnmod.swiadd.newnomtopame"> <el-form-item prop="trnmod.swiadd.newnomtopame">
<c-input <c-input
v-model="model.trnmod.swiadd.newnomtopame" v-model="model.trnmod.swiadd.newnomtopame"
style="width: 45%" style="width: 46.9%"
></c-input> ></c-input>
<label style="display: inline-block; width: 28px; text-align: center">-</label> <label style="display: inline-block; width: 28px; text-align: center">-</label>
<c-input <c-input
v-model="model.trnmod.swiadd.newnomtoname" v-model="model.trnmod.swiadd.newnomtoname"
style="width: 45%" style="width: 47%"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<c-col :span="11"> <c-col :span="11">
<el-form-item label="信用证兑付方式" prop="didgrp.rec.avbby"> <el-form-item label="信用证兑付方式" prop="didgrp.rec.avbby">
<c-select v-model="model.didgrp.rec.avbby" style="width:100%" @change="avbbykeyEvent" placeholder="请选择"> <c-select v-model="model.didgrp.rec.avbby" style="width:100%" @change="avbbykeyEvent" placeholder="请选择">
<el-option v-for="item in codes.avbby0" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in avbby0" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
<el-form-item label="付款期限" prop="didgrp.rec.tenmaxday" > <el-form-item label="付款期限" prop="didgrp.rec.tenmaxday" >
<c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:17%" maxlength="3"></c-input> <c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:100%" maxlength="3"></c-input>
</el-form-item> </el-form-item>
<el-form-item label="远期付款指示" prop="didgrp.blk.defdet"> <el-form-item label="远期付款指示" prop="didgrp.blk.defdet">
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
</el-form-item> </el-form-item>
<el-form-item label="货物运输/交货/服务方式" prop="didgrp.rec.tratyp"> <el-form-item label="货物运输/交货/服务方式" prop="didgrp.rec.tratyp">
<c-col :span="10"> <c-col :span="24">
<c-select v-model="model.didgrp.rec.tratyp" style="width:90%" placeholder="请选择" @change="recTratypChange" :disabled="model.didgrp.rec.mytype == 'F'"> <c-select v-model="model.didgrp.rec.tratyp" style="width:100%" placeholder="请选择" @change="recTratypChange" :disabled="model.didgrp.rec.mytype == 'F'">
<el-option v-for="item in codes.tratyp" :key="item.value" :label="item.label" <el-option v-for="item in codes.tratyp" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
...@@ -78,22 +78,26 @@ ...@@ -78,22 +78,26 @@
<!-- ========================= Right ========================= --> <!-- ========================= Right ========================= -->
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label="分批装运货物" prop="didgrp.rec.shppar"> <el-form-item label="分批装运货物" prop="didgrp.rec.shppar">
<c-select v-model="model.didgrp.rec.shppar" style="width:50%" placeholder="请选择"> <c-select v-model="model.didgrp.rec.shppar" style="width:100%" placeholder="请选择">
<el-option v-for="item in codes.shppar" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codes.shppar" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
<el-form-item label="分期装运/提供服务" prop="didgrp.rec.fqzytgfw"> <el-form-item label="分期装运/提供服务" prop="didgrp.rec.fqzytgfw">
<c-input v-model="model.didgrp.rec.fqzytgfw" placeholder="请输入" :disabled="model.didgrp.rec.shppar == 'N'" style="width:100%"></c-input> <c-select v-model="model.didgrp.rec.fqzytgfw" placeholder="请选择" :disabled="model.didgrp.rec.shppar != 'Y'" style="width:100%">
<el-option v-for="item in codes.shppar" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item> </el-form-item>
<el-form-item label="分期装运/提供服务约定" prop="didgrp.rec.fqtime"> <el-form-item label="分期装运/提供服务约定" prop="didgrp.rec.fqtime">
<c-input type="textarea" :rows="3" v-model="model.didgrp.rec.fqtime" maxlength="140" show-word-limit placeholder="请输入" style="width:100%"></c-input> <c-input type="textarea" :rows="3" v-model="model.didgrp.rec.fqtime" maxlength="140" show-word-limit placeholder="请输入" style="width:100%"
:disabledBankno="model.didgrp.rec.fqzytgfw != 'Y'"></c-input>
</el-form-item> </el-form-item>
<el-form-item label="转运" prop="didgrp.rec.shptrs"> <el-form-item label="转运" prop="didgrp.rec.shptrs">
<c-select v-model="model.didgrp.rec.shptrs" style="width:50%" placeholder="请选择" :disabled="model.didgrp.rec.mytype == 'F'"> <c-select v-model="model.didgrp.rec.shptrs" style="width:100%" placeholder="请选择" :disabled="model.didgrp.rec.mytype == 'F'">
<el-option label="不允许" value="禁止"></el-option> <el-option label="不允许" value="禁止"></el-option>
<el-option label="允许" value="允许"></el-option> <el-option label="允许" value="允许"></el-option>
</c-select> </c-select>
...@@ -133,7 +137,6 @@ ...@@ -133,7 +137,6 @@
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import CommonProcess from "~/mixin/CommonProcess"; import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Ditopn/Event" import Event from "~/model/Ditopn/Event"
import Utils from "~/utils"; import Utils from "~/utils";
...@@ -145,9 +148,25 @@ export default { ...@@ -145,9 +148,25 @@ export default {
return { return {
flag:false, flag:false,
mytypeFlag:true, mytypeFlag:true,
avbby0: [
{ label: "远期付款", value: "D" },
{ label: "即期付款", value: "P" },
]
} }
}, },
methods:{...Event, methods:{...Event,
async onDefdetButtxmsel(){
let rtnmsg = await this.executeRule("txmmod.buttxmsel"); //BUTTXMSEL
if(rtnmsg.respCode = SUCCESS){
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async onPreperButtxmsel(){
let rtnmsg = await this.executeRule("txmmod.buttxmsel"); //BUTTXMSEL
if(rtnmsg.respCode = SUCCESS){
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
preperflgExtkeyEvent(){ preperflgExtkeyEvent(){
this.flag = !this.model.didgrp.blk.preperflg this.flag = !this.model.didgrp.blk.preperflg
if (this.flag === true){ if (this.flag === true){
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
maxlength="16" maxlength="16"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('didgrp.adv.pts.extkey')" @keyup.enter.native="showGridPromptDialog('didgrp.adv.pts.extkey')"
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -53,6 +54,7 @@ ...@@ -53,6 +54,7 @@
></c-input> ></c-input>
</el-form-item> --> </el-form-item> -->
<c-ptapdome <c-ptapdome
:disabledBankno="true"
:disabledJigomc="true" :disabledJigomc="true"
:disabledDizhii="true" :disabledDizhii="true"
:model="model" :model="model"
...@@ -86,7 +88,7 @@ ...@@ -86,7 +88,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- ============= 议付行 ========================= --> <!-- ============= 议付行 ========================= -->
<c-col :span="13"> <c-col :span="24">
<el-form-item label="是否可议付" prop="didgrp.rec.fenctg"> <el-form-item label="是否可议付" prop="didgrp.rec.fenctg">
<c-select <c-select
v-model="model.didgrp.rec.fenctg" v-model="model.didgrp.rec.fenctg"
...@@ -110,6 +112,7 @@ ...@@ -110,6 +112,7 @@
v-model="model.didgrp.rec.avbwth" v-model="model.didgrp.rec.avbwth"
style="width: 100%" style="width: 100%"
placeholder="请选择指定的有关银行" placeholder="请选择指定的有关银行"
@change="chooseBank"
> >
<el-option <el-option
v-for="item in codes.avbwth" v-for="item in codes.avbwth"
...@@ -154,9 +157,9 @@ ...@@ -154,9 +157,9 @@
></c-input> ></c-input>
</el-form-item> --> </el-form-item> -->
<c-ptapdome <c-ptapdome
:disabledBankno="model.didgrp.rec.fenctg != 'Y'" :disabledBankno="true"
:disabledJigomc="true" :disabledJigomc="true"
:disabledDizhii="model.didgrp.rec.fenctg != 'Y'" :disabledDizhii="true"
:model="model" :model="model"
:argadr="{ :argadr="{
title: '议付行', title: '议付行',
...@@ -165,7 +168,7 @@ ...@@ -165,7 +168,7 @@
}" }"
></c-ptapdome> ></c-ptapdome>
<!-- ========================转让行 ======================== --> <!-- ========================转让行 ======================== -->
<c-col :span="13"> <c-col :span="24">
<el-form-item label="是否可以转让" prop="didgrp.rec.lcrtyp"> <el-form-item label="是否可以转让" prop="didgrp.rec.lcrtyp">
<c-select <c-select
v-model="model.didgrp.rec.lcrtyp" v-model="model.didgrp.rec.lcrtyp"
...@@ -302,7 +305,7 @@ ...@@ -302,7 +305,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- =========================保兑行========================= --> <!-- =========================保兑行========================= -->
<c-col :span="13"> <c-col :span="24">
<el-form-item label="是否可保兑" prop="didgrp.rec.bdflg"> <el-form-item label="是否可保兑" prop="didgrp.rec.bdflg">
<c-select <c-select
v-model="model.didgrp.rec.bdflg" v-model="model.didgrp.rec.bdflg"
...@@ -389,6 +392,7 @@ ...@@ -389,6 +392,7 @@
></c-input> ></c-input>
</el-form-item> --> </el-form-item> -->
<c-ptapdome <c-ptapdome
:disabledJigomc="true" :disabledJigomc="true"
:model="model" :model="model"
:argadr="{ :argadr="{
...@@ -445,6 +449,12 @@ export default { ...@@ -445,6 +449,12 @@ export default {
}, },
methods: { methods: {
...Event, ...Event,
async chooseBank(){
let rtnmsg = await this.executeRule("didgrp.rec.avbwth"); //DIDGRP\REC\AVBWTH
if(rtnmsg.respCode = SUCCESS){
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
}, },
created: function () {}, created: function () {},
}; };
......
...@@ -46,14 +46,8 @@ ...@@ -46,14 +46,8 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1"> <c-col :span="1" style="text-align: right">
<c-button <c-button size="small" style="margin:0 0;" type="primary" icon="el-icon-search" @click="onLcrgodameButtxmsel">
size="small"
type="primary"
@click="onLcrgodameButtxmsel"
style="margin-left:5px"
>
...
</c-button> </c-button>
</c-col> </c-col>
</div> </div>
......
...@@ -41,14 +41,8 @@ ...@@ -41,14 +41,8 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1"> <c-col :span="1" style="text-align: right">
<c-button <c-button size="small" style="margin:0 0;" type="primary" icon="el-icon-search" @click="onLcrdocameButtxmsel">
size="small"
type="primary"
@click="onLcrdocameButtxmsel"
style="margin-left:5px"
>
...
</c-button> </c-button>
</c-col> </c-col>
</div> </div>
......
...@@ -33,7 +33,9 @@ import CodeTable from "~/config/CodeTable" ...@@ -33,7 +33,9 @@ import CodeTable from "~/config/CodeTable"
import Event from "~/model/Ditopn/Event" import Event from "~/model/Ditopn/Event"
export default { export default {
inject: ['root'],
props:["model","codes"], props:["model","codes"],
mixins: [CommonProcess],
data(){ data(){
return { return {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
style="margin:0 0" style="margin:0 0"
size="small" size="small"
type="primary" type="primary"
:disabled="this.flag" disabled
@click="onDitpButgetref" @click="onDitpButgetref"
> >
获取 获取
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
v-model="model.didgrp.cbs.nom1.amt" v-model="model.didgrp.cbs.nom1.amt"
style="text-align: left; width: 100%" style="text-align: left; width: 100%"
placeholder="请输入信用证金额" placeholder="请输入信用证金额"
disabled
@keyup.enter.native="defaultFunction('didgrp.cbs.nom1.amt', model.didgrp.cbs.nom1.amt)" @keyup.enter.native="defaultFunction('didgrp.cbs.nom1.amt', model.didgrp.cbs.nom1.amt)"
></c-input-currency> ></c-input-currency>
</el-form-item> </el-form-item>
...@@ -135,19 +136,21 @@ ...@@ -135,19 +136,21 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="24">
<el-form-item label="上下浮动限额" prop="didgrp.rec.nomtop"> <el-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
<c-input <c-input
v-model="model.didgrp.rec.nomtop" v-model="model.didgrp.rec.nomtop"
maxlength="9" maxlength="9"
style="width: 40%" style="width: 44.3%"
disabled
placeholder="请输入Amount Tolerance - Positive" placeholder="请输入Amount Tolerance - Positive"
></c-input> ></c-input>
<label style="display:inline-block;width:10%;text-align:center;">-</label> <label style="display:inline-block;width:10%;text-align:center;">-</label>
<c-input <c-input
v-model="model.didgrp.rec.nomton" v-model="model.didgrp.rec.nomton"
maxlength="9" maxlength="9"
style="width: 40%" style="width: 44.3%"
disabled
placeholder="请输入Amount Tolerance - Negative" placeholder="请输入Amount Tolerance - Negative"
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -234,20 +237,21 @@ ...@@ -234,20 +237,21 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="24">
<el-form-item label="开证日期" prop="didgrp.rec.opndat"> <el-form-item label="开证日期" prop="didgrp.rec.opndat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.didgrp.rec.opndat" v-model="model.didgrp.rec.opndat"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 95%" style="width: 100%"
placeholder="请选择Date" placeholder="请选择Date"
disabled
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="24">
<el-form-item <el-form-item
v-if="model.didgrp.rec.mytype == 'H'" v-if="model.didgrp.rec.mytype == 'H'"
label="最迟货物装运日" label="最迟货物装运日"
...@@ -257,8 +261,9 @@ ...@@ -257,8 +261,9 @@
type="date" type="date"
v-model="model.didgrp.rec.shpdat" v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 95%" style="width: 100%"
placeholder="请选择Date" placeholder="请选择Date"
disabled
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -270,8 +275,9 @@ ...@@ -270,8 +275,9 @@
type="date" type="date"
v-model="model.didgrp.rec.shpdat" v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 95%" style="width: 100%"
placeholder="请选择Date" placeholder="请选择Date"
disabled
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -283,21 +289,23 @@ ...@@ -283,21 +289,23 @@
type="date" type="date"
v-model="model.didgrp.rec.shpdat" v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 95%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
disabled
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="24">
<el-form-item label="有效日期" prop="didgrp.rec.expdat"> <el-form-item label="有效日期" prop="didgrp.rec.expdat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.didgrp.rec.expdat" v-model="model.didgrp.rec.expdat"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 95%" style="width: 100%"
placeholder="请选择Date" placeholder="请选择Date"
disabled
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -318,6 +326,7 @@ ...@@ -318,6 +326,7 @@
v-model="model.didgrp.rec.elcflg" v-model="model.didgrp.rec.elcflg"
style="width: 95%" style="width: 95%"
placeholder="请选择是否通过电证系统" placeholder="请选择是否通过电证系统"
disabled
> >
<el-option <el-option
v-for="item in codes.elcflg" v-for="item in codes.elcflg"
...@@ -333,6 +342,7 @@ ...@@ -333,6 +342,7 @@
<el-form-item label="报文类型" label-width="80px"> <el-form-item label="报文类型" label-width="80px">
<c-select <c-select
v-if="model.didgrp.rec.elcflg == 'N'" v-if="model.didgrp.rec.elcflg == 'N'"
style="width: 100%"
v-model="model.ditp.msgtyp" placeholder="请选择报文类型" disabled> v-model="model.ditp.msgtyp" placeholder="请选择报文类型" disabled>
<el-option <el-option
v-for="item in codes.msgtyp" v-for="item in codes.msgtyp"
...@@ -344,7 +354,7 @@ ...@@ -344,7 +354,7 @@
</c-select> </c-select>
<c-select <c-select
v-else v-else
v-model="model.ditp.msgtyp" placeholder="请选择报文类型"> v-model="model.ditp.msgtyp" placeholder="请选择报文类型" disabled>
<el-option <el-option
v-for="item in codes.msgtyp" v-for="item in codes.msgtyp"
:key="item.value" :key="item.value"
...@@ -369,6 +379,7 @@ ...@@ -369,6 +379,7 @@
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
disabled
> >
</el-option> </el-option>
</c-select> </c-select>
...@@ -379,7 +390,6 @@ ...@@ -379,7 +390,6 @@
<c-input <c-input
v-model="model.didgrp.rec.idcode" v-model="model.didgrp.rec.idcode"
maxlength="18" maxlength="18"
disabled
placeholder="请输入申请人统一社会信用代码" placeholder="请输入申请人统一社会信用代码"
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -422,7 +432,7 @@ ...@@ -422,7 +432,7 @@
<!-- ========================右边======================= --> <!-- ========================右边======================= -->
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<c-ptap <c-ptap1
:model="model" :model="model"
:argadr="{ :argadr="{
title: '申请人', title: '申请人',
...@@ -434,7 +444,7 @@ ...@@ -434,7 +444,7 @@
@onSeainf="onSeainf" @onSeainf="onSeainf"
@onAplpDet="onBenpDet" @onAplpDet="onBenpDet"
> >
</c-ptap> </c-ptap1>
</c-col> </c-col>
<!-- <c-col :span="24"> <!-- <c-col :span="24">
<el-form-item <el-form-item
...@@ -787,9 +797,12 @@ import CommonProcess from "~/mixin/CommonProcess"; ...@@ -787,9 +797,12 @@ import CommonProcess from "~/mixin/CommonProcess";
import Event from "~/model/Ditopn/Event"; import Event from "~/model/Ditopn/Event";
import Utils from "~/utils"; import Utils from "~/utils";
import Ptap from "~/views/Public/Ptap"; import Ptap from "~/views/Public/Ptap";
import Ptap1 from "./Ptap";
export default { export default {
components: { "c-ptap": Ptap }, components: { "c-ptap": Ptap ,
"c-ptap1": Ptap1,
},
inject: ["root"], inject: ["root"],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [CommonProcess], mixins: [CommonProcess],
......
<template>
<div class="eibs-tab">
<c-col v-if="!noRef" :span="24">
<el-form-item
:label="`${argadr.title}参考号`"
:prop="`${argadr.grp}.${argadr.rol}.pts.ref`"
>
<c-input
v-model="model[argadr.grp][argadr.rol].pts.ref"
:placeholder="'请输入' + argadr.title + '参考号'"
></c-input>
</el-form-item>
</c-col>
<c-col :span="20">
<el-form-item
:label="`${argadr.title}ID`"
:prop="`${argadr.grp}.${argadr.rol}.pts.extkey`"
style="width: 100%"
>
<c-input
style="width: 95%"
v-model="model[argadr.grp][argadr.rol].pts.extkey"
:placeholder="'请输入' + argadr.title + 'Extkey'"
disabled
@keyup.enter.native="
showGridPromptDialog(`${argadr.grp}.${argadr.rol}.pts.extkey`)
"
@change="valueChange"
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
<!-- <el-form-item label="" label-width="5px"> -->
<c-button
style="margin:0 10px 0 0;padding: 0 10px;"
class="searchButton"
size="small"
type="primary"
icon="el-icon-search"
@click="onSeainf(`${argadr.grp}.${argadr.rol}.pts.extkey`)"
>
</c-button>
</c-col>
<c-col :span="3" style="text-align: right">
<c-button
style="margin:0 0"
class="detailsButton"
size="small"
type="primary"
@click="onAplpDet"
>
{{ $t('buttons.details') }}
</c-button>
<!-- </el-form-item> -->
</c-col>
<template v-if="!onlySearch">
<c-col v-if="isAdrblk" :span="24">
<el-form-item
label="名称地址"
:prop="`${argadr.grp}.${argadr.rol}.pts.adrblk`"
>
<c-input
type="textarea"
:rows="4"
v-model="model[argadr.grp][argadr.rol].pts.adrblk"
maxlength="35"
show-word-limit
placeholder="请输入名称地址"
:disabled="disabled"
></c-input>
</el-form-item>
</c-col>
<template v-else>
<c-col :span="24">
<el-form-item
:label="`${argadr.title}名称`"
:prop="`${argadr.grp}.${argadr.rol}.namelc`"
>
<c-input
type="textarea"
v-model="model[argadr.grp][argadr.rol].namelc"
:placeholder="'请输入' + argadr.title + '名称'"
:rows="2"
maxlength="35"
show-word-limit
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
:label="`${argadr.title}地址`"
:prop="`${argadr.grp}.${argadr.rol}.adrelc`"
>
<c-input
type="textarea"
:rows="2"
v-model="model[argadr.grp][argadr.rol].adrelc"
:placeholder="'请输入' + argadr.title + '地址'"
maxlength="35"
show-word-limit
></c-input>
</el-form-item>
</c-col>
</template>
</template>
</div>
</template>
<script>
import Api from "~/service/Api";
import CommonProcess from "~/mixin/CommonProcess";
// 机构信息模块
export default {
inject: ["root"],
mixins: [CommonProcess],
props: {
model: {
type: Object,
default: undefined,
},
argadr: {
type: Object,
default: function () {
return {
title: "", //角色名称
rol: "", //角色
grp: "", //所属模块
};
},
},
disabled: {
//名称地址是否灰显
type: Boolean,
default: false,
},
isAdrblk: {
//名称地址是否为大字段
type: Boolean,
default: true,
},
onlySearch: {
//是否只展示extkey
type: Boolean,
default: false,
},
noRef: {
//无需参考号
type: Boolean,
default: false,
},
},
data() {
return {
data: [],
};
},
watch: {},
methods: {
onSeainf(data) {
this.$emit("onSeainf", data);
},
onAplpDet() {
this.$emit("onAplpDet");
},
valueChange() {
if (this.onlySearch) return;
// this.showGridPromptDialog(
// `${this.argadr.grp}.${this.argadr.rol}.pts.extkey`
// );
},
},
created: function () {},
};
</script>
<style>
.searchButton {
text-align: center;
/* margin: 0 10px; */
margin-right: 10px;
padding: 0 10px;
}
.detailsButton {
margin-left: 10px;
}
</style>
...@@ -140,12 +140,12 @@ import CommonProcess from "~/mixin/CommonProcess"; ...@@ -140,12 +140,12 @@ import CommonProcess from "~/mixin/CommonProcess";
import CommonFuncs from "~/mixin/CommonFuncs"; import CommonFuncs from "~/mixin/CommonFuncs";
import Pattern from "~/model/Ditame/Pattern"; import Pattern from "~/model/Ditame/Pattern";
import Amep from "./Amep"; import Amep from "./Amep";
import Ovwp from "../Ditopn/Ovwp"; import Ovwp from "./Ovwp";
import Detp from "../Ditopn/Detp"; import Detp from "./Detp";
import Tk from "../Ditopn/Tk"; import Tk from "../Ditopn/Tk";
import Mt799 from "../Ditopn/Mt799"; import Mt799 from "./Mt799";
import Detp1 from "../Ditopn/Detp1"; import Detp1 from "./Detp1";
import Addbcb from "../Ditopn/Addbcb"; import Addbcb from "./Addbcb";
import Narp from "./Narp"; import Narp from "./Narp";
import Dogpame from "./Dogpame"; import Dogpame from "./Dogpame";
import Dorpame from "./Dorpame"; import Dorpame from "./Dorpame";
......
...@@ -17,12 +17,15 @@ ...@@ -17,12 +17,15 @@
size="small" size="small"
:validate-on-rule-change="false" :validate-on-rule-change="false"
> >
<c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000047 --> <!--PD000047 -->
<el-tab-pane label="单据概况" name="litdckp"> <el-tab-pane label="单据概况" name="litdckp">
<c-content> <c-content>
<m-litdckp :model="model" :codes="codes" v-on:changeShowDocpre="changeShowDocpre"/> <m-litdckp
:model="model"
:codes="codes"
v-on:changeShowDocpre="changeShowDocpre"
/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
...@@ -36,7 +39,6 @@ ...@@ -36,7 +39,6 @@
<m-docpre :model="model" :codes="codes" /> <m-docpre :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000079 --> <!--PD000079 -->
<!-- <el-tab-pane label="Shipping Detail" name="shpdet"> <!-- <el-tab-pane label="Shipping Detail" name="shpdet">
<m-shpdet :model="model" :codes="codes"/> <m-shpdet :model="model" :codes="codes"/>
...@@ -71,7 +73,11 @@ ...@@ -71,7 +73,11 @@
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"> <c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog> </c-grid-ety-prompt-dialog>
</div> </div>
</c-page> </c-page>
...@@ -123,57 +129,46 @@ export default { ...@@ -123,57 +129,46 @@ export default {
mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理 mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
isShowDocpre:false, isShowDocpre: false,
tabVal: "litdckp", tabVal: "litdckp",
trnName: "ditdck", trnName: "ditdck",
model: new Ditdck().data, model: new Ditdck().data,
// checkRules: Check, checkRules: Check,
defaultRules: Default, defaultRules: Default,
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { ...CodeTable, codes: { ...CodeTable, invtypCodes: [{ label: "type1", value: "1" }] },
invtypCodes:[
{ label: "type1", value: "1" }
], },
}; };
}, },
methods: { methods: {
changeShowDocpre(val) {
this.isShowDocpre = val;
},
}, },
created: async function () { created: async function () {
console.log("进入ditdck交易"); console.log("进入ditdck交易");
let rtnmsg = await this.init(this.$route.query) let rtnmsg = await this.init(this.$route.query);
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{
//TODO 处理数据逻辑 //TODO 处理数据逻辑
console.log(rtnmsg) console.log(rtnmsg);
Utils.copyValueFromVO(this.model,rtnmsg.data) debugger;
Utils.copyValueFromVO(this.model, rtnmsg.data);
console.log(this.model); console.log(this.model);
if(this.isInDisplay){ if (this.isInDisplay) {
this.restoreDisplay() this.restoreDisplay();
} }
}
if(this.model.bddgrp.rec.dscinsflg == "X"){ };
if (this.model.bddgrp.rec.dscinsflg == "X") {
this.isShowDocpre = true; this.isShowDocpre = true;
} } else {
else this.$notify.error({ title: "错误", message: "服务请求失败!" });
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
// console.log("进入ditdck交易");
// let rtnmsg = await this.init({});
// if (rtnmsg.respCode == SUCCESS) {
// Utils.copyValueFromVO(this.model, rtnmsg.data);
// } else {
// this.$notify.error({ title: "错误", message: "服务请求失败!" });
// }
}, },
methods: {
changeShowDocpre(val) {
this.isShowDocpre = val
}
}
}; };
</script> </script>
<style> <style>
......
...@@ -93,11 +93,10 @@ ...@@ -93,11 +93,10 @@
</c-col> --> </c-col> -->
<c-col :span="13"> <c-col :span="13">
<el-form-item label="信用证金额" prop="didgrp.cbs.nom1.cur"> <c-form-item label="信用证金额" prop="didgrp.cbs.nom1.cur" previewLabel="信用证币种">
<c-select <c-select
disabled disabled
v-model="model.didgrp.cbs.nom1.cur" v-model="model.didgrp.cbs.nom1.cur"
style="width: 95%"
placeholder="请选择Currency" placeholder="请选择Currency"
@keyup.enter.native="nom1CurEvent" @keyup.enter.native="nom1CurEvent"
> >
...@@ -109,12 +108,13 @@ ...@@ -109,12 +108,13 @@
> >
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item <c-form-item
previewLabel="信用证金额"
style="text-align: left" style="text-align: left"
label-width="0" label-width="10px"
prop="didgrp.cbs.nom1.amt" prop="didgrp.cbs.nom1.amt"
> >
<c-input-currency <c-input-currency
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
placeholder="请输入信用证金额" placeholder="请输入信用证金额"
@keyup.enter.native="defaultFunction('didgrp.cbs.nom1.amt', model.didgrp.cbs.nom1.amt)" @keyup.enter.native="defaultFunction('didgrp.cbs.nom1.amt', model.didgrp.cbs.nom1.amt)"
></c-input-currency> ></c-input-currency>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="大写金额" prop="ditp.amt"> <el-form-item label="大写金额" prop="ditp.amt">
...@@ -136,22 +136,22 @@ ...@@ -136,22 +136,22 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="20">
<el-form-item label="上下浮动限额" prop="didgrp.rec.nomtop"> <c-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
<c-input <c-input
v-model="model.didgrp.rec.nomtop" v-model="model.didgrp.rec.nomtop"
maxlength="9" maxlength="9"
style="width: 40%" style="width: 40%"
placeholder="请输入Amount Tolerance - Positive" placeholder="请输入Amount Tolerance - Positive"
></c-input> ></c-input>
<label style="display:inline-block;width:10%;text-align:center;">-</label> <label style="display:inline-block;width:calc(20% - 15px);text-align:center;">-</label>
<c-input <c-input
v-model="model.didgrp.rec.nomton" v-model="model.didgrp.rec.nomton"
maxlength="9" maxlength="9"
style="width: 40%" style="width: 40%"
placeholder="请输入Amount Tolerance - Negative" placeholder="请输入Amount Tolerance - Negative"
></c-input> ></c-input>
</el-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
<!-- <c-col :span="12" style="text-align: left"> <!-- <c-col :span="12" style="text-align: left">
...@@ -235,16 +235,15 @@ ...@@ -235,16 +235,15 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="20">
<el-form-item label="开证日期" prop="didgrp.rec.opndat"> <c-form-item label="开证日期" prop="didgrp.rec.opndat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.didgrp.rec.opndat" v-model="model.didgrp.rec.opndat"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 95%"
placeholder="请选择Date" placeholder="请选择Date"
></c-date-picker> ></c-date-picker>
</el-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -291,33 +290,31 @@ ...@@ -291,33 +290,31 @@
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="20">
<el-form-item label="有效日期" prop="didgrp.rec.expdat"> <c-form-item label="有效日期" prop="didgrp.rec.expdat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.didgrp.rec.expdat" v-model="model.didgrp.rec.expdat"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 95%"
placeholder="请选择Date" placeholder="请选择Date"
></c-date-picker> ></c-date-picker>
</el-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="有效地点" prop="didgrp.rec.expplc"> <c-form-item label="有效地点" prop="didgrp.rec.expplc">
<c-input <c-input
v-model="model.didgrp.rec.expplc" v-model="model.didgrp.rec.expplc"
maxlength="35" maxlength="35"
placeholder="请输入Place of Expiry" placeholder="请输入Place of Expiry"
></c-input> ></c-input>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="13">
<el-form-item label="是否通过电证系统" prop="didgrp.rec.elcflg"> <el-form-item label="是否通过电证系统" prop="didgrp.rec.elcflg">
<c-select <c-select
v-model="model.didgrp.rec.elcflg" v-model="model.didgrp.rec.elcflg"
style="width: 95%"
placeholder="请选择是否通过电证系统" placeholder="请选择是否通过电证系统"
> >
<el-option <el-option
......
...@@ -240,12 +240,44 @@ ...@@ -240,12 +240,44 @@
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <c-button
style="margin-left: 0"
size="small"
>
详情
</c-button> -->
<el-popover
placement="top-start"
title="历史信息"
width="800"
trigger="click"
>
<c-istream-table
:list="trnData.data"
:columns="trnData.columns"
>
<el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope">
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
@click="display(scope.$index, scope.row)"
>
查看详情
</c-button>
</template>
</el-table-column>
</c-istream-table>
<c-button
style="margin-left: 0"
size="small"
@click="getTrnInfo(scope.$index, scope.row)"
slot="reference"
> >
详情 详情
</c-button> </c-button>
</el-popover>
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
...@@ -293,6 +325,17 @@ export default { ...@@ -293,6 +325,17 @@ export default {
return { return {
ownref:"", ownref:"",
initdialog:false, initdialog:false,
trnData: {
columns: [
'1 1 "编号" 200',
'2 2 "交易名称" 100',
'3 3 "日期" 200',
'4 4 "状态" 50',
'5 5 "币种" 80',
'6 6 "金额" 80',
],
data: [],
},
stmData: { stmData: {
columns: [ columns: [
'1 1 "Reference" 140 ', '1 1 "Reference" 140 ',
...@@ -333,8 +376,22 @@ export default { ...@@ -333,8 +376,22 @@ export default {
//跳转交易 //跳转交易
this.$router.history.push("/business/" + code) this.$router.history.push("/business/" + code)
this.initdialog = false this.initdialog = false
},
async getTrnInfo(idx, row) {
debugger;
this.model.infcon.objinr = row["INR"];
this.model.didgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
} }
}, },
},
created: function () {}, created: function () {},
}; };
</script> </script>
......
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
<!-- <el-row> --> <!-- <el-row> -->
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column fixed="right" prop="op" label="操作" width="200px"> <el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align: left" <c-col :span="11" style="text-align: left"
><span>操作</span></c-col ><span>操作</span></c-col
...@@ -322,15 +322,14 @@ ...@@ -322,15 +322,14 @@
:list="trnData.data" :list="trnData.data"
:columns="trnData.columns" :columns="trnData.columns"
> >
<el-table-column prop="op" label="操作" width="110"> <el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
@click="display(scope.$index, scope.row)" @click="display(scope.$index, scope.row)"
> >
查看详情 详情
</c-button> </c-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -591,14 +590,12 @@ export default { ...@@ -591,14 +590,12 @@ export default {
dialogTableVisible: false, dialogTableVisible: false,
trnData: { trnData: {
columns: [ columns: [
'1 1 "编号" 0', '1 1 "编号" 200',
'2 2 "交易名称" 0', '2 2 "交易名称" 100',
'3 3 "日期" 0', '3 3 "日期" 200',
'4 4 "状态" 0', '4 4 "状态" 50',
'5 5 "币种" 0', '5 5 "币种" 80',
'6 6 "金额" 0', '6 6 "金额" 80',
'7 7 "Relres" 0',
'0 8 "Inr" 0',
], ],
data: [], data: [],
}, },
......
...@@ -9,9 +9,11 @@ ...@@ -9,9 +9,11 @@
<i class="el-icon-arrow-up"></i> <i class="el-icon-arrow-up"></i>
<i class="el-icon-arrow-down"></i> <i class="el-icon-arrow-down"></i>
</div> </div>
<div id="chartWrapper">
<div id="chart"></div> <div id="chart"></div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
...@@ -84,6 +86,11 @@ export default { ...@@ -84,6 +86,11 @@ export default {
</script> </script>
<style scoped> <style scoped>
#customerAnalyse .cell-content {
display: flex;
flex-direction: column;
padding: 0 5px;
}
#customerAnalyse .cell-content .chart-operate { #customerAnalyse .cell-content .chart-operate {
margin-left: 20px; margin-left: 20px;
height: 20px; height: 20px;
...@@ -91,9 +98,15 @@ export default { ...@@ -91,9 +98,15 @@ export default {
#customerAnalyse .cell-content .chart-operate i { #customerAnalyse .cell-content .chart-operate i {
cursor: pointer; cursor: pointer;
} }
#customerAnalyse .cell-content #chart { #customerAnalyse .cell-content #chartWrapper {
width: 98%; /* width: 98%; */
height: calc(100% - 25px); /* height: calc(100% - 50px); */
margin: 0 auto; /* height: 200px; */
/* margin: 0 auto; */
flex: 1;
}
#customerAnalyse .cell-content #chartWrapper #chart {
width: 100%;
height: 100%;
} }
</style> </style>
...@@ -77,11 +77,10 @@ export default { ...@@ -77,11 +77,10 @@ export default {
height: 45%; height: 45%;
background-color: #e6e8ef; background-color: #e6e8ef;
border-radius: 12px; border-radius: 12px;
padding: 10px 10px 10px 15px; padding: 0 10px 0 15px;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between;
font-size: 14px; font-size: 14px;
} }
.dept-name { .dept-name {
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<span class="el-icon-refresh" title="刷新"></span> <span class="el-icon-refresh" title="刷新"></span>
<span class="el-icon-more" title="操作"></span> <span class="el-icon-more" title="操作"></span>
</CellHeaderVue> </CellHeaderVue>
<c-content :height="cellScrollHeight">
<div class="cell-content"> <div class="cell-content">
<div class="notice-item" v-for="(item, idx) in noticeList" :key="idx"> <div class="notice-item" v-for="(item, idx) in noticeList" :key="idx">
<div class="notice-title" :class="{ active: idx === 0 }"> <div class="notice-title" :class="{ active: idx === 0 }">
...@@ -16,6 +17,7 @@ ...@@ -16,6 +17,7 @@
</div> </div>
</div> </div>
</div> </div>
</c-content>
</div> </div>
</template> </template>
...@@ -25,6 +27,12 @@ import CellHeaderVue from "./CellHeader.vue"; ...@@ -25,6 +27,12 @@ import CellHeaderVue from "./CellHeader.vue";
export default { export default {
name: "NoticeAnnouncement", name: "NoticeAnnouncement",
components: { CellHeaderVue }, components: { CellHeaderVue },
props: {
cellScrollHeight: {
type: Number,
required: true,
},
},
data() { data() {
return { return {
noticeList: [ noticeList: [
...@@ -102,8 +110,6 @@ export default { ...@@ -102,8 +110,6 @@ export default {
<style scoped> <style scoped>
/* 通知公告 */ /* 通知公告 */
#noticeAnnouncement .cell-content { #noticeAnnouncement .cell-content {
display: flex;
flex-wrap: wrap;
margin: 0 20px; margin: 0 20px;
} }
#noticeAnnouncement .cell-content .notice-item { #noticeAnnouncement .cell-content .notice-item {
......
<template> <template>
<div class="home-cell" id="quickSearch"> <div class="home-cell" id="quickSearch">
<CellHeaderVue title="快速查询"> </CellHeaderVue> <CellHeaderVue title="快速查询"> </CellHeaderVue>
<c-content :height="cellScrollHeight">
<div class="cell-content"> <div class="cell-content">
<div <div
class="content-wrapper" class="content-wrapper"
v-for="(item, index) in options" v-for="(item, index) in options"
:key="index" :key="index"
:style="{ height: wrapperHeight + 'px' }"
> >
<div class="search-item-wrapper"> <div class="search-item-wrapper">
<div class="search-item"> <div class="search-item">
...@@ -16,6 +18,7 @@ ...@@ -16,6 +18,7 @@
</div> </div>
</div> </div>
</div> </div>
</c-content>
</div> </div>
</template> </template>
...@@ -25,6 +28,19 @@ import CellHeaderVue from "./CellHeader.vue"; ...@@ -25,6 +28,19 @@ import CellHeaderVue from "./CellHeader.vue";
export default { export default {
name: "QuickSearch", name: "QuickSearch",
components: { CellHeaderVue }, components: { CellHeaderVue },
props: {
cellScrollHeight: {
type: Number,
required: true,
},
},
computed: {
wrapperHeight() {
return Math.floor(
(window.document.body.clientHeight - this.cellScrollHeight) * 0.3
);
},
},
data() { data() {
return { return {
options: [ options: [
......
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
<div class="home-cell" id="quickVisit"> <div class="home-cell" id="quickVisit">
<CellHeaderVue title="快速访问"> </CellHeaderVue> <CellHeaderVue title="快速访问"> </CellHeaderVue>
<c-content :height="cellScrollHeight">
<div class="cell-content"> <div class="cell-content">
<div <div
class="content-wrapper" class="content-wrapper"
v-for="(item, index) in quickVisitItem" v-for="(item, index) in quickVisitItem"
:key="index" :key="index"
:style="{ height: wrapperHeight + 'px' }"
> >
<div class="visit-item-wrapper"> <div class="visit-item-wrapper">
<div class="visit-item"> <div class="visit-item">
...@@ -17,6 +19,7 @@ ...@@ -17,6 +19,7 @@
</div> </div>
</div> </div>
</div> </div>
</c-content>
</div> </div>
</template> </template>
...@@ -26,6 +29,19 @@ import CellHeaderVue from "./CellHeader.vue"; ...@@ -26,6 +29,19 @@ import CellHeaderVue from "./CellHeader.vue";
export default { export default {
name: "QuickVisit", name: "QuickVisit",
components: { CellHeaderVue }, components: { CellHeaderVue },
props: {
cellScrollHeight: {
type: Number,
required: true,
},
},
computed: {
wrapperHeight() {
return Math.floor(
(window.document.body.clientHeight - this.cellScrollHeight) * 0.3
);
},
},
data() { data() {
return { return {
quickVisitItem: [ quickVisitItem: [
...@@ -89,7 +105,7 @@ export default { ...@@ -89,7 +105,7 @@ export default {
#quickVisit .content-wrapper { #quickVisit .content-wrapper {
display: inline-block; display: inline-block;
width: 33%; width: 33%;
height: 30%; /* height: 30%; */
} }
#quickVisit .cell-content .visit-item-wrapper { #quickVisit .cell-content .visit-item-wrapper {
display: flex; display: flex;
......
...@@ -7,7 +7,12 @@ ...@@ -7,7 +7,12 @@
<div class="cell-content"> <div class="cell-content">
<div class="task-stat-display total"> <div class="task-stat-display total">
<div class="display-wrapper"> <div class="display-wrapper">
<div class="stat-item" v-for="(item, idx) in total" :key="idx"> <div
class="stat-item"
v-for="(item, idx) in total"
:key="idx"
:style="{ width: item.name === '来报待处理' ? '20%' : 'unset' }"
>
<div class="stat-name">{{ item.name }}</div> <div class="stat-name">{{ item.name }}</div>
<div class="stat-count">{{ item.count }}</div> <div class="stat-count">{{ item.count }}</div>
</div> </div>
...@@ -92,7 +97,7 @@ export default { ...@@ -92,7 +97,7 @@ export default {
color: #f3f3f3; color: #f3f3f3;
border-radius: 10px; border-radius: 10px;
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 8px;
background-color: #e7eaef; background-color: #e7eaef;
} }
.task-stat-display .display-wrapper { .task-stat-display .display-wrapper {
...@@ -100,7 +105,7 @@ export default { ...@@ -100,7 +105,7 @@ export default {
display: flex; display: flex;
} }
.task-stat-display .display-wrapper .stat-item { .task-stat-display .display-wrapper .stat-item {
flex: 1; flex: auto;
} }
.task-stat-display.total .display-wrapper { .task-stat-display.total .display-wrapper {
border: 1px solid rgb(17 106 153 / 60%); border: 1px solid rgb(17 106 153 / 60%);
......
<template> <template>
<div class="eContainer-home"> <div class="eContainer-home">
<QuickVisitVue></QuickVisitVue> <QuickVisitVue :cellScrollHeight="cellScrollHeight"></QuickVisitVue>
<TaskStatisticsVue></TaskStatisticsVue> <TaskStatisticsVue></TaskStatisticsVue>
<NoticeAnnouncementVue></NoticeAnnouncementVue> <NoticeAnnouncementVue :cellScrollHeight="cellScrollHeight"></NoticeAnnouncementVue>
<HallVue></HallVue> <HallVue></HallVue>
<CustomerAnalyseVue></CustomerAnalyseVue> <CustomerAnalyseVue></CustomerAnalyseVue>
<QuickSearchVue></QuickSearchVue> <QuickSearchVue :cellScrollHeight="cellScrollHeight"></QuickSearchVue>
</div> </div>
</template> </template>
<script> <script>
import QuickVisitVue from "./cells/QuickVisit.vue"; import QuickVisitVue from "./cells/QuickVisit.vue";
import TaskStatisticsVue from './cells/TaskStatistics.vue'; import TaskStatisticsVue from "./cells/TaskStatistics.vue";
import NoticeAnnouncementVue from "./cells/NoticeAnnouncement.vue"; import NoticeAnnouncementVue from "./cells/NoticeAnnouncement.vue";
import HallVue from "./cells/Hall.vue"; import HallVue from "./cells/Hall.vue";
import CustomerAnalyseVue from "./cells/CustomerAnalyse.vue"; import CustomerAnalyseVue from "./cells/CustomerAnalyse.vue";
...@@ -27,8 +27,15 @@ export default { ...@@ -27,8 +27,15 @@ export default {
CustomerAnalyseVue, CustomerAnalyseVue,
QuickSearchVue, QuickSearchVue,
}, },
created() {
this.cellScrollHeight =
window.document.body.clientHeight -
(window.document.body.clientHeight - 110 - 52 * 2 - 10) / 2;
},
data() { data() {
return {}; return {
cellScrollHeight: null,
};
}, },
}; };
</script> </script>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<img src="../../assets/logo.png" alt="" style="height: 100%;" /> <img src="../../assets/logo.png" alt="" style="height: 100%;" />
</div> </div>
<div class="self_header_label"> <div class="self_header_label">
<h2>新一代银行国际结算系统</h2> <h2>新一代光大银行国际结算系统</h2>
</div> </div>
<div class="header-tool"> <div class="header-tool">
<div class="header-subInstName"> <div class="header-subInstName">
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-col v-if="!noRef" :span="24"> <c-col v-if="!noRef" :span="24">
<el-form-item <c-form-item
:label="`${argadr.title}参考号`" :label="`${argadr.title}参考号`"
:prop="`${argadr.grp}.${argadr.rol}.pts.ref`" :prop="`${argadr.grp}.${argadr.rol}.pts.ref`"
> >
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
v-model="model[argadr.grp][argadr.rol].pts.ref" v-model="model[argadr.grp][argadr.rol].pts.ref"
:placeholder="'请输入' + argadr.title + '参考号'" :placeholder="'请输入' + argadr.title + '参考号'"
></c-input> ></c-input>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="20"> <c-col :span="20">
......
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