Commit eb7da4db by zhujiazhan

修改code方法

parent 3f3bbf40
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
<script> <script>
import CodeTable from "~/config/CodeTable";
export default { export default {
props: { props: {
...@@ -180,10 +179,6 @@ export default { ...@@ -180,10 +179,6 @@ export default {
selectAll: true, selectAll: true,
columnGroup: [], columnGroup: [],
setColumnFlg: false, setColumnFlg: false,
codes:{
...CodeTable
}
}; };
}, },
mounted() { mounted() {
...@@ -333,11 +328,7 @@ export default { ...@@ -333,11 +328,7 @@ export default {
if(!value || !code){ if(!value || !code){
return "" return ""
} }
let args=this.codes[code]; let em = code.find(item=>item.value.trim() == value.trim())
if (!args) {
return ""
}
let em = args.find(item=>item.value.trim() == value.trim())
if(!em){ if(!em){
return value return value
} }
......
...@@ -233,7 +233,9 @@ export default class Utils { ...@@ -233,7 +233,9 @@ export default class Utils {
} }
static generateUUID() { static generateUUID() {
console.log(111);
var d = new Date().getTime(); var d = new Date().getTime();
console.log(2222);
if (window.performance && typeof window.performance.now === "function") { if (window.performance && typeof window.performance.now === "function") {
d += performance.now(); //use high-precision timer if available d += performance.now(); //use high-precision timer if available
} }
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
v-model="model.cpdgrp.orc.pts.ref" v-model="model.cpdgrp.orc.pts.ref"
maxlength="16" maxlength="16"
placeholder="" placeholder=""
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -90,6 +91,7 @@ ...@@ -90,6 +91,7 @@
v-model="model.cpdgrp.rec.orcact" v-model="model.cpdgrp.rec.orcact"
maxlength="35" maxlength="35"
placeholder="汇款人账号" placeholder="汇款人账号"
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -210,10 +212,10 @@ ...@@ -210,10 +212,10 @@
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -256,10 +258,10 @@ ...@@ -256,10 +258,10 @@
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
......
...@@ -86,10 +86,10 @@ ...@@ -86,10 +86,10 @@
@change="commonExecuteRule('cpdgrp.cbs.nom1.cur')" @change="commonExecuteRule('cpdgrp.cbs.nom1.cur')"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</c-form-item> </c-form-item>
...@@ -142,13 +142,12 @@ ...@@ -142,13 +142,12 @@
@keyup.enter.native="showGridPromptDialog('cptp.draweecountcode')" @keyup.enter.native="showGridPromptDialog('cptp.draweecountcode')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
size="small"                 size="small"
type="primary"                 type="primary"
@click="onCptpSelbut"                 icon="el-icon-search"
icon="el-icon-search"                 @click="showGridPromptDialog('cptp.selbut', null, null,{TXT: 'cptp.draweecountcode'}, {TXT: false},'doxpDialog')"
style="margin-left:10px;padding: 0 10px;">               > </c-button>
</c-button>
</template> </template>
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
...@@ -338,10 +337,10 @@ ...@@ -338,10 +337,10 @@
placeholder="请选择国外费用币种" placeholder="请选择国外费用币种"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
</c-select> </c-select>
......
...@@ -68,6 +68,14 @@ ...@@ -68,6 +68,14 @@
</c-tabs> </c-tabs>
</el-form> </el-form>
</div> </div>
<c-grid-ety-prompt-dialog
        ref="doxpDialog"
        :isPty="false"
        :promptData="promptData"
        @select-ety="selectMsg"
      >
      </c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog> <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog>
</c-page> </c-page>
</template> </template>
......
...@@ -28,34 +28,34 @@ ...@@ -28,34 +28,34 @@
" "
></c-input> ></c-input>
</el-form-item> </el-form-item>
<!-- </c-col> <template slot="footer">
<c-col :span="6" style="text-align: right"> <!-- <c-button
<el-form-item label="" label-width="15px"> --> style="margin:0 10px 0 10px;padding: 0 12px;"
<!-- <c-col :span="12"> --> size="small"
<template slot="footer"> type="primary"
<c-button icon="el-icon-search"
style="margin:0 10px 0 10px;padding: 0 12px;" >
size="small" </c-button> -->
type="primary" <c-button
icon="el-icon-search"                 size="small"
>                 type="primary"
</c-button>                 icon="el-icon-search"
<!-- </c-col> -->                 @click="showGridPromptDialog('ptsget.sdamod.seainf', null, null,{TXT: 'cpdgrp.ori.pts.extkey'}, {TXT: false},'doxpDialog')"
<!-- <c-col :span="12"> -->               >
<c-button             </c-button>
style="margin:0 0"
size="small"
type="primary" <c-button
@click="onSndpDet" style="margin:0 0"
disabled size="small"
> type="primary"
详情 @click="onSndpDet"
</c-button> disabled
</template> >
<!-- </c-col> --> 详情
<!-- </el-form-item> --> </c-button>
</c-fullbox> </template>
<!-- </c-col> --> </c-fullbox>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24" v-show="false">
<el-form-item label="收款人名称" prop="pyenam"> <el-form-item label="收款人名称" prop="pyenam">
<c-input <c-input
v-model="model.pyenam" v-model="model.pyenam"
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24" v-show="false">
<el-form-item label="清算费用锁定服务" prop="cptp.qsfysd"> <el-form-item label="清算费用锁定服务" prop="cptp.qsfysd">
<c-select <c-select
v-model="model.cptp.qsfysd" v-model="model.cptp.qsfysd"
...@@ -256,12 +256,11 @@ ...@@ -256,12 +256,11 @@
v-model="model.cpdgrp.rec.curf33b" v-model="model.cpdgrp.rec.curf33b"
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
:disabled="model.cpdgrp.orc.pts.extkey && model.cpdgrp.pye.pts.extkey"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
...@@ -273,10 +272,11 @@ ...@@ -273,10 +272,11 @@
label-width="8px" label-width="8px"
prop="cpdgrp.rec.amtf33b" prop="cpdgrp.rec.amtf33b"
> >
<!-- :disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''" -->
<c-input <c-input
v-model="model.cpdgrp.rec.amtf33b" v-model="model.cpdgrp.rec.amtf33b"
placeholder="请输入原始金额" placeholder="请输入原始金额"
:disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -287,7 +287,6 @@ ...@@ -287,7 +287,6 @@
<c-input <c-input
v-model="model.cpdgrp.rec.f36" v-model="model.cpdgrp.rec.f36"
placeholder="" placeholder=""
:disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -302,13 +301,13 @@ ...@@ -302,13 +301,13 @@
v-model="model.cpdgrp.rec.cur71f" v-model="model.cpdgrp.rec.cur71f"
placeholder="" placeholder=""
style="width: 100%" style="width: 100%"
:disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -322,7 +321,6 @@ ...@@ -322,7 +321,6 @@
<c-input <c-input
v-model="model.cpdgrp.rec.amt71f" v-model="model.cpdgrp.rec.amt71f"
placeholder="请输入发报行扣费金额" placeholder="请输入发报行扣费金额"
:disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -118,9 +118,9 @@ ...@@ -118,9 +118,9 @@
@change="onNom1CurChange" @change="onNom1CurChange"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
:disabled="!model.cpdgrp.rec.ischktyp || model.cpdgrp.rec.ischktyp == 'N'" :disabled=this.flag1
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -348,33 +348,35 @@ ...@@ -348,33 +348,35 @@
<c-col :span="24"> <c-col :span="24">
<c-fullbox> <c-fullbox>
<el-form-item <c-col :span="20">
label="收款人常驻国家/地区代码" <c-col :span="21">
prop="cptp.payeecountcode" <el-form-item
> label="收款人常驻国家/地区代码"
<c-input prop="cptp.payeecountcode">
v-model="model.cptp.payeecountcode" <c-input
maxlength="3" v-model="model.cptp.payeecountcode"
placeholder="请输入收款人常驻国家/地区代码" maxlength="3"
@keyup.enter.native=" placeholder="请输入收款人常驻国家/地区代码"
showGridPromptDialog('cptp.payeecountcode') @keyup.enter.native="
" showGridPromptDialog('cptp.payeecountcode')
style="width: 100%" "
></c-input> style="width: 100%"
</el-form-item> ></c-input>
</el-form-item>
</c-col>
<c-col :span="3">
<c-button
                size="small"
                type="primary"
                icon="el-icon-search"
                @click="showGridPromptDialog('cptp.selbut1', null, null,{TXT: 'cptp.payeecountcode'}, {TXT: false},'doxpDialog')"
              > </c-button>
</c-col>
</c-col>
<template slot="footer"> <c-col :span="4" style="float: right">
<c-button <c-checkbox v-model="model.cpdgrp.rec.tsnflg" label-width="150px" >同名划转</c-checkbox>
size="small" </c-col>
type="primary"
icon="el-icon-search"
@click="onCptpGetinf"
>
</c-button>
<c-checkbox v-model="model.cpdgrp.rec.tsnflg"
>同名划转</c-checkbox
>
</template>
</c-fullbox> </c-fullbox>
</c-col> </c-col>
...@@ -466,7 +468,7 @@ export default { ...@@ -466,7 +468,7 @@ export default {
{ value: "O", label: "Other" }, { value: "O", label: "Other" },
{ value: "S", label: "CIPS系统" }, { value: "S", label: "CIPS系统" },
], ],
flag1:false,
}; };
}, },
methods: { methods: {
...@@ -474,6 +476,20 @@ export default { ...@@ -474,6 +476,20 @@ export default {
onCptpGetref() {}, onCptpGetref() {},
onCptpGetmod() {}, onCptpGetmod() {},
}, },
watch:{
"model.cpdgrp.rec.ischktyp":{
immediate:true,
handler(val ,oldVal){
if(this.model.cpdgrp.rec.ischktyp == 'N'){
this.flag1=true;
this.model.cpdgrp.rec.paydat="";
}
else{
this.flag1=false;
}
}
},
},
created: function () {}, created: function () {},
computed: { computed: {
flag() { flag() {
......
...@@ -96,7 +96,14 @@ ...@@ -96,7 +96,14 @@
</c-tabs> </c-tabs>
</el-form> </el-form>
</div> </div>
<c-grid-ety-prompt-dialog
        ref="doxpDialog"
        :isPty="false"
        :promptData="promptData"
        @select-ety="selectMsg"
      >
      </c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog> <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog>
</c-page> </c-page>
</template> </template>
......
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
placeholder="请选择Currency" placeholder="请选择Currency"
:code="codes.currencycode" :code="codes.currencycode"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -221,7 +222,7 @@ ...@@ -221,7 +222,7 @@
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" <c-istream-table :list="stmData.data"
:columns="columns" :showButtonFlg="true"> :columns="columns">
<el-table-column fixed="right" prop="op" label="操作" width="150px"> <el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover
...@@ -325,7 +326,7 @@ export default { ...@@ -325,7 +326,7 @@ export default {
width: 100, width: 100,
pattern: "code", pattern: "code",
label: "状态", label: "状态",
code: "relstaEN", code: this.codes.relstaEN,
}, },
'5 5 "币种" 80', '5 5 "币种" 80',
'6 6 "金额" 110', '6 6 "金额" 110',
...@@ -336,7 +337,7 @@ export default { ...@@ -336,7 +337,7 @@ export default {
'1 1 "Reference" 140', '1 1 "Reference" 140',
'2 2 "Resp. User" 100', '2 2 "Resp. User" 100',
//'3 3 "Goods Code" 100 1 0 1 GODCOD', //'3 3 "Goods Code" 100 1 0 1 GODCOD',
{ index: 3, position: 3, width: 100, pattern: "code", label: "Goods Code" ,"code":"godcod"}, { index: 3, position: 3, width: 100, pattern: "code", label: "Goods Code" ,"code":this.codes.godcod},
'7 4 "Party Number1" 133', '7 4 "Party Number1" 133',
'8 5 "Applicant" 160', '8 5 "Applicant" 160',
'9 6 "Applicant CN" 133', '9 6 "Applicant CN" 133',
...@@ -386,6 +387,9 @@ export default { ...@@ -386,6 +387,9 @@ export default {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows; this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
} }
}, },
async closeTrn(refId) {
this.$refs[refId].doClose();
},
}, },
created: function () {}, created: function () {},
}; };
......
...@@ -401,7 +401,8 @@ ...@@ -401,7 +401,8 @@
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
<!-- <m-busbtn ref="childs" :ownref="ownref" @onChoose="onChoose"></m-busbtn> -->
<m-busbtn ref="childs" :ownref="ownref" trnCode="cptsel" :model="cptselModel" ownrefPath="cpdgrp" @onChoose="onChoose" >11</m-busbtn>
</div> </div>
</template> </template>
...@@ -411,6 +412,7 @@ import commonProcess from "~/mixin/commonProcess"; ...@@ -411,6 +412,7 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infcpd/Event"; import Event from "~/model/Infcpd/Event";
import BusNavbar from "~/views/Public/BusNavbar"; import BusNavbar from "~/views/Public/BusNavbar";
import CptselModel from "~/model/Cptsel"
export default { export default {
...@@ -427,6 +429,7 @@ export default { ...@@ -427,6 +429,7 @@ export default {
{ label: "Payee", value: "PYE" }, { label: "Payee", value: "PYE" },
{ label: "Reimb. Bank Transfer", value: "RMT" }, { label: "Reimb. Bank Transfer", value: "RMT" },
], ],
cptselModel: new CptselModel().data,
searchToggle: true, searchToggle: true,
ownref: "", ownref: "",
dialogTableVisible: false, dialogTableVisible: false,
...@@ -443,7 +446,7 @@ export default { ...@@ -443,7 +446,7 @@ export default {
width: 100, width: 100,
pattern: "code", pattern: "code",
label: "状态", label: "状态",
code: this.codes.relstaEN, code: "relstaEN",
}, },
'5 5 "币种" 80', '5 5 "币种" 80',
'6 6 "金额" 100', '6 6 "金额" 100',
...@@ -541,7 +544,6 @@ export default { ...@@ -541,7 +544,6 @@ export default {
closeTrn(refId){ closeTrn(refId){
this.$refs[refId].doClose(); this.$refs[refId].doClose();
}, },
handleReset() {},
toCptopn(){ toCptopn(){
this.$router.history.push("/business/cptopn") this.$router.history.push("/business/cptopn")
}, },
......
...@@ -182,6 +182,8 @@ export default { ...@@ -182,6 +182,8 @@ export default {
}, },
methods:{ methods:{
getType(idx) { getType(idx) {
console.log(this.codes);
for (let i = 0; i < this.codes.doceotCortyp.length; i++) { for (let i = 0; i < this.codes.doceotCortyp.length; i++) {
const c = this.codes.doceotCortyp[i]; const c = this.codes.doceotCortyp[i];
if (this.model.trnmod.trndoc.doceot[idx].cortyp === c.value) { if (this.model.trnmod.trndoc.doceot[idx].cortyp === c.value) {
......
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