Commit bcf0b96f by zhujiazhan

代码提交

parent f2fa50bc
......@@ -99,7 +99,10 @@
</div>
</template>
<script>
import CodeTable from "~/config/CodeTable";
export default {
props: {
columns: {
......@@ -176,7 +179,11 @@ export default {
pageSize: 10,
selectAll: true,
columnGroup: [],
setColumnFlg: false
setColumnFlg: false,
codes:{
...CodeTable
}
};
},
mounted() {
......@@ -193,7 +200,7 @@ export default {
if(typeof line === "object" ){
//如果是对象,支持自定义处理
//{width,position,index,label,pattern,render}
let {width,position,index,label,pattern,render,...rest} = line
let {width,position,index,label,pattern,render,code,...rest} = line
position += ''
if (!obj[position]) {
obj[position] = [];
......@@ -205,6 +212,7 @@ export default {
width:width === 'auto' ? width : width +'px',
pattern,
render,
code,
...rest
})
continue
......@@ -321,12 +329,14 @@ export default {
},
//code映射
code(item,scope){
console.log(this.codes);
let value = scope.row[item.prop]
let code = item.code
if(!value || !code){
return ""
}
let em = code.find(item=>item.value.trim() == value.trim())
let args=this.codes[code];
let em = args.find(item=>item.value.trim() == value.trim())
if(!em){
return value
}
......
......@@ -27,8 +27,24 @@ export default {
}
},
async handleReset() {
this.model.infcon.seaownref = "";
this.model.infcon.searef = "";
this.model.infcon.pty.extkey = "";
this.model.infcon.seapty = "";
this.model.infcon.opndatfrom = "";
this.model.infcon.opndatto = "";
this.model.infcon.seaamtfr = "";
this.model.infcon.seaamtto = "";
this.model.infcon.seasta = "";
this.model.infcon.usr.extkey = "";
this.model.infcon.nam = "";
this.model.infcon.hndtyp = "";
this.model.infcon.pty.nam = "";
this.model.infcon.searol = "";
this.model.infcon.seacur = "";
this.model.infcon.seasta = "";
this.stmData.data = "";
},
async onInfbutSearow(){
let rtnmsg = await this.executeRule("infbut.searow")
......
......@@ -84,7 +84,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="单据状态" prop="brdgrp.rec.docsta">
<c-select v-model="model.brdgrp.rec.docsta" style="width:100%" placeholder="请选择单据状态" :code="codes.docsta" disabled>
<c-select v-model="model.brdgrp.rec.docsta" style="width:100%" placeholder="请选择单据状态" :code="codes.docsta1" disabled>
</c-select>
</el-form-item>
</c-col>
......
......@@ -200,6 +200,15 @@ export default {
/**
* do it yourself
**/
},
// 第二个表格
detail1(index, row) {
this.executeDefault("setfel/det").then(res=>{
this.dialogVisible = true;
this.dialog = row;
this.index = index;
})
}
},
created:async function(){
......
......@@ -120,11 +120,12 @@
</c-col>
<c-col :span="12">
<el-form-item label="Status" prop="infcon.seasta">
<el-form-item label="Document Status" prop="infcon.seasta">
<c-select
v-model="model.infcon.seasta"
style="width: 100%"
placeholder="请选择Status"
:code="codes.seasta"
>
</c-select>
</el-form-item>
......@@ -176,7 +177,7 @@
v-model="model.seadocflg"
style="width: 100%"
placeholder="请选择Document Type"
>
:code="codes.docflg">
</c-select>
</el-form-item>
</c-col>
......@@ -187,6 +188,7 @@
v-model="model.seagodcod"
style="width: 100%"
placeholder="请选择Goods Code"
:code="codes.godcod"
>
</c-select>
</el-form-item>
......@@ -228,10 +230,8 @@
</c-col> -->
<c-col :span="24">
<c-istream-table
:list="model.infbut.dspstm ? model.infbut.dspstm.rows : []"
:columns="columns"
>
<c-istream-table :list="stmData.data"
:columns="columns">
<el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot-scope="scope">
<el-popover
......@@ -288,8 +288,7 @@
</el-table-column>
</c-istream-table>
</c-col>
<m-busbtn ref="childs" :ownref="ownref" trnCode="litsel" :model="litselModel" ownrefPath="brdgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn>
<m-busbtn ref="childs" :ownref="ownref" trnCode="litsel" :model="litselModel" ownrefPath="brdgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn>
</div>
</template>
......@@ -298,8 +297,9 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infbrd/Event";
import BusNavbar from "~/views/Public/BusNavbar";
import LitselModel from "~/model/Litsel"
import BusNavbar from "~/views/Public/BusNavbar";
export default {
inject: ["root"],
......@@ -309,6 +309,7 @@ export default {
data() {
return {
litselModel: new LitselModel().data,
initdialog:false,
ownref: "",
trnData: {
columns: [
......@@ -333,43 +334,45 @@ export default {
columns: [
'1 1 "Reference" 140',
'2 2 "Resp. User" 100',
'3 3 "Goods Code" 100 1 0 1 GODCOD',
// '4 4 "Opened" 500 4 7',
// '5 5 "Closed" 500 4 7',
{ index: 4, position: 4, width: 100, pattern: "date", label: "Opened" },
{ index: 5, position: 5, width: 100, pattern: "date", label: "Closed" },
'6 6 "PTA NO." 100',
'7 7 "Party Number" 133',
'8 8 "Applicant" 160',
'9 9 "Applicant CN" 133',
'10 10 "Party Number" 133',
'11 11 "Beneficiary" 150',
'12 12 "Party Number" 140',
'13 13 "Presenting Bank" 220',
//'3 3 "Goods Code" 100 1 0 1 GODCOD',
{ index: 3, position: 3, width: 100, pattern: "code", label: "Goods Code" ,"code":"godcod"},
'7 4 "Party Number1" 133',
'8 5 "Applicant" 160',
'9 6 "Applicant CN" 133',
'10 7 "Party Number2" 133',
'11 8 "Beneficiary" 150',
'6 9 "PTA NO." 100',
'12 10 "Party Number3" 140',
'13 11 "Presenting Bank" 220',
{ index: 4, position: 12, width: 100, pattern: "date", label: "Opened" },
{ index: 5, position: 13, width: 100, pattern: "date", label: "Closed" },
'14 14 "Doc.Amount Cur" 120',
'15 15 "Doc.Amount" 120 2 8 1 14',
'16 16 "Open Amount Cur" 130',
'17 17 "Open Amount" 120 2 8 1 16',
],
stmData: {
data: [],
},
};
},
methods: {
...Event,
async getButtons(ownref){
this.ownref = ownref
this.$refs.childs.initdialog = true
console.log("ownref:" +ownref);
},
async onChoose(code){
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
} ,
async getDitSelInfo(code){
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
},
this.ownref = ownref
this.$refs.childs.initdialog = true
console.log("ownref:" +ownref);
},
async onChoose(code){
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
} ,
async getDitSelInfo(code){
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
},
async getTrnInfo(idx, row) {
this.model.infcon.objinr = row["INR"];
this.model.brdgrp.rec.inr = row["INR"];
......
......@@ -153,9 +153,10 @@ export default {
rules: null,
codes: {
codeSet: {
"infcon.seacur": [],
"infcon.searol": []
}
"infcon.seacur": [],
"infcon.searol": [],
},
...CodeTable
},
}
},
......
......@@ -955,6 +955,7 @@ export default {
}
},
},
ogiamt:{},
};
},
methods: {
......
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