Skip to content

V
vue-gjjs
Commit f18b6cf8 by sheyinchen
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 502e96c3 f2fb0ed3
Showing with 63 additions and 88 deletions
src/model/Bttset/index.js
...@@ -5,6 +5,10 @@ import Pub from "../Public" ...@@ -5,6 +5,10 @@ import Pub from "../Public"
export default class Bttset { export default class Bttset {
constructor() { constructor() {
this.data = { this.data = {
bttbe1llblk:"",
bttpayl1blk:"",
bttprbl1blk:"",
lendoc_botsetl1blk:"",
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut, mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod, trnmod: new Pub().data.Trnmod,
......
src/views/Business/Bttset/Setp.vue
...@@ -357,8 +357,6 @@ ...@@ -357,8 +357,6 @@
<c-col :span="24"> <c-col :span="24">
<p>Bills to Pay Back:</p> <p>Bills to Pay Back:</p>
</c-col> </c-col>
<c-row class="infrow" style="margin-top: 20px">
<c-col :span="24"> <c-col :span="24">
<c-istream-table <c-istream-table
:list="stmData.fepstmData" :list="stmData.fepstmData"
...@@ -368,7 +366,6 @@ ...@@ -368,7 +366,6 @@
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</c-row>
</c-col> </c-col>
<br /> <br />
......
src/views/Business/Bttset/Wg.vue
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-row> <c-row>
<c-col :span="24"> <c-col :span="24">
<!-- -----页面左边----- --> <!-- -----页面左边----- -->
...@@ -9,10 +8,11 @@ ...@@ -9,10 +8,11 @@
<c-col :span="21"> <c-col :span="21">
<el-form-item label="申报类型" prop="bopmod.szflg"> <el-form-item label="申报类型" prop="bopmod.szflg">
<c-select <c-select
:code="codes.szflg"
v-model="model.bopmod.szflg" v-model="model.bopmod.szflg"
style="width: 95%" style="width: 95%"
placeholder="请选择申报类型" placeholder="请选择申报类型"
:code="codes.szflg"
@change="szflgChange"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="地区机构号" prop="bopmod.ownextkey"> <el-form-item label="地区机构号" prop="bopmod.ownextkey">
<c-select <c-select
:code="codes.ownextkey1" :code="getValues('bopmod.ownextkey')"
:disabled=" :disabled="
model.bopmod.szflg != '1' && model.bopmod.szflg != '2' model.bopmod.szflg != '1' && model.bopmod.szflg != '2'
" "
...@@ -88,26 +88,30 @@ ...@@ -88,26 +88,30 @@
</div> </div>
</template> </template>
<script> <script>
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";
import Event from "~/model/Bttset/Event" import Event from "~/model/Bttset/Event";
import Utils from "~/utils";
export default { export default {
inject: ['root'], inject: ["root"],
props:["model","codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data(){ data() {
return { return {};
}
}, },
methods:{...Event}, methods: {
created:function(){ ...Event,
async szflgChange() {
let rtnmsg = await this.executeRule("bopmod.szflg");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
} }
} },
},
created: function () {},
};
</script> </script>
<style> <style>
</style> </style>
src/views/Business/Bttset/index.vue
...@@ -39,7 +39,15 @@ ...@@ -39,7 +39,15 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Settlement" name="setpan"> <el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane v-if="this.flag" label="Bookings" name="glepan">
<c-content>
<m-glepan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="Completion" name="coninfp">
...@@ -80,10 +88,6 @@ ...@@ -80,10 +88,6 @@
> >
<m-basp :model="model" :codes="codes" /> <m-basp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--dbap PD000000 涉外收入申报单－基础信息 -->
<!-- <el-tab-pane label="$t('dbap.PD000000')" name="basp">
<m-basp :model="model" :codes="codes" />
</el-tab-pane> -->
<!--cnybop PD000002 跨境人民币申报 --> <!--cnybop PD000002 跨境人民币申报 -->
<el-tab-pane label="跨境人民币申报" name="cnyp"> <el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes" /> <m-cnyp :model="model" :codes="codes" />
...@@ -124,6 +128,7 @@ import Setpan from "~/views/Public/Setpan"; ...@@ -124,6 +128,7 @@ import Setpan from "~/views/Public/Setpan";
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp";
import Doc from "~/views/Public/Docpan"; import Doc from "~/views/Public/Docpan";
import Doctre from "~/views/Public/Doctre"; import Doctre from "~/views/Public/Doctre";
import Glepan from "~/views/Public/Glepan";
export default { export default {
name: "Bttset", name: "Bttset",
...@@ -141,6 +146,7 @@ export default { ...@@ -141,6 +146,7 @@ export default {
"m-coninfp": Coninfp, "m-coninfp": Coninfp,
"m-doc": Doc, "m-doc": Doc,
"m-doctre": Doctre, "m-doctre": Doctre,
"m-glepan" :Glepan,
}, },
provide() { provide() {
return { return {
...@@ -169,6 +175,23 @@ export default { ...@@ -169,6 +175,23 @@ export default {
/** /**
* do it yourself * do it yourself
**/ **/
let name = tab.name
let rulePath;
if (name === "basp") {
rulePath = "bopmod.dbap.basp";
}
if(name === "basp1"){
rulePath = "bopmod.dbdp.basp";
}if(name ==="wg"){
rulePath="bopgat.wg"
}
if (!!rulePath) {
this.executeRule(rulePath).then(res => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data)
}
})
}
}, },
}, },
created: async function () { created: async function () {
......
src/views/Business/BusRouter.js
...@@ -226,7 +226,7 @@ const BusRouter = [ ...@@ -226,7 +226,7 @@ const BusRouter = [
{ path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } }, { path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } },
{ path: 'infccd', component: Infccd, name: 'Infccd', meta: { title: '光票托收查询' } }, { path: 'infccd', component: Infccd, name: 'Infccd', meta: { title: '光票托收查询' } },
{ path: 'ccttra', component: Ccttra, name: 'Ccttra', meta: { title: '光票托收催收' } }, { path: 'ccttra', component: Ccttra, name: 'Ccttra', meta: { title: '光票托收催收' } },
{ path: 'cctdav', component: Cctdav, name: 'Cctdav', meta: { title: '光票托收开立' } }, { path: 'cctdav', component: Cctdav, name: 'Cctdav', meta: { title: '光票托收建立' } },
{ path: 'cctset', component: Cctset, name: 'Cctset', meta: { title: '光票托收收汇' } }, { path: 'cctset', component: Cctset, name: 'Cctset', meta: { title: '光票托收收汇' } },
{ path: 'cctsel', component: Cctsel, name: 'Cctsel', meta: { title: '光票托收入口交易' } }, { path: 'cctsel', component: Cctsel, name: 'Cctsel', meta: { title: '光票托收入口交易' } },
{ path: 'cctdcr', component: Cctdcr, name: 'Cctdcr', meta: { title: '光票托收退票' } }, { path: 'cctdcr', component: Cctdcr, name: 'Cctdcr', meta: { title: '光票托收退票' } },
......
src/views/Business/Cctdav/index.vue
...@@ -24,37 +24,37 @@ ...@@ -24,37 +24,37 @@
> >
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--cctdav PD000001 --> <!--cctdav PD000001 -->
<el-tab-pane label="Establish Clean Collection" name="cctdav1"> <el-tab-pane label="建立光票托收" name="cctdav1">
<c-content> <c-content>
<m-cctdav1 :model="model" :codes="codes" /> <m-cctdav1 :model="model" :codes="codes" />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--trndoc PD000529 &Messages --> <!--trndoc PD000529 &Messages -->
<el-tab-pane label="Messages" name="docpan"> <el-tab-pane label="面函" name="docpan">
<m-docpan :model="model" :codes="codes" /> <m-docpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--trndoc PD000546 Attachments --> <!--trndoc PD000546 Attachments -->
<el-tab-pane label="Attachments" name="doctre"> <el-tab-pane label="交易附件" name="doctre">
<m-doctre :model="model" :codes="codes" /> <m-doctre :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--coninf PD000000 Completion --> <!--coninf PD000000 Completion -->
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" /> <m-coninfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--engp PD000000 Liability --> <!--engp PD000000 Liability -->
<el-tab-pane label="Liability" name="engp"> <el-tab-pane label="表外账" name="engp">
<m-engp :model="model" :codes="codes" /> <m-engp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--setmod PD000000 Settlement --> <!--setmod PD000000 Settlement -->
<el-tab-pane label="Settlement" name="setpan"> <el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--glemod PD000001 --> <!--glemod PD000001 -->
<el-tab-pane label="Bookings" name="glepan"> <el-tab-pane label="分录" name="glepan">
<m-glepan :model="model" :codes="codes" /> <m-glepan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--cctp PD000065 Settlement Instructions --> <!--cctp PD000065 Settlement Instructions -->
<el-tab-pane label="Settlement Instructions" name="setinsp"> <el-tab-pane label="结算说明" name="setinsp">
<m-setinsp :model="model" :codes="codes" /> <m-setinsp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
......
src/views/Business/Getset/Limitbody.vue
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<!--
<c-col :span="12">
<el-form-item label="ECIFNO">
<c-input v-model="model.liaall.limmod.ecifno" maxlength="22" placeholder="请输入ECIFNO"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="model.liaall.limmod.limpts.wrklab" data-path=".liaall.limmod.limpts.wrklab" > </span>
</c-col>
<c-col :span="12">
<span v-text="model.liaall.limmod.limpts.othlab" data-path=".liaall.limmod.limpts.othlab" > </span>
</c-col>
<c-col :span="12">
<span v-text="model.liaall.limmod.limpts.othlabss" data-path=".liaall.limmod.limpts.othlabss" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="Drag Drop Sender">
<c-input v-model="model.liaall.limmod.wrkp.ptsget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Drag Drop Sender">
<c-input v-model="model.liaall.limmod.othp.ptsget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item>
</c-col>
-->
<!-- 左边--> <!-- 左边-->
<c-col :span="8"> <c-col :span="8">
<!-- line2 --> <!-- line2 -->
...@@ -361,27 +329,6 @@ ...@@ -361,27 +329,6 @@
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col>
<!-- <c-col :span="24" style="" v-if="false">
<c-table :list="model.liaall.limmod.lmegrd" :border="true">
<el-table-column label="可否串用" width="auto">
</el-table-column>
<el-table-column label="序号" width="auto"> </el-table-column>
<el-table-column label="额度类型" width="auto">
</el-table-column>
<el-table-column label="入账机构" width="auto">
</el-table-column>
<el-table-column label="额度编号" width="auto">
</el-table-column>
<el-table-column label="额度明细编号" width="auto">
</el-table-column>
<el-table-column label="额度品种代码" 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-col> -->
</div> </div>
</template> </template>
......
src/views/Business/Infccd/Infsea.vue
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
size="medium" size="medium"
type="primary" type="primary"
@click="toCctdav" @click="toCctdav"
>光票托收开立</c-button >光票托收建立</c-button
> >
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
......
src/views/Review/ReviewRouter.js
...@@ -243,7 +243,7 @@ const ReviewRouter = [ ...@@ -243,7 +243,7 @@ const ReviewRouter = [
{ path: "gctcan", component: ReviewGctcan, name: "ReviewGctcan", meta: { title: "复核-Gctcan" } }, { path: "gctcan", component: ReviewGctcan, name: "ReviewGctcan", meta: { title: "复核-Gctcan" } },
{ path: "bttrcl", component: ReviewBttrcl, name: "ReviewBttrcl", meta: { title: "复核-Bttrcl" } }, { path: "bttrcl", component: ReviewBttrcl, name: "ReviewBttrcl", meta: { title: "复核-Bttrcl" } },
{ path: "bttset", component: ReviewBttrcl, name: "ReviewBttset", meta: { title: "复核-Bttset" } }, { path: "bttset", component: ReviewBttset, name: "ReviewBttset", meta: { title: "复核-Bttset" } },
......
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