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 150 additions and 137 deletions
src/components/IStreamTable.vue
...@@ -48,11 +48,12 @@ export default { ...@@ -48,11 +48,12 @@ export default {
const newStr = column.replace(`\"${label}\"`, "label") const newStr = column.replace(`\"${label}\"`, "label")
const vals = newStr.split(" ") const vals = newStr.split(" ")
// "P VERTLINES TRUE" // "P VERTLINES TRUE"
if (vals.length <= 3) break; if (vals.length <= 3) continue;
arr.push({ arr.push({
prop: vals[0], prop: vals[0],
label: label, label: label,
width: vals[3], // width: vals[3],
width: "auto",
}); });
} }
return arr; return arr;
...@@ -62,7 +63,7 @@ export default { ...@@ -62,7 +63,7 @@ export default {
const res = {} const res = {}
const vals = row.split("\t"); const vals = row.split("\t");
for (let i = 0; i < vals.length; i++) { for (let i = 0; i < vals.length; i++) {
res[i] = vals[i]; res[`${i}`] = vals[i];
} }
return res; return res;
}); });
......
src/components/Table.vue
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
</el-table> </el-table>
<el-pagination <el-pagination
class="eContainer-pagination" class="eContainer-pagination"
v-if="paginationShow"
:background="type=='small'? false: true" :background="type=='small'? false: true"
small small
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
:total="total" :total="total"
v-on="$listeners" v-on="$listeners"
></el-pagination> ></el-pagination>
<div class="paginationLable">当前显示第 {{page1}}-{{page2}} 条，共 {{total}} 条</div> <div class="paginationLable" v-if="paginationShow">当前显示第 {{page1}}-{{page2}} 条，共 {{total}} 条</div>
</div> </div>
</template> </template>
...@@ -68,6 +69,11 @@ export default { ...@@ -68,6 +69,11 @@ export default {
maxHeight:{ maxHeight:{
type: String, type: String,
default:undefined default:undefined
},
paginationShow: {
type: Boolean,
required: false,
default: true
} }
}, },
data(){ data(){
......
src/views/Business/Ditopn/Ccvpan.vue
...@@ -144,47 +144,47 @@ ...@@ -144,47 +144,47 @@
<c-table style="width:80%,text-align:center"> <c-table style="width:80%,text-align:center">
<el-table-column <el-table-column
label="CFO" label="CFO"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="保证金编号" label="保证金编号"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="货币" label="货币"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="余额" label="余额"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="变动金额" label="变动金额"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="保证金账号" label="保证金账号"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="汇率" label="汇率"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="" label=""
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="折算后金额" label="折算后金额"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
</c-table> </c-table>
......
src/views/Business/Ditopn/Docpan.vue
...@@ -10,57 +10,57 @@ ...@@ -10,57 +10,57 @@
<c-table style="width:80%,text-align:center"> <c-table style="width:80%,text-align:center">
<el-table-column <el-table-column
label="Role" label="Role"
width=30 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="Description" label="Description"
width=120 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="Medium" label="Medium"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="Dispatch Type" label="Dispatch Type"
width=70 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="Lang." label="Lang."
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="Form" label="Form"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="Or." label="Or."
width=30 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="CC" label="CC"
width=30 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label=".." label=".."
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="Show" label="Show"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="Details" label="Details"
width=50 width="auto"
> >
</el-table-column> </el-table-column>
</c-table> </c-table>
......
src/views/Business/Ditopn/Limitbody.vue
...@@ -156,47 +156,47 @@ ...@@ -156,47 +156,47 @@
<c-table style="text-align:center" :data="tableData"> <c-table style="text-align:center" :data="tableData">
<el-table-column <el-table-column
label="可否串用" label="可否串用"
width="60" width="auto"
> >
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column
label="序号" label="序号"
width="60" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="额度类型" label="额度类型"
width="50" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="入账机构" label="入账机构"
width="70" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="额度编号" label="额度编号"
width="100" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="额度明细编号" label="额度明细编号"
width="100" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="额度品种代码" label="额度品种代码"
width="30" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="品种代码描述" label="品种代码描述"
width="100" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="" label=""
width="50" width="auto"
> >
</el-table-column> </el-table-column>
......
src/views/Business/Ditopn/Setpan.vue
...@@ -59,25 +59,25 @@ ...@@ -59,25 +59,25 @@
<el-form-item label="Foreign Commission/Charges:" label-width="210px"> <el-form-item label="Foreign Commission/Charges:" label-width="210px">
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" style="margin-bottom: 18px;">
<c-table style="text-align:center"> <c-table style="text-align:center" :paginationShow="false">
<el-table-column label="Payer" width=60> <el-table-column label="Payer" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Payee" width=60> <el-table-column label="Payee" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Source" width=50> <el-table-column label="Source" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Disp" width=70> <el-table-column label="Disp" width="auto">
</el-table-column> </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>
<el-table-column label="Text for Payee" width=100> <el-table-column label="Text for Payee" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Currency" width=30> <el-table-column label="Currency" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Amount" width=100> <el-table-column label="Amount" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="" width=50> <el-table-column label="" width="auto">
</el-table-column> </el-table-column>
</c-table> </c-table>
...@@ -86,27 +86,27 @@ ...@@ -86,27 +86,27 @@
<el-form-item label="Own Commission/Charges:"> <el-form-item label="Own Commission/Charges:">
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" style="margin-bottom: 18px;">
<c-table style="text-align:center"> <c-table style="text-align:center" :paginationShow="false">
<el-table-column label="Role" width=50> <el-table-column label="Role" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Code" width=60> <el-table-column label="Code" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Source" width=50> <el-table-column label="Source" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Disp" width=70> <el-table-column label="Disp" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Units" width=50> <el-table-column label="Units" width="auto">
</el-table-column> </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>
<el-table-column label="Currency" width=30> <el-table-column label="Currency" width="auto">
</el-table-column> </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>
<el-table-column label="Fee Amount" width=100> <el-table-column label="Fee Amount" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Details" width=50> <el-table-column label="Details" width="auto">
</el-table-column> </el-table-column>
</c-table> </c-table>
</el-col> </el-col>
...@@ -114,29 +114,29 @@ ...@@ -114,29 +114,29 @@
<el-form-item label="Settlement:"> <el-form-item label="Settlement:">
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" style="margin-bottom: 18px;">
<c-table style="text-align:center"> <c-table style="text-align:center" :paginationShow="false">
<el-table-column label="Mod" width=30> <el-table-column label="Mod" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Role" width=50> <el-table-column label="Role" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="in" width=50> <el-table-column label="in" width="auto">
</el-table-column> </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>
<el-table-column label="Disp." width=50> <el-table-column label="Disp." width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Account" width=100> <el-table-column label="Account" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="C" width=30> <el-table-column label="C" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="Curr." width=30> <el-table-column label="Curr." width="auto">
</el-table-column> </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>
<el-table-column label="Rate" width=50> <el-table-column label="Rate" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="" width=50> <el-table-column label="" width="auto">
</el-table-column> </el-table-column>
</c-table> </c-table>
</el-col> </el-col>
......
src/views/Business/Sptsel/Menu.vue
<template> <template>
<div class="eibs-tab"> <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.chkinc">Incoming</c-checkbox>
<c-checkbox v-model="model.chkpen">Pending</c-checkbox> <c-checkbox v-model="model.chkpen">Pending</c-checkbox>
<c-checkbox v-model="model.chkcor">Correction</c-checkbox> <c-checkbox v-model="model.chkcor">Correction</c-checkbox>
<c-checkbox v-model="model.chkaut">Automatic</c-checkbox> <c-checkbox v-model="model.chkaut">Automatic</c-checkbox>
<c-checkbox v-model="model.chkdel">Deleted</c-checkbox> <c-checkbox v-model="model.chkdel">Deleted</c-checkbox>
<c-checkbox v-model="model.chktco">网银</c-checkbox> <c-checkbox v-model="model.chktco">网银</c-checkbox>
<c-checkbox v-model="model.chkcan">归档</c-checkbox> <c-checkbox v-model="model.chkcan">归档</c-checkbox>
</el-col> </el-col>
<!-- <!--
<el-col :span="12"> <el-col :span="12">
<c-checkbox v-model="model.chkdzt">E-Trade</c-checkbox> <c-checkbox v-model="model.chkdzt">E-Trade</c-checkbox>
</el-col> </el-col>
...@@ -40,56 +40,58 @@ ...@@ -40,56 +40,58 @@
<c-checkbox v-model="model.chkcan">归档</c-checkbox> <c-checkbox v-model="model.chkcan">归档</c-checkbox>
</el-col> </el-col>
--> -->
<el-col :span="12">
<el-form-item label="Reference">
<c-input v-model="model.selobj" maxlength="32" placeholder="请输入Reference"></c-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="Name">
<c-input v-model="model.seltxt" maxlength="32" placeholder="请输入Selection Name"></c-input>
</el-form-item>
</el-col>
<el-col :span="12"> <!--
<el-form-item label="Reference">
<c-input v-model="model.selobj" maxlength="32" placeholder="请输入Reference"></c-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="Name">
<c-input v-model="model.seltxt" maxlength="32" placeholder="请输入Selection Name"></c-input>
</el-form-item>
</el-col>
<!--
<el-col :span="12"> <el-col :span="12">
<span v-text="model.usfmod.usftxt" data-path=".usfmod.usftxt" > </span> <span v-text="model.usfmod.usftxt" data-path=".usfmod.usftxt" > </span>
</el-col> </el-col>
--> -->
<el-col :span="12">
<el-form-item label="Selection of Users">
<c-select v-model="model.usfmod.flt" style="width:60%" placeholder="请选择User">
</c-select>
<c-button size="small" type="primary" style="width:30%" @click="onUsfmodShwflt">
Show Set
</c-button>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="Selection of Users"> <el-col :span="12">
<c-select v-model="model.usfmod.flt" style="width:60%" placeholder="请选择User"> <el-form-item label="Between">
<el-option v-for="item in codes.flt" :key="item.value" :label="item.label" :value="item.value"> <el-date-picker type="date" v-model="model.inidatfro" style="width:45%" placeholder="请选择Date of entry of Transaction"></el-date-picker>
</el-option> -
</c-select> <el-date-picker type="date" v-model="model.inidattil" style="width:45%" placeholder="请选择Date of entry of Transaction until"></el-date-picker>
<c-button size="small" type="primary" style="width:30%" @click="onUsfmodShwflt"> </el-form-item>
Show Set </el-col>
</c-button>
</el-form-item>
</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>
-
<el-date-picker type="date" v-model="model.inidattil" style="width:45%" placeholder="请选择Date of entry of Transaction until"></el-date-picker>
</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>
</c-select>
</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 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>
<!--
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Selected User Group Set"> <el-form-item label="Selected User Group Set">
...@@ -130,28 +132,29 @@ ...@@ -130,28 +132,29 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
--> -->
<el-col :span="12" style="text-align:center"> <el-col :span="12" style="text-align:center">
<c-checkbox v-model="model.chkypt">云平台</c-checkbox> <c-checkbox v-model="model.chkypt">云平台</c-checkbox>
</el-col> </el-col>
<!-- <!--
<el-col :span="12"> <el-col :span="12">
<el-form-item label="List of SPT records"> <el-form-item label="List of SPT records">
<c-input v-model="model.sptstm" placeholder="请输入List of SPT records"></c-input> <c-input v-model="model.sptstm" placeholder="请输入List of SPT records"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
--> -->
<!-- <p>{{model.sptstm}}</p> --> <p>{{model.sptstm}}</p>
<el-col :span="24"> <el-col :span="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="退回原因"> <el-form-item label="退回原因">
<c-input v-model="model.yptinf" maxlength="60" placeholder="请输入退回原因"></c-input> <c-input v-model="model.yptinf" maxlength="60" placeholder="请输入退回原因"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" style="text-align:center"> <el-col :span="12" style="text-align:center">
<c-button size="small" type="primary" disabled="disabled" @click="onButypt"> <c-button size="small" type="primary" disabled="disabled" @click="onButypt">
退回云平台 退回云平台
...@@ -166,9 +169,9 @@ ...@@ -166,9 +169,9 @@
上传影像 上传影像
</c-button> </c-button>
</el-col> </el-col>
</el-col> </el-col>
</div> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
...@@ -181,6 +184,8 @@ export default { ...@@ -181,6 +184,8 @@ export default {
// mixins: [CommonProcess], // mixins: [CommonProcess],
data(){ data(){
return { return {
declareParams:{"fileName":"sptsel.json","basePath":"{{basePath}}","method":"post","scheme":"{{schemes}}","host":"{{host}}","consume":"0","produce":"0","uri":"/sptsel/sptstm"},
} }
}, },
methods:{...Event}, methods:{...Event},
...@@ -190,4 +195,5 @@ export default { ...@@ -190,4 +195,5 @@ export default {
} }
</script> </script>
<style> <style>
</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