Skip to content

V
vue-gjjs
Commit 2f38675a by liuxin
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/Business/Sptsel/Menu.vue
parents 1ac55762 adc6c2ef
Showing with 88 additions and 75 deletions
src/components/IStreamTable.vue
......@@ -48,11 +48,12 @@ export default {
const newStr = column.replace(`\"${label}\"`, "label")
const vals = newStr.split(" ")
// "P VERTLINES TRUE"
if (vals.length <= 3) break;
if (vals.length <= 3) continue;
arr.push({
prop: vals[0],
label: label,
width: vals[3],
// width: vals[3],
width: "auto",
});
}
return arr;
......@@ -62,7 +63,7 @@ export default {
const res = {}
const vals = row.split("\t");
for (let i = 0; i < vals.length; i++) {
res[i] = vals[i];
res[`${i}`] = vals[i];
}
return res;
});
......
src/components/Table.vue
......@@ -11,6 +11,7 @@
</el-table>
<el-pagination
class="eContainer-pagination"
v-if="paginationShow"
:background="type=='small'? false: true"
small
layout="prev, pager, next, jumper"
......@@ -19,7 +20,7 @@
:total="total"
v-on="$listeners"
></el-pagination>
<div class="paginationLable">当前显示第 {{page1}}-{{page2}} 条，共 {{total}} 条</div>
<div class="paginationLable" v-if="paginationShow">当前显示第 {{page1}}-{{page2}} 条，共 {{total}} 条</div>
</div>
</template>
......@@ -68,6 +69,11 @@ export default {
maxHeight:{
type: String,
default:undefined
},
paginationShow: {
type: Boolean,
required: false,
default: true
}
},
data(){
......
src/views/Business/Ditopn/Ccvpan.vue
......@@ -144,47 +144,47 @@
<c-table style="width:80%,text-align:center">
<el-table-column
label="CFO"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="保证金编号"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="货币"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="余额"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="变动金额"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="保证金账号"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="汇率"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label=""
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="折算后金额"
width=50
width="auto"
>
</el-table-column>
</c-table>
......
src/views/Business/Ditopn/Docpan.vue
......@@ -10,57 +10,57 @@
<c-table style="width:80%,text-align:center">
<el-table-column
label="Role"
width=30
width="auto"
>
</el-table-column>
<el-table-column
label="Description"
width=120
width="auto"
>
</el-table-column>
<el-table-column
label="Medium"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="Dispatch Type"
width=70
width="auto"
>
</el-table-column>
<el-table-column
label="Lang."
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="Form"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="Or."
width=30
width="auto"
>
</el-table-column>
<el-table-column
label="CC"
width=30
width="auto"
>
</el-table-column>
<el-table-column
label=".."
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="Show"
width=50
width="auto"
>
</el-table-column>
<el-table-column
label="Details"
width=50
width="auto"
>
</el-table-column>
</c-table>
......
src/views/Business/Ditopn/Limitbody.vue
......@@ -156,47 +156,47 @@
<c-table style="text-align:center" :data="tableData">
<el-table-column
label="可否串用"
width="60"
width="auto"
>
</el-table-column> -->
<el-table-column
label="序号"
width="60"
width="auto"
>
</el-table-column>
<el-table-column
label="额度类型"
width="50"
width="auto"
>
</el-table-column>
<el-table-column
label="入账机构"
width="70"
width="auto"
>
</el-table-column>
<el-table-column
label="额度编号"
width="100"
width="auto"
>
</el-table-column>
<el-table-column
label="额度明细编号"
width="100"
width="auto"
>
</el-table-column>
<el-table-column
label="额度品种代码"
width="30"
width="auto"
>
</el-table-column>
<el-table-column
label="品种代码描述"
width="100"
width="auto"
>
</el-table-column>
<el-table-column
label=""
width="50"
width="auto"
>
</el-table-column>
......
src/views/Business/Ditopn/Setpan.vue
......@@ -59,25 +59,25 @@
<el-form-item label="Foreign Commission/Charges:" label-width="210px">
</el-form-item>
</el-col>
<el-col :span="24">
<c-table style="text-align:center">
<el-table-column label="Payer" width=60>
<el-col :span="24" style="margin-bottom: 18px;">
<c-table style="text-align:center" :paginationShow="false">
<el-table-column label="Payer" width="auto">
</el-table-column>
<el-table-column label="Payee" width=60>
<el-table-column label="Payee" width="auto">
</el-table-column>
<el-table-column label="Source" width=50>
<el-table-column label="Source" width="auto">
</el-table-column>
<el-table-column label="Disp" width=70>
<el-table-column label="Disp" width="auto">
</el-table-column>
<el-table-column label="Text for Payer" width=100>
<el-table-column label="Text for Payer" width="auto">
</el-table-column>
<el-table-column label="Text for Payee" width=100>
<el-table-column label="Text for Payee" width="auto">
</el-table-column>
<el-table-column label="Currency" width=30>
<el-table-column label="Currency" width="auto">
</el-table-column>
<el-table-column label="Amount" width=100>
<el-table-column label="Amount" width="auto">
</el-table-column>
<el-table-column label="" width=50>
<el-table-column label="" width="auto">
</el-table-column>
</c-table>
......@@ -86,27 +86,27 @@
<el-form-item label="Own Commission/Charges:">
</el-form-item>
</el-col>
<el-col :span="24">
<c-table style="text-align:center">
<el-table-column label="Role" width=50>
<el-col :span="24" style="margin-bottom: 18px;">
<c-table style="text-align:center" :paginationShow="false">
<el-table-column label="Role" width="auto">
</el-table-column>
<el-table-column label="Code" width=60>
<el-table-column label="Code" width="auto">
</el-table-column>
<el-table-column label="Source" width=50>
<el-table-column label="Source" width="auto">
</el-table-column>
<el-table-column label="Disp" width=70>
<el-table-column label="Disp" width="auto">
</el-table-column>
<el-table-column label="Units" width=50>
<el-table-column label="Units" width="auto">
</el-table-column>
<el-table-column label="Long Fee Text" width=120>
<el-table-column label="Long Fee Text" width="auto">
</el-table-column>
<el-table-column label="Currency" width=30>
<el-table-column label="Currency" width="auto">
</el-table-column>
<el-table-column label="Original Amount" width=100>
<el-table-column label="Original Amount" width="auto">
</el-table-column>
<el-table-column label="Fee Amount" width=100>
<el-table-column label="Fee Amount" width="auto">
</el-table-column>
<el-table-column label="Details" width=50>
<el-table-column label="Details" width="auto">
</el-table-column>
</c-table>
</el-col>
......@@ -114,29 +114,29 @@
<el-form-item label="Settlement:">
</el-form-item>
</el-col>
<el-col :span="24">
<c-table style="text-align:center">
<el-table-column label="Mod" width=30>
<el-col :span="24" style="margin-bottom: 18px;">
<c-table style="text-align:center" :paginationShow="false">
<el-table-column label="Mod" width="auto">
</el-table-column>
<el-table-column label="Role" width=50>
<el-table-column label="Role" width="auto">
</el-table-column>
<el-table-column label="in" width=50>
<el-table-column label="in" width="auto">
</el-table-column>
<el-table-column label="Amount Paid" width=100>
<el-table-column label="Amount Paid" width="auto">
</el-table-column>
<el-table-column label="Disp." width=50>
<el-table-column label="Disp." width="auto">
</el-table-column>
<el-table-column label="Account" width=100>
<el-table-column label="Account" width="auto">
</el-table-column>
<el-table-column label="C" width=30>
<el-table-column label="C" width="auto">
</el-table-column>
<el-table-column label="Curr." width=30>
<el-table-column label="Curr." width="auto">
</el-table-column>
<el-table-column label="Original Amount" width=100>
<el-table-column label="Original Amount" width="auto">
</el-table-column>
<el-table-column label="Rate" width=50>
<el-table-column label="Rate" width="auto">
</el-table-column>
<el-table-column label="" width=50>
<el-table-column label="" width="auto">
</el-table-column>
</c-table>
</el-col>
......
src/views/Business/Sptsel/Menu.vue
<template>
<div class="eibs-tab">
<el-col :span="24" style="text-align:center">
<el-col :span="24" style="text-align:center;margin-bottom: 18px;">
<c-checkbox v-model="model.chkinc">Incoming</c-checkbox>
<c-checkbox v-model="model.chkpen">Pending</c-checkbox>
<c-checkbox v-model="model.chkcor">Correction</c-checkbox>
......@@ -62,8 +62,6 @@
<el-col :span="12">
<el-form-item label="Selection of Users">
<c-select v-model="model.usfmod.flt" style="width:60%" placeholder="请选择User">
<el-option v-for="item in codes.flt" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
<c-button size="small" type="primary" style="width:30%" @click="onUsfmodShwflt">
Show Set
......@@ -72,6 +70,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="Between">
<el-date-picker type="date" v-model="model.inidatfro" style="width:45%" placeholder="请选择Date of entry of Transaction"></el-date-picker>
......@@ -80,11 +79,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国内国际证标志">
<c-select v-model="model.dflg" style="width:100%" placeholder="请选择国内国际标志">
<el-option v-for="item in codes.dflg" :key="item.value" :label="item.label" :value="item.value">
</el-option>
<el-option label="All" value="1"></el-option>
<el-option label="国内业务" value="2"></el-option>
<el-option label="国际业务" value="3"></el-option>
</c-select>
</el-form-item>
</el-col>
......@@ -143,7 +145,7 @@
</el-form-item>
</el-col>
-->
<!-- <p>{{model.sptstm}}</p> -->
<p>{{model.sptstm}}</p>
<el-col :span="24">
<el-col :span="12">
......@@ -152,6 +154,7 @@
</el-form-item>
</el-col>
<el-col :span="12" style="text-align:center">
<c-button size="small" type="primary" disabled="disabled" @click="onButypt">
退回云平台
......@@ -181,6 +184,8 @@ export default {
// mixins: [CommonProcess],
data(){
return {
declareParams:{"fileName":"sptsel.json","basePath":"{{basePath}}","method":"post","scheme":"{{schemes}}","host":"{{host}}","consume":"0","produce":"0","uri":"/sptsel/sptstm"},
}
},
methods:{...Event},
......@@ -190,4 +195,5 @@ export default {
}
</script>
<style>
</style>
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