Skip to content

V
vue-gjjs
Commit ce86c168 by liuxin
Options

Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

parents 7aa23268 1d31be4c
Showing with 260 additions and 51 deletions
src/assets/css/common.css
......@@ -292,3 +292,16 @@
height: 100% !important;
bottom:17px;
}
/* medium_button_change_small */
.medium_bcs{
padding: 8px 15px;
margin-top: 5px;
margin-left: 7px;
}
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:7px;
padding-left: 3px;
}
\ No newline at end of file
src/components/Input.vue
<template>
<el-input :id="id" ref="form-item" v-model="model" v-bind="attrs" v-on="$listeners" v-bind:disabled="isDisable"/>
<el-input :id="id" ref="form-item" v-model="model" v-bind="attrs" v-on="$listeners" v-bind:disabled="isDisable">
<template v-slot:suffix>
<slot name="suffix"></slot>
</template>
</el-input>
</template>
<script>
......
src/components/InputSelect.vue 0 → 100644
<template>
<div>
<el-popover
placement="bottom"
:width="width"
trigger="click"
popper-class="popoverInputClass"
v-model="popoverShow"
>
<ul class="el-select-dropdown__list">
<li
class="el-select-dropdown__item"
v-for="(item, idx) in liData"
:key="idx"
@click="selectItem(item)"
>
<span>{{ item }}</span>
</li>
</ul>
<c-input v-model="model" slot="reference">
<template v-slot:suffix>
<i
class="el-icon-arrow-down"
v-if="!popoverShow"
@click="popoverShow = false"
></i>
<i class="el-icon-arrow-up" v-else @click="popoverShow = true"></i>
</template>
</c-input>
</el-popover>
</div>
</template>
<script>
export default {
data() {
return {
popoverShow: false,
width: null,
};
},
props: {
value: {
type: [String, Number],
default: undefined,
},
liData: {
type: Array,
default: [],
},
},
computed: {
model: {
get() {
return this.value;
},
set(newVal) {
this.$emit("input", newVal);
},
},
},
mounted() {
this.width = this.$el.clientWidth;
},
methods: {
selectItem(val) {
this.popoverShow = false;
this.model = val;
},
},
};
</script>
<style>
.el-popper.popoverInputClass {
margin: 12px 0 5px;
padding: 0;
}
</style>
<style scoped>
.el-select-dropdown__list {
list-style: none;
padding: 6px 0;
margin: 0;
box-sizing: border-box;
padding-inline-start: 0;
}
.el-select-dropdown__item {
font-size: 14px;
padding: 0 20px;
position: relative;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #606266;
height: 34px;
line-height: 34px;
box-sizing: border-box;
cursor: pointer;
}
</style>
\ No newline at end of file
src/components/index.js
......@@ -46,6 +46,7 @@ import FunctionBtn from "./FunctionBtn"
import BusinessButon from "./BusinessButton"
import InfSearchGroup from "./InfSearchGroup"
import InputSelect from "./InputSelect"
export default {
install(Vue) {
......@@ -95,5 +96,6 @@ export default {
Vue.component("c-bus-button", BusinessButon)
Vue.component("c-infsearch-group", InfSearchGroup)
Vue.component("c-codelabel", CodeLabel)
Vue.component("c-inputselect", InputSelect)
}
}
\ No newline at end of file
src/views/Business/Ditdck/Docpre.vue
......@@ -2,14 +2,18 @@
<div class="eibs-tab">
<!-- =================左边====================== -->
<c-col :span="11">
<el-form-item label="不符点">
<c-col :span="21">
<c-input type="textarea" v-model="model.bddgrp.blk.docdis" :disabled="!model.bddgrp.blk.docdisflg" maxlength="50" show-word-limit
placeholder="请输入不符点"></c-input>
<c-input
type="textarea"
v-model="model.bddgrp.blk.docdis"
:disabled="!model.bddgrp.blk.docdisflg"
maxlength="50"
show-word-limit
placeholder="请输入不符点"
></c-input>
</c-col>
<c-col :span="3" style="text-align: right">
<!-- <el-form-item label-width="0"> -->
<c-button
......@@ -24,30 +28,41 @@
</c-col>
</el-form-item>
<c-col :span="24">
<el-form-item label="注释和结论">
<c-input type="textarea" v-model="model.bddgrp.blk.comcon" maxlength="65" show-word-limit
placeholder="请输入注释和结论"></c-input>
<c-input
type="textarea"
v-model="model.bddgrp.blk.comcon"
maxlength="65"
show-word-limit
placeholder="请输入注释和结论"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="到期付款确认备注">
<c-input type="textarea" v-model="model.bddgrp.blk.accrmk" maxlength="65" show-word-limit
placeholder="请输入到期付款确认备注"></c-input>
<c-input
type="textarea"
v-model="model.bddgrp.blk.accrmk"
maxlength="65"
show-word-limit
placeholder="请输入到期付款确认备注"
></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- =================右边====================== -->
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="" prop="bddgrp.rec.igndisflg">
<c-checkbox v-model="model.bddgrp.rec.igndisflg">忽略不符点</c-checkbox>
<c-checkbox v-model="model.bddgrp.blk.docdisflg">录入不符点</c-checkbox>
<c-checkbox v-model="model.bddgrp.rec.igndisflg"
>忽略不符点</c-checkbox
>
<c-checkbox v-model="model.bddgrp.blk.docdisflg"
>录入不符点</c-checkbox
>
</el-form-item>
</c-col>
......@@ -58,28 +73,42 @@
<c-col :span="24">
<el-form-item label="收到的通知类型" prop="bddgrp.rec.advtyp">
<c-select v-model="model.bddgrp.rec.advtyp" style="width:100%" placeholder="请选择收到的通知类型">
<c-select
v-model="model.bddgrp.rec.advtyp"
style="width: 100%"
placeholder="请选择收到的通知类型"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="付款日期" prop="bddgrp.rec.totdat">
<c-date-picker type="date" v-model="model.bddgrp.rec.totdat" style="width:100%"
placeholder="请选择付款日期"></c-date-picker>
<c-date-picker
type="date"
v-model="model.bddgrp.rec.totdat"
style="width: 100%"
placeholder="请选择付款日期"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="不符点通知日期" prop="bddgrp.rec.disdat">
<c-date-picker type="date" v-model="model.bddgrp.rec.disdat" style="width:100%"
placeholder="请选择不符点通知日期"></c-date-picker>
<c-date-picker
type="date"
v-model="model.bddgrp.rec.disdat"
style="width: 100%"
placeholder="请选择不符点通知日期"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" prop="bddgrp.rec.approvcod">
<c-checkbox v-model="model.bddgrp.rec.approvcod">议付行担保协议</c-checkbox>
<c-checkbox v-model="model.bddgrp.rec.approvcod"
>议付行担保协议</c-checkbox
>
<c-checkbox v-model="model.bdtp.cre732flg">Create MT 732</c-checkbox>
</el-form-item>
</c-col>
......@@ -99,44 +128,87 @@
<el-form-item label="" prop="bdtp.cre732flg">
</el-form-item>
</c-col> -->
</c-col>
<!-- =================已交单据====================== -->
<c-col :span="24">
<c-table :border="true" :paginationShow="false" :list="model.bdtp.docgrdm.docgrd" style="width:80%,text-align:center">
<el-table-column prop="cmail1" label="1st" width="auto"> </el-table-column>
<el-table-column prop="cmail2" label="2st" width="auto"> </el-table-column>
<el-table-column prop="docnam" label="Document" width="auto"> </el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right">
<template slot-scope="scope" slot="header">
<c-table
:border="true"
:paginationShow="false"
:list="model.bdtp.docgrdm.docgrd"
style="width:80%,text-align:center"
>
<el-table-column prop="cmail1" label="1st" width="auto">
</el-table-column>
<el-table-column prop="cmail2" label="2st" width="auto">
</el-table-column>
<el-table-column prop="docnam" label="Document" width="auto">
</el-table-column>
<el-table-column label="操作" prop="det" width="80px" fixed="right">
<template slot="header">
<span>操作</span>
<el-button
circle
style="padding:4px"
style="padding: 4px; margin-left: 9px"
class="el-icon-plus"
size="mini"
@click="addRow(scope)"
@click="addDialogVisible = true"
>
</el-button>
<el-button
<!--
style="padding:4px"
circle
class="el-icon-minus"
size="mini"
@click="removeRow(scope)"
>
</el-button>
</el-button> -->
</template>
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
@click="removeRow(scope.$index, scope.row)"
>
删除
</c-button>
</template>
</el-table-column>
</c-table>
</c-col>
<c-col>
<el-dialog :visible.sync="addDialogVisible" center width="500px">
<c-col :span="24">
<c-col :span="20">
<el-form-item label="1st" label-width="100px">
<c-input v-model="dialog.cmail1"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="20">
<el-form-item label="2st" label-width="100px">
<c-input v-model="dialog.cmail2"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="20">
<el-form-item label="Document" label-width="100px">
<!-- <c-select v-model="dialog.docnam" style="width:100%"></c-select> -->
<c-inputselect :liData="liData" v-model="dialog.docnam">
</c-inputselect>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="24"> -->
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="addRow">添加</el-button>
<el-button @click="addDialogVisible = false">取消</el-button>
</span>
<!-- </c-col> -->
</el-dialog>
</c-col>
</div>
</template>
<script>
......@@ -150,7 +222,15 @@ export default {
props: ["model", "codes"],
mixins: [CommonProcess],
data() {
return {};
return {
addDialogVisible: false,
dialog: {
cmail1: "",
cmail2: "",
docnam: "",
},
liData:["增值税发票11","增值税发票222","增值税发票33","增值税发票44","增值税发票55"],
};
},
methods: {
...Event,
......@@ -162,4 +242,6 @@ export default {
.el-checkbox >>> .el-checkbox__label {
width: 70px;
}
.inputDiv {
}
</style>
\ No newline at end of file
src/views/Business/Infbdd/BusNavbar.vue
<template>
<div class="busnavbar">
<div class="busnavbar-items">
<c-button class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
<c-button style="margin-left:7px;" class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
</div>
</div>
</template>
......@@ -113,8 +113,5 @@ export default {
}
</script>
<style>
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:-10px;
}
</style>
src/views/Business/Infdid/BusNavbar.vue
<template>
<div class="busnavbar">
<div class="busnavbar-items">
<c-button class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
<c-button style="margin-left:7px;" size="medium" type="primary" class="medium_bcs" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
</div>
</div>
</template>
......@@ -83,9 +83,11 @@ export default {
const length = this.model.cfgfil.btnstm.rows.length
let btnStr = this.model.cfgfil.btnstm.rows
let j = 0;
let m = 0;
const buttonIndex = ['信用证修改','减额修改接受','到单','修改通知行']
for(let i=0; i < length; i++){
//获取数组中每行的数据
if(!( btnStr[i].indexOf("保证金") >= 0)){
if(!( btnStr[i].indexOf("保证金") >= 0) && !(btnStr[i].indexOf("开立信用证") >= 0)){
let arr = btnStr[i].split("\t");
let newList = {
code:arr[0],
......@@ -93,6 +95,11 @@ export default {
isDis:arr[2],
title:arr[3]
}
m++;
j = buttonIndex.indexOf(arr[1].replace(/(^\s*)|(\s*$)/g, ""));
if(j<0){
j = m;
}
//添加到navcode数组中
this.navcode.splice(j,0,newList)
}
......@@ -110,8 +117,6 @@ export default {
}
</script>
<style>
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:8px;
}
</style>
src/views/Public/Engp.vue
......@@ -10,7 +10,7 @@
<el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column>
<el-table-column prop="tenday" label="Tenor" width="70px"> </el-table-column>
<el-table-column prop="rol" label="Dbt." width="70px"> </el-table-column>
<el-table-column prop="nam" label="Name" width="170px"> </el-table-column>
<el-table-column prop="nam" label="Name" width="300"> </el-table-column>
<el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
<el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
<el-table-column prop="oldamt" label="Old Amount" width="150px">
......
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