Skip to content

V
vue-gjjs
Commit 83caacbf by liuxin
Options

Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

parents c47d6e22 7f735df1
Showing with 152 additions and 71 deletions
src/model/Diasel/Event.js
...@@ -102,6 +102,7 @@ export default { ...@@ -102,6 +102,7 @@ export default {
this.executeDefault("dspstm").then(res => { this.executeDefault("dspstm").then(res => {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = res.data.dspstm.rows; this.stmData.data = res.data.dspstm.rows;
this.$store.commit("setTaskList", {key: "diasel", val: this.stmData.data.length});
}) })
}, },
......
src/model/Sptsel/Event.js
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
const res = await this.executeDefault("sptstm") const res = await this.executeDefault("sptstm")
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
this.$store.commit("setTaskList", {key: "sptsel", val: this.stmData.data.length});
// if(res.data.sptstm.rows.length == 0){ // if(res.data.sptstm.rows.length == 0){
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
...@@ -150,6 +151,7 @@ export default { ...@@ -150,6 +151,7 @@ export default {
// }) // })
const res = await this.executeDefault("sptstm") const res = await this.executeDefault("sptstm")
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
this.$store.commit("setTaskList", {key: "sptbrk", val: this.stmData.data.length});
// if(res.data.sptstm.rows.length == 0){ // if(res.data.sptstm.rows.length == 0){
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
......
src/model/Trnrel/Event.js
...@@ -391,6 +391,7 @@ export default { ...@@ -391,6 +391,7 @@ export default {
const res = await this.executeRule("searow") const res = await this.executeRule("searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows; that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm; this.model.trncorco.trnstm = res.data.trncorco_trnstm;
this.$store.commit("setTaskList", {key: "trnrel", val: this.stmData.data.length});
// if (res.data.trncorco_trnstm.rows.length == 0) { // if (res.data.trncorco_trnstm.rows.length == 0) {
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
...@@ -401,6 +402,16 @@ export default { ...@@ -401,6 +402,16 @@ export default {
this.$refs.paramsForm.clearValidate(); this.$refs.paramsForm.clearValidate();
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields) Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
}, },
async trnfndhandleSearch() {
const that = this.root;
const res = await this.executeRule("searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm;
this.$store.commit("setTaskList", {key: "trnfnd", val: this.stmData.data.length});
this.$refs.paramsForm.clearValidate();
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
},
async handleReset() { async handleReset() {
this.model.bchcon = ""; this.model.bchcon = "";
......
src/store/Status.js
...@@ -26,6 +26,7 @@ const Status = { ...@@ -26,6 +26,7 @@ const Status = {
taskList: { taskList: {
sptsel: 0, sptsel: 0,
trnrel: 0, trnrel: 0,
trnfnd: 0,
bopsel: 0, bopsel: 0,
sptbrk: 0, sptbrk: 0,
diasel: 0, diasel: 0,
......
src/views/Business/Diasel/index.vue
...@@ -18,6 +18,7 @@ import Api from "~/service/Api" ...@@ -18,6 +18,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Diasel from "~/model/Diasel" import Diasel from "~/model/Diasel"
import CommonProcess from "~/mixin/CommonProcess" import CommonProcess from "~/mixin/CommonProcess"
import Utils from "~/utils/index"
import Check from "~/model/Diasel/Check" import Check from "~/model/Diasel/Check"
import Default from "~/model/Diasel/Default" import Default from "~/model/Diasel/Default"
import Pattern from "~/model/Diasel/Pattern" import Pattern from "~/model/Diasel/Pattern"
...@@ -70,7 +71,7 @@ export default { ...@@ -70,7 +71,7 @@ export default {
} }
}); });
let rtnmsg = await this.init({}) /* let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
...@@ -80,7 +81,13 @@ export default { ...@@ -80,7 +81,13 @@ export default {
else else
{ {
this.$notify.error({title: '错误',message: '服务请求失败！'}); this.$notify.error({title: '错误',message: '服务请求失败！'});
} } */
const that = this;
that.init(that.model).then(res => {
//TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data)
this.$refs.diaselp.handleSearch();
})
} }
} }
</script> </script>
......
src/views/Business/Ditdck/index.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :handleStash="handleStash"
> >
</c-function-btn> </c-function-btn>
<el-form <el-form
:model="model" :model="model"
:rules="rules" :rules="rules"
...@@ -17,12 +17,15 @@ ...@@ -17,12 +17,15 @@
size="small" size="small"
:validate-on-rule-change="false" :validate-on-rule-change="false"
> >
<c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000047 --> <!--PD000047 -->
<el-tab-pane label="单据概况" name="litdckp"> <el-tab-pane label="单据概况" name="litdckp">
<c-content> <c-content>
<m-litdckp :model="model" :codes="codes" v-on:changeShowDocpre="changeShowDocpre"/> <m-litdckp
:model="model"
:codes="codes"
v-on:changeShowDocpre="changeShowDocpre"
/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
...@@ -32,10 +35,9 @@ ...@@ -32,10 +35,9 @@
</el-tab-pane> --> </el-tab-pane> -->
<!--PD000062 --> <!--PD000062 -->
<el-tab-pane label="单据详情" name="docpre" v-if="isShowDocpre"> <el-tab-pane label="单据详情" name="docpre" v-if="isShowDocpre">
<m-docpre :model="model" :codes="codes" /> <m-docpre :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000079 --> <!--PD000079 -->
<!-- <el-tab-pane label="Shipping Detail" name="shpdet"> <!-- <el-tab-pane label="Shipping Detail" name="shpdet">
...@@ -48,7 +50,7 @@ ...@@ -48,7 +50,7 @@
<el-tab-pane label="费用及账务" 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>
<!-- <el-tab-pane label="分录" name="glepan"> <!-- <el-tab-pane label="分录" name="glepan">
<m-glepan :model="model" :codes="codes" ref="glepan" /> <m-glepan :model="model" :codes="codes" ref="glepan" />
...@@ -68,11 +70,15 @@ ...@@ -68,11 +70,15 @@
<el-tab-pane label="授信额度" name="limitbody"> <el-tab-pane label="授信额度" name="limitbody">
<m-limitbody :model="model" :codes="codes" /> <m-limitbody :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<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>
</div> </div>
</c-page> </c-page>
</template> </template>
...@@ -123,57 +129,46 @@ export default { ...@@ -123,57 +129,46 @@ export default {
mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理 mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
isShowDocpre:false, isShowDocpre: false,
tabVal: "litdckp", tabVal: "litdckp",
trnName: "ditdck", trnName: "ditdck",
model: new Ditdck().data, model: new Ditdck().data,
// checkRules: Check, checkRules: Check,
defaultRules: Default, defaultRules: Default,
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { ...CodeTable, codes: { ...CodeTable, invtypCodes: [{ label: "type1", value: "1" }] },
invtypCodes:[
{ label: "type1", value: "1" }
], },
}; };
}, },
methods: { methods: {
changeShowDocpre(val) {
this.isShowDocpre = val;
},
}, },
created: async function () { created: async function () {
console.log("进入ditdck交易"); console.log("进入ditdck交易");
let rtnmsg = await this.init(this.$route.query) let rtnmsg = await this.init(this.$route.query);
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ //TODO 处理数据逻辑
//TODO 处理数据逻辑 console.log(rtnmsg);
console.log(rtnmsg) debugger;
Utils.copyValueFromVO(this.model,rtnmsg.data) Utils.copyValueFromVO(this.model, rtnmsg.data);
console.log(this.model); console.log(this.model);
if(this.isInDisplay){ if (this.isInDisplay) {
this.restoreDisplay() this.restoreDisplay();
} }
}
if(this.model.bddgrp.rec.dscinsflg == "X"){ };
this.isShowDocpre = true; if (this.model.bddgrp.rec.dscinsflg == "X") {
} this.isShowDocpre = true;
else } else {
{ this.$notify.error({ title: "错误", message: "服务请求失败!" });
this.$notify.error({title: '错误',message: '服务请求失败！'});
} }
// console.log("进入ditdck交易");
// let rtnmsg = await this.init({});
// if (rtnmsg.respCode == SUCCESS) {
// Utils.copyValueFromVO(this.model, rtnmsg.data);
// } else {
// this.$notify.error({ title: "错误", message: "服务请求失败！" });
// }
}, },
methods: {
changeShowDocpre(val) {
this.isShowDocpre = val
}
}
}; };
</script> </script>
<style> <style>
......
src/views/Business/Infbdd/Infsea.vue
...@@ -240,12 +240,44 @@ ...@@ -240,12 +240,44 @@
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <!-- <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
> >
详情 详情
</c-button> </c-button> -->
<el-popover
placement="top-start"
title="历史信息"
width="800"
trigger="click"
>
<c-istream-table
:list="trnData.data"
:columns="trnData.columns"
>
<el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="display(scope.$index, scope.row)"
>
查看详情
</c-button>
</template>
</el-table-column>
</c-istream-table>
<c-button
style="margin-left: 0"
size="small"
@click="getTrnInfo(scope.$index, scope.row)"
slot="reference"
>
详情
</c-button>
</el-popover>
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
...@@ -293,6 +325,17 @@ export default { ...@@ -293,6 +325,17 @@ export default {
return { return {
ownref:"", ownref:"",
initdialog:false, initdialog:false,
trnData: {
columns: [
'1 1 "编号" 200',
'2 2 "交易名称" 100',
'3 3 "日期" 200',
'4 4 "状态" 50',
'5 5 "币种" 80',
'6 6 "金额" 80',
],
data: [],
},
stmData: { stmData: {
columns: [ columns: [
'1 1 "Reference" 140 ', '1 1 "Reference" 140 ',
...@@ -333,7 +376,21 @@ export default { ...@@ -333,7 +376,21 @@ export default {
//跳转交易 //跳转交易
this.$router.history.push("/business/" + code) this.$router.history.push("/business/" + code)
this.initdialog = false this.initdialog = false
} },
async getTrnInfo(idx, row) {
debugger;
this.model.infcon.objinr = row["INR"];
this.model.didgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
}
},
}, },
created: function () {}, created: function () {},
}; };
......
src/views/Business/Infdid/Infsea.vue
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
<!-- <el-row> --> <!-- <el-row> -->
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column fixed="right" prop="op" label="操作" width="200px"> <el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align: left" <c-col :span="11" style="text-align: left"
><span>操作</span></c-col ><span>操作</span></c-col
...@@ -322,15 +322,14 @@ ...@@ -322,15 +322,14 @@
:list="trnData.data" :list="trnData.data"
:columns="trnData.columns" :columns="trnData.columns"
> >
<el-table-column prop="op" label="操作" width="110"> <el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
@click="display(scope.$index, scope.row)" @click="display(scope.$index, scope.row)"
> >
查看详情 详情
</c-button> </c-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -591,14 +590,12 @@ export default { ...@@ -591,14 +590,12 @@ export default {
dialogTableVisible: false, dialogTableVisible: false,
trnData: { trnData: {
columns: [ columns: [
'1 1 "编号" 0', '1 1 "编号" 200',
'2 2 "交易名称" 0', '2 2 "交易名称" 100',
'3 3 "日期" 0', '3 3 "日期" 200',
'4 4 "状态" 0', '4 4 "状态" 50',
'5 5 "币种" 0', '5 5 "币种" 80',
'6 6 "金额" 0', '6 6 "金额" 80',
'7 7 "Relres" 0',
'0 8 "Inr" 0',
], ],
data: [], data: [],
}, },
......
src/views/Business/Sptsel/index.vue
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data) that.model = Utils.copyValueFromVO(that.model, res.data)
// that.$refs.Menu.stmData.columns = res.data.sptstm.rows; // that.$refs.Menu.stmData.columns = res.data.sptstm.rows;
this.$refs.Menu.handleSearch() this.$refs.Menu.handleSearch();
}) })
} }
} }
......
src/views/Business/Trnrel/Trnfnd/Inftrnps.vue
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="small" size="small"
@click="handleSearch" @click="trnfndhandleSearch"
>查询</el-button >查询</el-button
> >
</c-col> </c-col>
......
src/views/TaskList/index.vue
...@@ -3,27 +3,33 @@ ...@@ -3,27 +3,33 @@
<c-tabs :value="tabVal" type="card" @tab-click="tabClick"> <c-tabs :value="tabVal" type="card" @tab-click="tabClick">
<el-tab-pane label="待经办列表" name="sptsel"> <el-tab-pane label="待经办列表" name="sptsel">
<!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> --> <!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> -->
<c-content :height="160">
<span slot="label"> <span slot="label">
待经办列表 待经办列表
<el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/> <el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/>
</span> </span>
<c-content :height="120">
<t-sptsel /> <t-sptsel />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待复核列表" name="trnrel"> <el-tab-pane label="待复核列表" name="trnrel">
<c-content :height="160">
<span slot="label"> <span slot="label">
待复核列表 待复核列表
<el-badge v-if="$store.state.Status.taskList.trnrel>0" :value="$store.state.Status.taskList.trnrel" :max="99"/> <el-badge v-if="$store.state.Status.taskList.trnrel>0" :value="$store.state.Status.taskList.trnrel" :max="99"/>
</span> </span>
<c-content :height="120">
<t-trnrel /> <t-trnrel />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已完成列表" name="trnfnd"> <el-tab-pane label="已完成列表" name="trnfnd">
<span slot="label">
已完成列表
<el-badge v-if="$store.state.Status.taskList.trnfnd>0" :value="$store.state.Status.taskList.trnfnd" :max="99"/>
</span>
<c-content :height="120">
<t-trnfnd /> <t-trnfnd />
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待申报列表" name="bopsel"> <el-tab-pane label="待申报列表" name="bopsel">
<t-bopsel /> <t-bopsel />
...@@ -36,7 +42,11 @@ ...@@ -36,7 +42,11 @@
<t-sptbrk /> <t-sptbrk />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="到期提示" name="diasel"> <el-tab-pane label="到期提示" name="diasel">
<c-content :height="160"> <span slot="label">
到期提示
<el-badge v-if="$store.state.Status.taskList.diasel>0" :value="$store.state.Status.taskList.diasel" :max="99"/>
</span>
<c-content :height="120">
<t-diasel/> <t-diasel/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
......
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