Skip to content

V
vue-gjjs
Commit bb42a82c by wangren
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 4989c51e a04d7647
Showing with 173 additions and 90 deletions
src/components/IntellectIcon.vue
<template>
<!--
<c-col :span="24">
<el-row>
<el-col :span="spanVal" v-for="(item, idx) in displayIconList" :key="idx" :offset="1">
......@@ -34,6 +35,44 @@
</div>
</el-dialog>
</c-col>
-->
<c-col :span="24">
<el-row>
<el-col :span="spanVal" v-for="(item, idx) in displayIconList" :key="idx" :offset="1">
<el-card :body-style="{ padding: '0px' }" style="height:100%">
<!-- <img :src="item.src" class="image"> -->
<div style="padding: 5px;">
<span style="text-align:center;font-size:5px">{{item.name}}</span>
<el-button type="text" class="button" icon="el-icon-delete" @click="DeleteIcon(item.id)"></el-button>
</div>
</el-card>
</el-col>
<el-col :span="2" :offset="1">
<el-card :body-style="{ padding: '5px' }">
<!-- <img :src="require('~/assets/add.png')" class="image" @click="AddIcon"> -->
<!-- <span style="text-align:center;font-size:5px">添加</span> -->
<el-button type="text" class="button" icon="el-icon-plus" @click="AddIcon"></el-button>
</el-card>
</el-col>
</el-row>
<el-dialog :visible.sync="IconDialog" :title="'单据列表'">
<div style="height:200px">
<el-col :span="14">
<el-col :span="spanVal" v-for="(item, idx) in hideIconList" :key="idx" :offset="1">
<el-card :body-style="{ padding: '0px' }" style="height:100%">
<!-- <img :src="item.src" class="image"> -->
<div style="padding: 5px;">
<span style="text-align:center;font-size:5px">{{item.name}}</span>
<el-button type="text" class="button" icon="el-icon-plus" @click="InsertIcon(item.id)"></el-button>
</div>
</el-card>
</el-col>
</el-col>
</div>
</el-dialog>
</c-col>
</template>
......
src/views/Business/Ditdck/Docpre.vue
<template>
<div class="eibs-tab">
<!-- =================左边====================== -->
<c-col :span="11">
<c-col :span="12">
<el-form-item label="不符点">
<c-col :span="21">
<c-input
......@@ -54,7 +54,7 @@
</c-col>
<!-- =================右边====================== -->
<c-col :span="11" :offset="1">
<c-col :span="12">
<c-col :span="24">
<el-form-item label="" prop="bddgrp.rec.igndisflg">
<c-checkbox v-model="model.bddgrp.rec.igndisflg"
......@@ -132,6 +132,9 @@
<!-- =================已交单据====================== -->
<c-col :span="24">
<el-button slot="reference" style="float:right" @click="addDocgrdDataStore">添加</el-button>
</c-col>
<c-col :span="24">
<!-- :list="model.bdtp.docgrdm.docgrd" -->
<c-table
:border="true"
......@@ -219,7 +222,7 @@
<el-dialog :visible.sync="InsertErrorDialogVisibal" center width="500px">
<c-col :span="24">
<c-col :span="20">
<el-form-item label="错误信息" label-width="100px">
<el-form-item label="不符点" label-width="100px">
<c-input v-model="newInsertError"></c-input>
</el-form-item>
</c-col>
......@@ -322,22 +325,22 @@ export default {
},
]
},
{
name:"KZ3500220597AA-003.pdf",
errorData:[
{
discribe:"货物数量有误",
state:true
},
]
},
// {
// name:"KZ3500220597AA-003.pdf",
// errorData:[
// {
// discribe:"货物数量有误",
// state:true
// },
// ]
// },
],
},
{
id:"oceanShipping",
data:[
{
name:"KZ3500220597AA-004.pdf",
name:"KZ3500220597AA-003.pdf",
errorData:[
]
},
......@@ -460,13 +463,13 @@ export default {
if(this.selectPDFData.length > 0){
const arr = []
for(let i = 0; i < this.gridData.length; i++){
if(this.gridData[i].id == this.selectPDFData){
// if(this.gridData[i].id == this.selectPDFData){
// arr.push({"id" : this.gridData[i].id});
for(let j = 0; j < this.gridData[i].data.length; j++){
arr.push({"name" : this.gridData[i].data[j].name});
}
break;
}
// break;
// }
}
this.gridPDFData = arr;
}
......
src/views/Business/Ditopn/Tk.vue
......@@ -8,31 +8,31 @@
<c-col :span="16">
<c-col :span="24">
<el-form-item label="货物描述" prop="didgrp.blk.lcrgod">
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.lcrgod" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.lcrgod" style="margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="单据要求" prop="didgrp.blk.lcrdoc">
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.lcrdoc" maxlength="1950" style="width:70%;margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.lcrdoc" maxlength="1950" style="margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="附加条款" prop="didgrp.blk.adlcnd">
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入附加条款" ></c-input>
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.adlcnd" style="margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入附加条款" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="给付款、承兑、议付行的指示" prop="didgrp.blk.insbnk">
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="325" show-word-limit placeholder="请输入付行的指示" ></c-input>
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.insbnk" style="margin-right:20px;" maxlength="325" show-word-limit placeholder="请输入付行的指示" ></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="8">
<IntellectIcon :IconList="IconList" :span="spanVal" v-on:deleteIcon="deleteIcon" v-on:insertIcon="insertIcon"></IntellectIcon>
<c-col :span="7" :offset="1">
<IntellectIcon :IconList="IconList" :spanVal="spanVal" v-on:deleteIcon="deleteIcon" v-on:insertIcon="insertIcon"></IntellectIcon>
</c-col>
<!-- <c-col :span="8">
<el-row>
......@@ -116,7 +116,7 @@ export default {
IconList:[
"invoice","receipt",
],
spanVal:4,
spanVal:5,
}
},
methods:{
......@@ -141,8 +141,11 @@ export default {
}
},
created:function(){
var IconList = JSON.parse(sessionStorage.getItem("IconList"));
if(IconList == null){
sessionStorage.setItem('IconList', JSON.stringify(this.IconList));
}
}
}
</script>
<style>
......
src/views/Business/Mgrtsk/Tskmgr.vue
<template>
<div class="eibs-tab">
<c-col :span="24" style="text-align: right">
<c-button
size="small"
type="primary"
style="margin-left: 0"
:disabled="buttonFlag"
@click="Update"
>Update</c-button
>
<c-button
size="small"
type="primary"
style="margin-left: 0"
:disabled="buttonFlag"
@click="Start"
>Start</c-button
>
<c-button
<el-form
ref="paramsForm"
label-position="right"
label-width="110px"
size="small"
type="primary"
style="margin-left: 0"
:disabled="!buttonFlag"
@click="Stop"
>Stop</c-button
>
</c-col>
<c-col :span="24" style="margin-top: 10px">
<!-- ================左=============== -->
<!-- <c-col :span="11">
<c-col>(Services see 2nd Tab)</c-col>
<c-col>Running in foreground</c-col>
<c-col :span="12" :offset="12" style="margin-top: 105px">
<el-form-item label="Ref No" prop="wfetsk.refno" label-width="50px">
<c-input
v-model="model.wfetsk.refno"
placeholder="请输入"
></c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="12">
<c-col :span="8">
<c-col :span="24">
<el-form-item
label="Start Processing"
prop="wfetsk.tsklist.strflg"
style="width: 100%"
>
<c-select
v-model="model.wfetsk.tsklist.strflg"
......@@ -64,33 +32,57 @@
</c-col>
<c-col :span="24">
<el-form-item label="Ref No" prop="wfetsk.refno">
<el-form-item
label="Ref No"
prop="wfetsk.refno"
style="width: 100%"
>
<c-input
v-model="model.wfetsk.refno"
placeholder="请输入"
></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- ================中=============== -->
<c-col :span="8">
<c-col :span="24"
><el-form-item
label="Initialization File"
prop="wfetsk.tsklist.ininam"
style="width: 100%"
>
<c-input
v-model="model.wfetsk.tsklist.ininam"
placeholder=""
style="width: 100%"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="Restart Period"
prop="wfetsk.tsklist.redotime"
style="width: 100%"
>
<c-input
v-model="model.wfetsk.tsklist.redotime"
placeholder="请输入Redotime"
style="width: 100%"
></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- ================右=============== -->
<c-col :span="12">
<c-col :span="8">
<c-col :span="14">
<el-form-item
label="Started"
prop="wfetsk.tsklist.jobstrdat"
style="width: 100%"
>
<c-date-picker
type="date"
......@@ -106,20 +98,27 @@
label="h"
prop="wfetsk.tsklist.jobstrtimhh"
label-width="20px"
style="width: 100%"
>
<c-input
v-model="model.wfetsk.tsklist.jobstrtimhh"
disabled
placeholder="请输入"
style="width: 100%"
></c-input>
</el-form-item>
</c-col>
<c-col :span="4" :offset="1">
<el-form-item label="min" label-width="20px">
<el-form-item
label="min"
label-width="20px"
style="width: 100%"
>
<c-input
v-model="model.wfetsk.tsklist.jobstrtimmm"
placeholder="请输入"
disabled
style="width: 100%"
></c-input>
</el-form-item>
</c-col>
......@@ -128,6 +127,7 @@
<el-form-item
label="Termination"
prop="wfetsk.tsklist.terflg"
style="width: 100%"
>
<c-select
v-model="model.wfetsk.tsklist.terflg"
......@@ -167,6 +167,39 @@
></c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<c-col :span="24" style="text-align: right">
<c-button
size="small"
type="primary"
style="margin-left: 0"
:disabled="buttonFlag"
@click="Update"
>Update</c-button
>
<c-button
size="small"
type="primary"
style="margin-left: 0"
:disabled="buttonFlag"
@click="Start"
>Start</c-button
>
<c-button
size="small"
type="primary"
style="margin-left: 0"
:disabled="!buttonFlag"
@click="Stop"
>Stop</c-button
>
</c-col>
</el-form>
<c-col :span="24" style="margin-top:12px">
<div style="border-bottom: 10px solid rgb(232, 232, 232)"></div>
</c-col>
<!-- <c-col :span="16">
<span
......@@ -176,21 +209,6 @@
Initialization File
</span>
</c-col> -->
<c-col :span="24">
<el-form-item
label="Restart Period"
prop="wfetsk.tsklist.redotime"
>
<c-input
v-model="model.wfetsk.tsklist.redotime"
placeholder="请输入Redotime"
></c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Automatic Start Flag" prop="wfetsk.tsklist.strflg">
<c-select
......@@ -300,8 +318,8 @@
<el-button
size="mini"
type="primary"
:disabled = "buttonFlag"
@click="Entry(scope.row.index, scope.row)"
:disabled="buttonFlag"
@click="Entry(scope.$index, scope.row)"
>Entry</el-button
>
</template>
......@@ -315,6 +333,7 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Mgrtsk/Event";
import Utils from "~/utils/index";
export default {
inject: ["root"],
......@@ -334,17 +353,32 @@ export default {
],
data: [],
},
buttonFlag:false,
timer: null
buttonFlag: false,
timer: null,
};
},
methods: {
...Event,
Entry() {
let rtnmsg = this.executeRule("wfetsk.tsklist.butexe");
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
Entry(idx, row) {
const selIds = [idx + 1];
const selDst = "wfetsk.wfestm"; //列表对应后台模型中的stream
let params = { selDst, selIds };
this.executeRule("wfetsk.tsklist.butexe", params).then((res) => {
if (res.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, res.data);
} else {
const h = this.$createElement;
const msg = res.respMsg || "请求执行失败!";
this.$notify.error({
title: "错误",
message: h(
"p",
{ style: "word-break:break-all;" },
msg
),
});
}
});
},
Update() {
let rtnmsg = this.executeRule("wfetsk.tsklist.butupd");
......@@ -361,7 +395,7 @@ export default {
//定时任务
var timeVal = this.model.wfetsk.tsklist.redotime * 1000;
var that = this;
this.timer = setInterval(function(){
this.timer = setInterval(function () {
let rtnmsg = that.executeRule("wfetsk.tsklist.butstr");
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -385,5 +419,8 @@ export default {
},
};
</script>
<style>
<style scope>
/* .m-table-search-form .el-form-item__content {
width: calc(100% - 110px);
} */
</style>
src/views/Layout/SideMenu.vue
......@@ -128,8 +128,9 @@ export default {
{inifrm:"gitsel",ininam:"进口保函查询",pntmiu:"13"},
{inifrm:"gitset",ininam:"进口保函赔付",pntmiu:"13"},
{inifrm:"gitcrq",ininam:"进口保函索赔登记",pntmiu:"13"},
{ inifrm: "14",ininam: "Switsk", pntmiu: "" },
{ inifrm: "14",ininam: "服务管理", pntmiu: "" },
{ inifrm: "switsk", ininam: "Switsk", pntmiu: "14" },
{ inifrm: "mgrtsk", ininam: "Mgrtsk", pntmiu: "14" },
],
menus: [],
menusHeight: 0
......
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