Skip to content

V
vue-gjjs
Commit 1c028f97 by liuxin
Options

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

parents be70a417 86ee14bc
Showing with 23 additions and 33 deletions
src/views/Business/Cptadv/Opnp1.vue
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="汇款语种" label-width="40%" style="margin-left: 12px" prop="cptp.payuil"> <el-form-item label="汇款语种" label-width="40%" prop="cptp.payuil">
<c-select <c-select
v-model="model.cptp.payuil" v-model="model.cptp.payuil"
style="width: 100%" style="width: 100%"
......
src/views/Business/Trnrel/InftrnpsDetail.vue
...@@ -81,27 +81,27 @@ ...@@ -81,27 +81,27 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="13">
<el-form-item label="Relevant Amount"> <el-form-item label="Relevant Amount">
<c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input> <c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="11">
<el-form-item label="" label-width="2%"> <el-form-item label="" label-width="8px">
<c-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input> <c-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</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="12"> <c-col :span="13">
<el-form-item label="Responsible"> <el-form-item label="Responsible">
<c-input v-model="model.trn.usr" maxlength="8" disabled placeholder="请输入Responsible"></c-input> <c-input v-model="model.trn.usr" maxlength="8" disabled placeholder="请输入Responsible"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="11">
<el-form-item label-width="35%" label="Group"> <el-form-item label-width="40%" label="Group">
<!-- <c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> --> <!-- <c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> -->
<el-select v-model="model.trn.usg" style="width: 100%" disabled> <el-select v-model="model.trn.usg" style="width: 100%" disabled>
<el-option <el-option
...@@ -116,14 +116,14 @@ ...@@ -116,14 +116,14 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="24">
<el-form-item label="Based on Ident No."> <el-form-item label="Based on Ident No.">
<c-input v-model="model.trn.cortrninr" maxlength="8" disabled placeholder="请输入Based on Ident No."></c-input> <c-input v-model="model.trn.cortrninr" maxlength="8" disabled placeholder="请输入Based on Ident No."></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="24">
<el-form-item label-width="35%" label="Execution Date"> <el-form-item label="Execution Date">
<c-date-picker type="date" v-model="model.trn.exedat" style="width:100%" disabled placeholder="请选择Execution Date"></c-date-picker> <c-date-picker type="date" v-model="model.trn.exedat" style="width:100%" disabled placeholder="请选择Execution Date"></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -224,14 +224,14 @@ ...@@ -224,14 +224,14 @@
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="24">
<el-form-item label="Entered by"> <el-form-item label="Entered by">
<c-input v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入Entered by"></c-input> <c-input v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入Entered by"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="24">
<el-form-item label-width="35%" label="Timestamp"> <el-form-item label="Timestamp">
<c-input v-model="model.recpan.cretrs.dattim" disabled placeholder="请输入Timestamp"></c-input> <c-input v-model="model.recpan.cretrs.dattim" disabled placeholder="请输入Timestamp"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Public/Doctre.vue
...@@ -15,22 +15,7 @@ ...@@ -15,22 +15,7 @@
> >
<el-table-column label="Type" width="auto"> <el-table-column label="Type" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<c-select <span>{{ getType(scope.row.index) }}</span>
v-model="
model.trnmod.trndoc.doceot[scope.row.index].cortyp
"
style="width: 100%"
disabled
placeholder="请选择"
>
<el-option
v-for="item in codes.doceotCortyp"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="Document" width="auto"> <el-table-column label="Document" width="auto">
...@@ -44,8 +29,6 @@ ...@@ -44,8 +29,6 @@
<span>{{ getNow() }}</span> <span>{{ getNow() }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="" width="auto"></el-table-column>
<el-table-column label="" width="auto"></el-table-column>
</c-istream-table-docpan> </c-istream-table-docpan>
</c-col> </c-col>
...@@ -65,8 +48,6 @@ ...@@ -65,8 +48,6 @@
<el-table-column label="Document" width="auto"></el-table-column> <el-table-column label="Document" width="auto"></el-table-column>
<el-table-column label="Cre.TRN" width="auto"></el-table-column> <el-table-column label="Cre.TRN" width="auto"></el-table-column>
<el-table-column label="Date" width="auto"></el-table-column> <el-table-column label="Date" width="auto"></el-table-column>
<el-table-column label="" width="auto"></el-table-column>
<el-table-column label="" width="auto"></el-table-column>
</c-table> </c-table>
</c-col> </c-col>
...@@ -200,6 +181,15 @@ export default { ...@@ -200,6 +181,15 @@ export default {
} }
}, },
methods:{ methods:{
getType(idx) {
for (let i = 0; i < this.codes.doceotCortyp.length; i++) {
const c = this.codes.doceotCortyp[i];
if (this.model.trnmod.trndoc.doceot[idx].cortyp === c.value) {
return c.label;
}
}
return "";
},
getNow() { getNow() {
return moment().format('yyyy-MM-DD') return moment().format('yyyy-MM-DD')
}, },
......
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