Skip to content

V
vue-gjjs
Commit 14b3de4a by 潘际乾
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents cead5dd8 c13718ce
Showing with 68 additions and 65 deletions
src/components/IStreamTable.vue
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
:prop="item.prop" :prop="item.prop"
:label="item.label" :label="item.label"
:width="item.width" :width="item.width"
sortable
> >
<template v-slot="{ scope }"> <template v-slot="{ scope }">
<!-- <template slot-scope="{ scope }"> --> <!-- <template slot-scope="{ scope }"> -->
......
src/model/Infdid/Event.js
...@@ -173,8 +173,25 @@ export default { ...@@ -173,8 +173,25 @@ export default {
} }
}, },
async handleReset() { async handleReset() {
this.model.infcon.seaownref="";
this.model.infcon.opndatfrom="";
this.model.infcon.opndatto="";
this.model.infcon.searef="";
this.model.infcon.pty.extkey="";
this.model.infcon.pty.nam="";
this.model.infcon.seapty="";
this.model.infcon.nam="";
this.model.infcon.searol="";
this.model.infcon.usr.extkey="";
this.model.infcon.seasta="";
this.model.infcon.seacur="";
this.model.infcon.seaamtfr="";
this.model.infcon.seaamtto="";
this.model.seacnfdet="";
this.model.sealcrtyp="";
this.model.jyqflg="";
this.model.mylx="";
this.model.elcflg="";
}, },
async handleSearch() { async handleSearch() {
this.stmData.data = []; this.stmData.data = [];
......
src/views/Business/Getamc/Ovwp.vue
...@@ -250,14 +250,8 @@ ...@@ -250,14 +250,8 @@
style="width: 100%" style="width: 100%"
placeholder="请选择Form of Undertaking" placeholder="请选择Form of Undertaking"
disabled disabled
:code="codes.legfrm"
> >
<el-option
v-for="item in codes.legfrm"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -426,6 +420,7 @@ ...@@ -426,6 +420,7 @@
v-model="model.gidgrp.blk.apprul" v-model="model.gidgrp.blk.apprul"
style="width: 100%" style="width: 100%"
placeholder="请选择Applicable Rules" placeholder="请选择Applicable Rules"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
......
src/views/Business/Infbcd/Infsea.vue
...@@ -278,21 +278,21 @@ export ...@@ -278,21 +278,21 @@ export
columns: [ columns: [
"1 1 \"Reference\" 150", "1 1 \"Reference\" 150",
"2 2 \"Resp. User\" 100", "2 2 \"Resp. User\" 100",
"3 3 \"Opened\" 200 4 7", "3 3 \"Opened\" 150 4 7",
"4 4 \"Closed\" 200 4 7", "4 4 \"Closed\" 150 4 7",
"5 5 \"Goods Code\" 130 1 0 1 GODCOD", "5 5 \"Goods Code\" 130 1 0 1 GODCOD",
"6 6\"分行名称\" 136", "6 6\"分行名称\" 136",
"7 7 \"Pta.No\" 130", "7 7 \"Pta.No\" 130",
"8 8 \"Party Number\" 150", "8 8 \"Drawee Party Number\" 150",
"9 9 \"Drawee\" 300", "9 9 \"Drawee\" 300",
"10 10 \"Drawee CN\" 130", "10 10 \"Drawee CN\" 130",
"11 11 \"Party Number\" 150", "11 11 \"Drawer Party Number\" 150",
"12 12 \"Drawer\" 100", "12 12 \"Drawer\" 100",
"13 13 \"Party Number\" 150", "13 13 \"Remitting Bank Party Number\" 200",
"14 14 \"Remitting Bank\" 200", "14 14 \"Remitting Bank\" 200",
"15 15 \"Cur\" 50", "15 15 \"Doc.Amount Cur\" 130",
"16 16 \"Doc.Amount\" 100 2 8 1 15", "16 16 \"Doc.Amount\" 100 2 8 1 15",
"17 17 \"Cur\" 50", "17 17 \"Open Amount Cur\" 130",
"18 18 \"Open Amount\" 100 2 8 1 17", "18 18 \"Open Amount\" 100 2 8 1 17",
], ],
data: [] data: []
......
src/views/Business/Infbod/Infsea.vue
...@@ -242,16 +242,12 @@ ...@@ -242,16 +242,12 @@
</c-istream-table> </c-istream-table>
</c-col> </c-col>
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body> <m-busbtn ref="childs" :ownref="ownref" :model="BotselModel" ownrefPath="bodgrp" trnCode="botsel"
<div class="m-list-btns"> @onChoose="onChoose">11</m-busbtn>
<m-busbtn ref="childs" :ownref="ownref" :model="BotselModel" ownrefPath="bodgrp" trnCode="botsel"
@onChoose="onChoose">11</m-busbtn>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import Utils from "~/utils/index";
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 CodeTable from "~/config/CodeTable";
...@@ -288,21 +284,22 @@ export default { ...@@ -288,21 +284,22 @@ export default {
columns: [ columns: [
'1 1 "Reference" 150', '1 1 "Reference" 150',
'2 2 "Resp. User" 100', '2 2 "Resp. User" 100',
'3 3 "Opened" 200 4 7', '3 3 "Opened" 150 4 7',
'4 4 "Closed" 200 4 7', '4 4 "Closed" 150 4 7',
'5 5 "分行名称" 200', '5 5 "分行名称" 200',
'6 6 "Party Number" 150', '6 6 "Drawee Party Number" 150',
'7 7 "Drawee" 133', '7 7 "Drawee" 133',
'8 8 "PTA NO." 100', '8 8 "PTA NO." 100',
'9 9 "Party Number" 150', '9 9 "Drawer Party Number" 150',
'10 10 "Drawer" 300', '10 10 "Drawer" 300',
'11 11 "Invoice No." 133', '11 11 "Invoice No." 133',
'12 12 "Drawer CN" 150', '12 12 "Drawer CN" 150',
'13 13 "Party Number" 150', '13 13 "Collecting Party Number" 200',
'14 14 "Collecting Bank" 200', '14 14 "Collecting Bank" 200',
'15 15 "Cur" 50', '15 15 "Doc.Amount Cur" 130',
'16 16 "Doc.Amount" 150 2 8 1 15', '16 16 "Doc.Amount" 100 2 8 1 15',
'17 17 "Cur" 50', '17 17 "Open Amount Cur" 130',
'18 18 "Open Amount" 100 2 8 1 -1'
], ],
data: [], data: [],
}, },
...@@ -311,37 +308,22 @@ export default { ...@@ -311,37 +308,22 @@ export default {
methods: { methods: {
...Event, ...Event,
async getButtons(ownref) { async getButtons(ownref) {
this.initdialog = true; this.$refs.childs.initdialog = true
this.ownref = ownref this.ownref = ownref
console.log("ownref:" + ownref); console.log("ownref:" + ownref);
setTimeout(() => {
this.$refs.childs.$emit("childmethods")
}, 10)
}, },
async onChoose(code) { async onChoose(code) {
//跳转交易 //跳转交易
this.$router.history.push("/business/" + code) this.$router.history.push("/business/" + code)
this.initdialog = false; this.$refs.childs.initdialog = false
}, },
closeTrn(refId) { closeTrn(refId) {
this.$refs[refId].doClose(); this.$refs[refId].doClose();
}, },
async getTrnInfo(idx, row) { async getTrnInfo(code) {
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
this.model.infcon.objinr = row["INR"];
this.model.bodgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon");
console.log(rtnmsg);
console.log(this.model.infcon.chksubcon);
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
console.log(this.trnData.data);
}
}, },
async getDitSelInfo(idx, row) { async getDitSelInfo(idx, row) {
//TD中选中行触发 //TD中选中行触发
......
src/views/Business/Infdid/Infsea.vue
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="Opening between" label="Opening"
prop="infcon.opndatfrom" prop="infcon.opndatfrom"
style="width: 100%" style="width: 100%"
> >
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
type="date" type="date"
v-model="model.infcon.opndatfrom" v-model="model.infcon.opndatfrom"
style="width: 100%" style="width: 100%"
placeholder="请选择Opening between" placeholder="请选择Opening"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
></c-date-picker> ></c-date-picker>
</c-col> </c-col>
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
v-model="model.infcon.searol" v-model="model.infcon.searol"
style="width: 100%" style="width: 100%"
placeholder="请选择Role" placeholder="请选择Role"
:code="codes.payrol"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -171,6 +172,7 @@ ...@@ -171,6 +172,7 @@
v-model="model.infcon.seasta" v-model="model.infcon.seasta"
style="width: 100%" style="width: 100%"
placeholder="请选择Status" placeholder="请选择Status"
:code="codes.seasta"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -185,13 +187,14 @@ ...@@ -185,13 +187,14 @@
v-model="model.infcon.seacur" v-model="model.infcon.seacur"
style="width: 100%" style="width: 100%"
placeholder="请选择Currency" placeholder="请选择Currency"
:code="codes.curtxt1"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="Amount between" label="Amount"
prop="infcon.seaamtfr" prop="infcon.seaamtfr"
style="width: 100%" style="width: 100%"
> >
...@@ -199,7 +202,7 @@ ...@@ -199,7 +202,7 @@
<c-input <c-input
v-model="model.infcon.seaamtfr" v-model="model.infcon.seaamtfr"
style="width: 100%" style="width: 100%"
placeholder="请输入Amount between" placeholder="请输入Amount"
> >
</c-input> </c-input>
</c-col> </c-col>
...@@ -228,6 +231,7 @@ ...@@ -228,6 +231,7 @@
v-model="model.seacnfdet" v-model="model.seacnfdet"
style="width: 100%" style="width: 100%"
placeholder="请选择Confirmation Status" placeholder="请选择Confirmation Status"
:code="codes.cnfins"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -243,6 +247,7 @@ ...@@ -243,6 +247,7 @@
v-model="model.sealcrtyp" v-model="model.sealcrtyp"
style="width: 100%" style="width: 100%"
placeholder="请选择form of L/C" placeholder="请选择form of L/C"
:code="codes.lcrtyp"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -258,6 +263,7 @@ ...@@ -258,6 +263,7 @@
v-model="model.jyqflg" v-model="model.jyqflg"
style="width: 100%" style="width: 100%"
placeholder="请选择假远期信用证" placeholder="请选择假远期信用证"
:code="codes.jyqflg"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -270,6 +276,7 @@ ...@@ -270,6 +276,7 @@
v-model="model.mylx" v-model="model.mylx"
style="width: 100%" style="width: 100%"
placeholder="请选择贸易类型" placeholder="请选择贸易类型"
:code="codes.mylx"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -285,6 +292,7 @@ ...@@ -285,6 +292,7 @@
v-model="model.elcflg" v-model="model.elcflg"
style="width: 100%" style="width: 100%"
placeholder="请选择是否通过电证系统" placeholder="请选择是否通过电证系统"
:code="codes.elcflg"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -668,7 +676,7 @@ export default { ...@@ -668,7 +676,7 @@ export default {
}, },
toDitopn(){ toDitopn(){
this.$router.history.push("/business/ditopn") this.$router.history.push("/business/ditopn")
} },
}, },
created: function () {}, created: function () {},
}; };
......
src/views/Layout/SideMenu.vue
...@@ -96,14 +96,14 @@ export default { ...@@ -96,14 +96,14 @@ export default {
// { inifrm: "bctset", ininam: "进口代收付款", pntmiu: "5" }, // { inifrm: "bctset", ininam: "进口代收付款", pntmiu: "5" },
// { inifrm: "bctcan", ininam: "进口代收注销", pntmiu: "5" }, // { inifrm: "bctcan", ininam: "进口代收注销", pntmiu: "5" },
{ inifrm: "infbcd", ininam: "进口代收查询", pntmiu: "5" }, { inifrm: "infbcd", ininam: "进口代收查询", pntmiu: "5" },
{ inifrm: "6", ininam: "出口托收", pntmiu: "" }, { inifrm: "6", ininam: "出口托收", pntmiu: "" },
{ inifrm: "infbod", ininam: "出口托收查询", pntmiu: "6" },
{ inifrm: "infbod", ininam: "出口托收入口交易", pntmiu: "6" }, // { inifrm: "botdav", ininam: "出口托收寄单", pntmiu: "6" },
{ inifrm: "botdav", ininam: "出口托收寄单", pntmiu: "6" }, // { inifrm: "botame", ininam: "出口托收修改", pntmiu: "6" },
{ inifrm: "botame", ininam: "出口托收修改", pntmiu: "6" }, // { inifrm: "botdcr", ininam: "出口托收拒付/不符点", pntmiu: "6" },
{ inifrm: "botdcr", ininam: "出口托收拒付/不符点", pntmiu: "6" }, // { inifrm: "botset", ininam: "出口托收收汇", pntmiu: "6" },
{ inifrm: "botset", ininam: "出口托收收汇", pntmiu: "6" }, // { inifrm: "botcan", ininam: "出口托收闭卷", pntmiu: "6" },
{ inifrm: "botcan", ininam: "出口托收闭卷", pntmiu: "6" },
{ inifrm: "7", ininam: "转让信用证", pntmiu: "" }, { inifrm: "7", ininam: "转让信用证", pntmiu: "" },
{ inifrm: "lttopn", ininam: "转让证开立", pntmiu: "7" }, { inifrm: "lttopn", ininam: "转让证开立", pntmiu: "7" },
{ inifrm: "lttame", ininam: "转让证修改", pntmiu: "7" }, { inifrm: "lttame", ininam: "转让证修改", pntmiu: "7" },
......
src/views/Public/Docpre.vue
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<div style="float: right;"> <div style="float: right;">
<span class="add_del_button add_button" @click="addTableValue">+</span> <span class="add_del_button add_button" @click="addTableValue" v-if="ifShowAdd">+</span>
<span class="add_del_button" @click="deleteTable">-</span> <span class="add_del_button" @click="deleteTable" v-if="ifShowDelete">-</span>
</div> </div>
</c-col> </c-col>
</row> </row>
......
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