Commit d1588baa by yangxiaolei

增加info模式

parent 431607e4
...@@ -353,6 +353,7 @@ ...@@ -353,6 +353,7 @@
style="margin-left: 5px" style="margin-left: 5px"
size="small" size="small"
type="primary" type="primary"
v-if="!isInfo"
@click="handler(scope.row)" @click="handler(scope.row)"
>处理 >处理
</c-button> </c-button>
...@@ -408,6 +409,16 @@ export default { ...@@ -408,6 +409,16 @@ export default {
props: ["model", "codes"], props: ["model", "codes"],
mixins: [event], mixins: [event],
components: {}, components: {},
computed:{
mode () {
return this.$store.state.Status.mode
},
isInfo: {
get () {
return this.mode === 'info'
}
}
},
data() { data() {
return { return {
inr: "", inr: "",
......
import Api from '~/service/Api'; import Api from '~/service/Api';
import { getTrnNameByInr } from "~/service/business/common"; import { getTrnNameByInr } from "~/service/business/common";
import moment from 'moment'; import moment from 'moment';
import Utils from "~/utils";
export default { export default {
methods: { methods: {
async handleSearch() { async handleSearch() {
...@@ -174,7 +175,8 @@ export default { ...@@ -174,7 +175,8 @@ export default {
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase(); const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no'); const serial = Utils.generateUUID();
window.open(viewurl, serial, 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
} }
}); });
}, },
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<c-col :span="24" style="margin-top: 10px"> <c-col :span="24" style="margin-top: 10px">
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px" title="LITOPN" <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px" title="LITOPN"
@click="toLitopn"> @click="toLitopn" v-if="!isInfo">
进口信用证开立 进口信用证开立
</c-button> </c-button>
</c-col> </c-col>
...@@ -206,6 +206,7 @@ ...@@ -206,6 +206,7 @@
size="small" size="small"
type="primary" type="primary"
@click="handler(scope.row)" @click="handler(scope.row)"
v-if="!isInfo"
>处理 >处理
</c-button> </c-button>
</template> </template>
...@@ -431,6 +432,16 @@ export default { ...@@ -431,6 +432,16 @@ export default {
methods: {}, methods: {},
created: function () { created: function () {
}, },
computed:{
mode () {
return this.$store.state.Status.mode
},
isInfo: {
get () {
return this.mode === 'info'
}
},
}
}; };
</script> </script>
<style scope> <style scope>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
size="small" size="small"
style="margin-left: 10px; padding: 0 10px" style="margin-left: 10px; padding: 0 10px"
type="primary" type="primary"
@click="onInfoView"
> >
<i class="el-icon-info"></i> <i class="el-icon-info"></i>
</c-button> </c-button>
...@@ -563,7 +564,7 @@ ...@@ -563,7 +564,7 @@
import Api from "~/service/Api"; import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import event from '../event' import event from '../event'
import Utils from "~/utils";
export default { export default {
inject: ["root"], inject: ["root"],
props: ["model", "codes"], props: ["model", "codes"],
...@@ -620,7 +621,11 @@ export default { ...@@ -620,7 +621,11 @@ export default {
}, },
}, },
methods: { methods: {
onInfoView(){
let viewurl = "/#/info/infbrd"
const serial = Utils.generateUUID();
window.open(viewurl, serial, 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
}, },
...@@ -630,7 +635,7 @@ export default { ...@@ -630,7 +635,7 @@ export default {
max2cur(){ max2cur(){
this.model.brdgrp.cbs.max2.cur = this.model.brdgrp.cbs.max.cur this.model.brdgrp.cbs.max2.cur = this.model.brdgrp.cbs.max.cur
return this.model.brdgrp.cbs.max2.cur return this.model.brdgrp.cbs.max2.cur
}, }
} }
// dscinsflgChang() { // dscinsflgChang() {
// if (this.model.brdgrp.rec.dscinsflg === "X") { // if (this.model.brdgrp.rec.dscinsflg === "X") {
......
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
style="margin: 0 10px 0 10px; padding: 0 12px; height: 32px" style="margin: 0 10px 0 10px; padding: 0 12px; height: 32px"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" @click="onInfoView"
> >
<i class="el-icon-info"></i>
</c-button> </c-button>
<c-button <c-button
style="margin: 0 0" style="margin: 0 0"
...@@ -605,6 +606,11 @@ export default { ...@@ -605,6 +606,11 @@ export default {
// }); // });
// }, // },
onInfoView(){
let viewurl = "/#/info/inflid"
const serial = Utils.generateUUID();
window.open(viewurl, serial, 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
},
open(val) { open(val) {
if ( if (
val === "" && val === "" &&
...@@ -663,14 +669,28 @@ export default { ...@@ -663,14 +669,28 @@ export default {
} }
} }
}, },
"model.lidgrp.cbs.nom1.cur":{ // "model.lidgrp.cbs.nom1.cur":{
immediate: true, // immediate: true,
handler(val, oldVal) { // handler(val, oldVal) {
if (val == "JPY") { // if (val == "JPY") {
this.model.lidgrp.cbs.nom1.amt = Number(this.model.lidgrp.cbs.nom1.amt) // console.log("this.root=>",this.root)
} // this.model.lidgrp.cbs.nom1.amt = null
} // this.root.rules['lidgrp.cbs.nom1.amt'] = [
}, // { type: 'number', required: true, message: '必输项' }
// ]
// } else {
// this.root.rules['lidgrp.cbs.nom1.amt'] = [
// { type: 'string', required: true, message: '必输项' },
// { max: 18, message: '整数位不能超过15位' },
// {
// pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/,
// message: '小数位不能超过2位',
// }
// ]
// }
// }
// },
"model.lidgrp":{ "model.lidgrp":{
immediate: true, immediate: true,
deep: true, deep: true,
......
<template> <template>
<el-date-picker v-storeModify :id="id" :class="{'highlight': highlight,'redClass':red && isDisable}" v-model="model" v-bind="attrs" v-on="$listeners" v-bind:disabled="isDisable" :value-format="valueFormat" :format="format"></el-date-picker> <el-date-picker v-storeModify :id="id" :class="{'highlight': highlight,'redClass':red && isDisplay}" v-model="model" v-bind="attrs" v-on="$listeners" v-bind:disabled="isDisable" :value-format="valueFormat" :format="format"></el-date-picker>
</template> </template>
<script> <script>
...@@ -78,6 +78,11 @@ export default { ...@@ -78,6 +78,11 @@ export default {
return this.mode === 'display' || this.disabled return this.mode === 'display' || this.disabled
} }
}, },
isDisplay: {
get () {
return this.mode === 'display'
}
},
highlight () { highlight () {
return this.$store.state.Status.highlights.indexOf(this.id) !== -1 return this.$store.state.Status.highlights.indexOf(this.id) !== -1
}, },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-input <el-input
:id="id" :id="id"
v-storeModify v-storeModify
:class="{'redClass':isDisplay && isDisable}" :class="{'redClass':red && isDisplay}"
ref="form-item" ref="form-item"
class="m-input-currency" class="m-input-currency"
v-model="model" v-model="model"
...@@ -50,11 +50,6 @@ export default { ...@@ -50,11 +50,6 @@ export default {
} }
} }
}, },
data(){
return {
red:false
}
},
props: { props: {
value: { value: {
type: [String, Number], type: [String, Number],
...@@ -87,7 +82,8 @@ export default { ...@@ -87,7 +82,8 @@ export default {
}, },
data() { data() {
return { return {
isOnBlur: true isOnBlur: true,
red:false
}; };
}, },
computed: { computed: {
......
<template> <template>
<el-input-number :id="id" v-storeModify :class="{'highlight': highlight,'redClass':red && isDisable}" ref="form-item" v-model="model" :controls="false" v-bind="$attrs" v-on="$listeners" v-bind:disabled="isDisable"/> <el-input-number :id="id" v-storeModify :class="{'highlight': highlight,'redClass':red && isDisplay}" ref="form-item" v-model="model" :controls="false" v-bind="$attrs" v-on="$listeners" v-bind:disabled="isDisable"/>
</template> </template>
<script> <script>
...@@ -72,6 +72,11 @@ export default { ...@@ -72,6 +72,11 @@ export default {
return this.mode === 'display' || this.disabled return this.mode === 'display' || this.disabled
} }
}, },
isDisplay: {
get () {
return this.mode === 'display'
}
},
highlight () { highlight () {
return this.$store.state.Status.highlights.indexOf(this.id) !== -1 return this.$store.state.Status.highlights.indexOf(this.id) !== -1
} }
......
...@@ -2,6 +2,7 @@ import Vue from "vue"; ...@@ -2,6 +2,7 @@ import Vue from "vue";
import VueRouter from "vue-router"; import VueRouter from "vue-router";
import Display from "../views/Display"; import Display from "../views/Display";
import Info from "../views/Info";
import Login from "../views/Login"; import Login from "../views/Login";
import Layout from "../views/Layout"; import Layout from "../views/Layout";
// import BusRouter from "../views/Business/BusRouter"; // import BusRouter from "../views/Business/BusRouter";
...@@ -20,7 +21,11 @@ const DisplayRouter = Business.map(route => { ...@@ -20,7 +21,11 @@ const DisplayRouter = Business.map(route => {
newRoute.name = newRoute.name + 'Display' newRoute.name = newRoute.name + 'Display'
return newRoute; return newRoute;
}) })
const InfoRouter = Business.map(route => {
const newRoute = Object.assign({}, route)
newRoute.name = newRoute.name + 'Info'
return newRoute;
})
/** /**
* Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
* *
...@@ -61,6 +66,7 @@ export const routes = [ ...@@ -61,6 +66,7 @@ export const routes = [
{ path: "/business-new", component: Layout, children: Business }, { path: "/business-new", component: Layout, children: Business },
// { path: "/statics", component: Layout, children: StaticsRouter }, // { path: "/statics", component: Layout, children: StaticsRouter },
{ path: "/display", component: Display, children: DisplayRouter }, { path: "/display", component: Display, children: DisplayRouter },
{ path: "/info", component: Info, children: InfoRouter },
{ path: "/login", component: Login, name: "Login" }, { path: "/login", component: Login, name: "Login" },
{ path: "/docpan", component: () => import("../views/Docpan"), children: DocRouter }, { path: "/docpan", component: () => import("../views/Docpan"), children: DocRouter },
{ path: "/model/viewer",component:ModelViewer}, { path: "/model/viewer",component:ModelViewer},
......
import Api from "~/service/Api" import Api from "~/service/Api"
export function getTrnNameByInr(data) { export function getTrnNameByInr(data) {
return Api.post('/business/getTrnNameByInr', data) return Api.post('/service/trnrel/getTrnNameByInr', data)
} }
\ No newline at end of file
<template>
<div class="info">
<businessContainer></businessContainer>
</div>
</template>
<script>
import businessContainer from "../../business"
import { mapMutations } from 'vuex'
export default {
name: "Info",
components:{
businessContainer //复用业务容器
},
created: function () {
console.log("进入快照界面")
this.setMode('info')
},
destroyed: function () {
this.setMode('normal')
},
methods: {
...mapMutations([
'setMode'
])
}
}
</script>
<style>
</style>
\ No newline at end of file
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