Skip to content

V
vue-gjjs
Commit e502893d by denyu
Options

Merge remote-tracking branch 'origin/master'

parents 473e98c2 9ffa5e63
Showing with 150 additions and 35 deletions
src/config/CodeTable/index.js
......@@ -5699,10 +5699,10 @@ const CodeTable = {
{label:"simple letter",value:"LET" },
{label:"by Airmail",value:"LETAML" },
{label:"by Courier",value:"LETCOU" },
{label:"DHL中外运",value:"LETDHC" },
{label:"DHL敦豪",value:"LETDHL" },
{label:"EMS",value:"LETEMS" },
{label:"send as MT999",value:"SWT999" },
// {label:"DHL中外运",value:"LETDHC" },
// {label:"DHL敦豪",value:"LETDHL" },
// {label:"EMS",value:"LETEMS" },
// {label:"send as MT999",value:"SWT999" },
],
litameadv:[
{label:"无特殊规定",value:"1" },
......
src/model/Ditopn/Event.js
......@@ -336,15 +336,15 @@ export default {
}
else if(cortyp == 'ELC')
{
Modal.info({title:'电证报文',content:<div style={{height:400,overflow:'auto'}}><ELCMessage mty={row.id} message={rtnmsg.data["\\trnmod\\trndoc\\docinf"]}/></div>,
width:1000,
Modal.info({title:'电证报文',content:<div style={{height:400,overflow:'auto'}}><ELCMessage mty={row.id} message={rtnmsg.data["\\trnmod\\trndoc\\docinf"]}/></div>,
width:1000,
})
})
}
else {
// let url = rtnmsg.data.trnmod_trndoc_smh_docpth;
this.title = "面函"
let viewurl = "/#/docpan";
let viewurl = "/#/docpan/show";
viewurl += "?model="+rtnmsg.data.litbenl1blk;
console.log(viewurl)
window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
......@@ -356,10 +356,13 @@ export default {
}
},
async handleDetail(index, row){
let rtnmsg = await Api.post("ditopn/executeRule/trnmod.trndoc.doccur.butadd", Utils.flatObject(this.model))
const params = {
index: index
}
let rtnmsg = await Api.post("ditopn/executeDocpanDetail/trnmod.trndoc.doccur.butadd", { ...Utils.flatObject(this.model), params })
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
let viewurl ="/#/public/"+doc.vue;
let viewurl ="/#/docpan/detail";
window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
},
......
src/routers/index.js
......@@ -5,7 +5,7 @@ import Display from "../views/Display"
import Login from "../views/Login"
import Layout from "../views/Layout"
import BusRouter from '../views/Business/BusRouter'
import Docpan from "../views/Docpan"
import DocRouter from '../views/Docpan/DocRouter'
Vue.use(VueRouter)
......@@ -15,7 +15,7 @@ const rootRouter = new VueRouter({
{path:"/display",component:Display,children:BusRouter},
{path:"/login",component:Login},
{path:"/business",component:Layout,children:BusRouter},
{path:"/docpan",component:Docpan}
{path:"/docpan",component: () => import('../views/Docpan'), children:DocRouter}
]
})
......
src/views/Business/Ditopn/index.vue
......@@ -199,7 +199,14 @@ export default {
this.executeRule("trnmod.trndoc.docpan").then(res => {
const data = res.data;
Utils.copyValueFromVO(this.model, data)
this.$refs.docpan.stmData.data = res.data.trnmod_trndoc_doceot
var stm = [];
let k = 0;
for(let i = 0; i < res.data.trnmod_trndoc_doceot.length; i++){
if(res.data.trnmod_trndoc_doceot[i].role != ""){
stm[k++] = res.data.trnmod_trndoc_doceot[i];
}
}
this.$refs.docpan.stmData.data = stm
})
}
}
......
src/views/Docpan/Detail.vue 0 → 100644
<template>
<div>
<!-- <el-form>
<el-col :span="12">
<el-form-item label="Per Medium">
<c-select v-model="model.didgrp.rec.avbby" style="width:100%" placeholder="请选择">
<el-option v-for="item in codes.avbby0" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="Send Message to" prop="">
<c-input v-model="model.didgrp.rec.tenmaxday" :readnoly=true placeholder="请输入"></c-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="Form Set" prop="">
<c-input v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-form-item>
<el-col :span="24">
<el-col :span="16">
<c-input v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-col>
<el-col :span="4">
<c-input style="margin-left:20px" v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-col>
</el-col>
<el-col :span="24">
<el-col :span="16">
<c-input v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-col>
<el-col :span="4">
<c-input style="margin-left:20px" v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-col>
</el-col>
<el-col :span="24">
<el-col :span="16">
<c-input v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-col>
<el-col :span="4">
<c-input style="margin-left:20px" v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-col>
</el-col>
<el-col :span="24">
<el-col :span="16">
<c-input v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-col>
<el-col :span="4">
<c-input style="margin-left:20px" v-model="model.didgrp.rec.tenmaxday" placeholder="请输入"></c-input>
</el-col>
</el-col>
</el-col>
</el-form> -->
</div>
</template>
<script>
import CodeTable from "~/config/CodeTable"
import Ditopn from "~/model/Ditopn"
export default {
data(){
return {
model:new Ditopn().data,
codes:{
avbby0:CodeTable.avbby0,
},
}
},
// methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
src/views/Docpan/DocRouter.js 0 → 100644
import Show from "./Show"
import Detail from "./Detail"
const BusRouter = [
{path:'show',component:Show},
{path:'detail',component:Detail},
]
export default BusRouter
\ No newline at end of file
src/views/Docpan/Show.vue 0 → 100644
<template>
<div>
<div class="title">面函列表</div>
<div>
<c-input
type="textarea"
:autosize="{ minRows: 16}"
placeholder="请输入原因"
v-model="model">
</c-input>
</div>
</div>
</template>
<script>
import Api from "~/service/Api"
import Utils from "~/utils"
export default {
data(){
return {
model: this.$route.query.model,
}
},
mounted() {
console.log(this.$router);
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/Docpan/index.vue
<template>
<div>
<div class="title">面函列表</div>
<div>
<c-input
type="textarea"
:autosize="{ minRows: 16, maxRows: 32}"
placeholder="请输入原因"
v-model="model">
</c-input>
</div>
<div id="docpan_container">
<router-view></router-view>
</div>
</template>
<script>
import Api from "~/service/Api"
import Utils from "~/utils"
export default {
data(){
return {
model: this.$route.query.model,
}
},
mounted() {
console.log(this.$router);
}
}
</script>
<style scoped>
<style>
#docpan_container{
width: 100%;
height: 100%;
}
</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