Skip to content

V
vue-gjjs
Commit b32e93bd by wangren
Options

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

# Conflicts:
#	src/views/Business/BusRouter.js
parents 14f7740f d47fbca0
Showing with 135 additions and 192 deletions
public/favicon.ico
No preview for this file type
src/assets/logo.png
src/assets/logo.png

9.34 KB | W: | H:

src/assets/logo.png

74.7 KB | W: | H:

src/assets/logo.png
src/assets/logo.png
src/assets/logo.png
src/assets/logo.png
  • 2-up
  • Swipe
  • Onion skin
src/mixin/commonApi.js
import Vue from "vue"
import Api from "~/service/Api"
import { display } from "~/service/business/file"
import { getTrnNameByInr } from "~/service/business/common"
import Utils from "../utils"
export default {
......@@ -149,5 +150,18 @@ export default {
}
return rtnmsg
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
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');
}
});
}
}
}
\ No newline at end of file
src/model/Infbdd/Event.js
......@@ -139,15 +139,5 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
display(index, row) {
debugger;
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
}
\ No newline at end of file
src/model/Infbed/Event.js
......@@ -144,15 +144,5 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
display(index, row) {
debugger;
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
}
\ No newline at end of file
src/model/Infbfd/Event.js
......@@ -110,15 +110,4 @@ export default {
}
},
display (index, row) {
debugger;
Api.post("getTrnNameByInr", { inr: row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
}
\ No newline at end of file
src/model/Infcpd/Event.js
......@@ -29,15 +29,6 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
display(index, row) {
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
async onInfbutUserow(){
let rtnmsg = await this.executeRule("infbut.userow")
if(rtnmsg.respCode == SUCCESS)
......
src/model/Infdet/Event.js
......@@ -199,15 +199,4 @@ export default {
}
},
display (index, row) {
debugger;
Api.post("getTrnNameByInr", { inr: row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
}
\ No newline at end of file
src/model/Infdid/Event.js
......@@ -197,15 +197,5 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
display(index, row) {
debugger;
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
}
\ No newline at end of file
src/model/Infled/Event.js
......@@ -362,16 +362,6 @@ export default {
// this.$notify.error({title: '错误',message: '服务请求失败！'});
// }
// },
getDetails(index, row) {
debugger;
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
}
\ No newline at end of file
src/model/Infltd/Event.js
......@@ -90,17 +90,6 @@ export default {
// this.$notify.error({ title: '错误', message: '服务请求失败！' });
// }
},
display(index, row) {
debugger;
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
async onInfbutDsp(row) {
let rtnmsg = await this.executeRule("infbut.dsp")
if (rtnmsg.respCode == SUCCESS) {
......
src/model/Trnrel/Event.js
......@@ -381,12 +381,6 @@ export default {
onSeainf() {
},
// display(index, row) {
// const d = this.stmData.data[index]
// const ds = d.split("\t")
// let viewurl = "/#/display/" + ds['10'].toLowerCase() + "?trn=" + ds['1']
// window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
// },
async handleSearch() {
const that = this.root;
// if (this.model.searchAllUsers) {
......
src/model/Trnrel/index.js
......@@ -91,6 +91,7 @@ export default class Trnrel {
exedat: "", // Execution Date .trn.exedat
inftxt: "", // Infotext .trn.inftxt
infdsp: "", // Infoflag .trn.infdsp
inifrm: "",
},
wfmmod: {
wfs: {
......
src/service/business/common.js 0 → 100644
import Api from "~/service/Api"
export function getTrnNameByInr(data) {
return Api.post('/business/getTrnNameByInr', data)
}
\ No newline at end of file
src/service/business/file.js
import Api from "~/service/Api"
export function display(inr, data) {
return Api.post(`/business/display/${inr}`, data)
export function display(inr) {
return Api.post(`/business/display/${inr}`)
}
export function getPdf(data) {
......
src/utils/publicFun.js
......@@ -3,15 +3,20 @@
* UUID
*/
export function getUUID() {
var s = [];
var hexDigits = "0123456789abcdef";
for(var i=0;i<36;i++){
s[i] = hexDigits.substr(Math.floor(Math.random()*0x10),1);
}
s[14] = "4";
s[19] = hexDigits.substr((s[19] & 0x3) | 0x8,1);
s[8] = s[13] = s[18] = s[23] = "";
var PubFun = {
getUUID:function() {
var s = [];
var hexDigits = "0123456789abcdef";
for(var i=0;i<36;i++){
s[i] = hexDigits.substr(Math.floor(Math.random()*0x10),1);
}
s[14] = "4";
s[19] = hexDigits.substr((s[19] & 0x3) | 0x8,1);
s[8] = s[13] = s[18] = s[23] = "";
return s.join("");
},
return s.join("");
}
export default PubFun;
src/views/Business/Bddsel/Infsea.vue
......@@ -180,7 +180,7 @@
width="100">
<template slot-scope="scope">
<!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>-->
<a href="javascript:void(0)" @click="display(scope.$index, scope.row)">处理</a>
<a href="javascript:void(0)" @click="display(scope.row['INR'])">处理</a>
</template>
</el-table-column>
......
src/views/Business/Ditdck/Docpre.vue
......@@ -132,7 +132,7 @@
<!-- =================已交单据====================== -->
<c-col :span="24">
<el-button style="margin-bottom:5px;float:right" @click="addDocgrdDataStore" type="primary">新增单据</el-button>
<c-button style="margin-bottom:5px;float:right" @click="addDocgrdDataStore" type="primary">新增单据</c-button>
</c-col>
<c-col :span="24">
<!-- :list="model.bdtp.docgrdm.docgrd" -->
......@@ -178,8 +178,8 @@
</el-table-column>
<el-table-column prop="docnam" label="Document" width="auto">
</el-table-column>
<el-table-column prop="state" label="状态" width="auto">
</el-table-column>
<!-- <el-table-column prop="state" label="状态" width="auto">
</el-table-column> -->
<el-table-column label="操作" prop="det" width="170px" fixed="right">
<!-- <template slot="header">
<span>操作</span>
......@@ -205,7 +205,7 @@
style="margin-left:0"
size="small"
type="primary"
@click="openPdfDialog(scope.row.id, scoped.$index)"
@click="openPdfDialog(scoped.row.id, scoped.$index)"
>选择</el-button
>
</template>
......@@ -214,8 +214,8 @@
<div class="file-add" title="导入文件" @click="importFile">
<i class="el-icon-plus"></i>
</div>
<el-button slot="reference" @click="addPDF(scope.row.id)" type="primary">添加</el-button>
<el-button v-if="scope.row.state != '缺失'" slot="reference" @click="detailPDF(scope.row.id)">详情</el-button>
<c-button slot="reference" @click="addPDF(scope.row.id)" type="primary">添加</c-button>
<c-button v-if="scope.row.state != '缺失'" slot="reference" @click="detailPDF(scope.row.id)">详情</c-button>
</el-popover>
</template>
</el-table-column>
......@@ -287,23 +287,23 @@ export default {
docgrdDataStore:[
{
id:"invoice",
cmail1:"发票",
cmail1:"1",
cmail2:"",
docnam:"",
docnam:"发票",
state:"缺失",
},
{
id:"receipt",
cmail1:"货物收据",
cmail1:"1",
cmail2:"",
docnam:"",
docnam:"货物收据",
state:"缺失",
},
{
id:"oceanShipping",
cmail1:"海运提单",
cmail1:"1",
cmail2:"",
docnam:"",
docnam:"海运提单",
state:"缺失",
},
],
......@@ -408,6 +408,9 @@ export default {
this.$refs.ocrRecognition.formData.type = this.$refs.ocrRecognition.fileType[tempId].value;
this.selectedPdf.id = id;
this.selectedPdf.index = idx;
this.$nextTick(() => {
this.$refs.ocrRecognition.fileUrl = require(`~/assets/demo-files/${this.$refs.ocrRecognition.formData.type}.jpg`)
})
},
selectGridPDF(){
const id = this.selectedPdf.id;
......@@ -450,6 +453,7 @@ export default {
}
}
this.docgrdData = tempData;
sessionStorage.setItem('docgrdData', JSON.stringify(this.docgrdData));
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (this.docgrdData[rowIndex].states) {
......@@ -462,6 +466,7 @@ export default {
this.docgrdData.splice(index, 1);
this.docgrdData[index - 1].state = "符合"
}
sessionStorage.setItem('docgrdData', JSON.stringify(this.docgrdData));
},
InsertErrorDialog(index){
this.InsertErrorDialogVisibal = true;
......@@ -475,6 +480,7 @@ export default {
this.docgrdData[this.newInsertErrorIndex].list.push(temp);
this.newInsertError = "";
this.InsertErrorDialogVisibal = false;
sessionStorage.setItem('docgrdData', JSON.stringify(this.docgrdData));
},
addDocgrdDataStore(){
this.InsertGridDataDialogVisibal = true;
......@@ -488,23 +494,32 @@ export default {
this.docgrdData.push(this.dialog);
this.InsertGridDataDialogVisibal = false;
this.newInsertGridData = "";
sessionStorage.setItem('docgrdData', JSON.stringify(this.docgrdData));
}
},
created: function () {
var IconList = JSON.parse(sessionStorage.getItem("IconList"));
if(IconList == null){
IconList = ["invoice","receipt"];
}
var list = [];
for(let i = 0; i < IconList.length; i++){
for(let j = 0; j < this.docgrdDataStore.length; j++){
if(IconList[i] == this.docgrdDataStore[j].id){
list.push(this.docgrdDataStore[j]);
break;
}
}
//docgrdData， gridPDFData
var temp_docgrdData = JSON.parse(sessionStorage.getItem("docgrdData"));
if(temp_docgrdData != null){
var temp_gridPDFData = JSON.parse(sessionStorage.getItem("gridPDFData"));
this.docgrdData = temp_docgrdData;
this.gridPDFData = temp_gridPDFData;
}else{
var IconList = JSON.parse(sessionStorage.getItem("IconList"));
if(IconList == null){
IconList = ["invoice","receipt"];
}
var list = [];
for(let i = 0; i < IconList.length; i++){
for(let j = 0; j < this.docgrdDataStore.length; j++){
if(IconList[i] == this.docgrdDataStore[j].id){
list.push(this.docgrdDataStore[j]);
break;
}
}
}
this.docgrdData = list;
}
this.docgrdData = list;
},
computed:{
},
......@@ -516,12 +531,13 @@ export default {
// 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});
arr.push({"name" : this.gridData[i].data[j].name, "id": this.gridData[i].id });
}
// break;
// }
}
this.gridPDFData = arr;
sessionStorage.setItem('gridPDFData', JSON.stringify(this.gridPDFData));
}
}
}
......
src/views/Business/Infbdd/Infsea.vue
......@@ -265,7 +265,7 @@
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.$index, scope.row)"
@click="display(scope.row['INR'])"
>
详情
</c-button>
......
src/views/Business/Infbed/Infsea.vue
......@@ -196,7 +196,7 @@
style="margin-left: 0"
size="small"
type="primary"
@click="display(scope.$index, scope.row)"
@click="display(scope.row['INR'])"
>
查看详情
</c-button>
......
src/views/Business/Infbfd/Infsea.vue
......@@ -194,7 +194,7 @@
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.$index, scope.row)"
@click="display(scope.row['INR'])"
>
详情
</c-button>
......
src/views/Business/Infbpd/Infsea.vue
......@@ -396,7 +396,7 @@
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.$index, scope.row)"
@click="display(scope.row['INR'])"
>
详情
</c-button>
......
src/views/Business/Infcpd/Infsea.vue
......@@ -365,7 +365,7 @@
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.$index, scope.row)"
@click="display(scope.row['INR'])"
>
详情
</c-button>
......
src/views/Business/Infdet/Infsea.vue
......@@ -567,7 +567,7 @@
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.$index, scope.row)"
@click="display(scope.row['INR'])"
>
详情
</c-button>
......
src/views/Business/Infdid/Infsea.vue
......@@ -331,7 +331,7 @@
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.$index, scope.row)"
@click="display(scope.row['INR'])"
>
详情
</c-button>
......
src/views/Business/Infltd/Infsea.vue
......@@ -212,7 +212,7 @@
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.$index, scope.row)"
@click="display(scope.row['INR'])"
>
详情
</c-button>
......
src/views/Business/Notice/Infsea.vue
<template>
<div class="eibs-tab">
<el-form
class="m-table-search-form"
ref="paramsForm"
......@@ -13,14 +14,14 @@
<c-col :span="24">
<c-col :span="8">
<el-form-item
label="标题"
label="公告标题"
prop="theme"
style="width: 100%"
>
<c-input
v-model="model.theme"
maxlength="50"
placeholder="请输入公告标题"
maxlength="20"
placeholder="请输入标题名称"
></c-input>
</el-form-item>
</c-col>
......@@ -62,6 +63,8 @@
</c-col>
</c-col>
</c-row>
<!-- </template> -->
<c-col
:span="24"
......@@ -83,9 +86,9 @@
</c-col>
<c-col style="margin-top: 10px">
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0 ; float :right" @click="ruleAdd()"
>+添加公告</c-button
<c-col :span="24" style="margin:10px 0px" >
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px " @click="ruleAdd()"
>添加公告</c-button
>
</c-col>
......@@ -309,7 +312,7 @@ export default {
nowDate:'',
currentPage: 1, //初始页
pagesize: 2, // 每页的数据
pagesize: 6, // 每页的数据
total: 0,
......
src/views/Business/Notice/index.vue
<template>
<c-page title="通知公告">
<div class="eContainer">
<div class="eContainer" style="height:90%">
<div style="padding:0 15px">
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="160px"
label-width="110px"
size="small"
label-position="left"
label-position="right"
:validate-on-rule-change="false"
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<c-content>
<m-infsea :model="model" :codes="codes" ref="infsea"/>
</c-content>
<!-- <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
<!-- PD000001 -->
<el-tab-pane
<!-- <el-tab-pane -->
label="信息查询" name="infsea">
<c-content>
<!-- label="信息查询" name="infsea" -->
<!-- <c-content>
<m-infsea :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
</c-content> -->
<!-- </el-tab-pane> -->
</c-tabs>
<!-- </c-tabs> -->
</el-form>
</div>
<!-- <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog> -->
</div>
......@@ -95,6 +101,7 @@ export default {
rules: null,
codes: {
},
showPanel:false,
}
},
methods:{
......
src/views/Business/Trnrel/InftrnpsDetail.vue
......@@ -32,7 +32,7 @@
</el-form-item>
</c-col>
<c-col :span="11" style="text-align:right;">
<c-button size="small" type="primary" style="margin-left:0" @click="display">交易快照</c-button>
<c-button size="small" type="primary" style="margin-left:0" @click="display(model.trn.inr)">交易快照</c-button>
<c-button size="small" type="primary" style="margin-left:0">智能提示</c-button>
<c-button size="small" @click="exit" type="primary" style="margin-left:0">返回</c-button>
</c-col>
......@@ -481,17 +481,6 @@ export default {
this.$store.dispatch("TagsView/delView", this.$route)
this.$router.history.push("/taskList");
},
display() {
debugger
const inr = this.model.trn.inr;
Api.post("getTrnNameByInr", { inr: inr}).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
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');
}
});
},
async show(idx,row){
var params = {selDst:"recpan.smhstm",selIds:[idx+1],selBtnId:"A"}
let rtnmsg = await Api.post(`/business/trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
......@@ -32,7 +32,7 @@
</el-form-item>
</c-col>
<c-col :span="11" style="text-align:right;">
<c-button size="small" type="primary" style="margin-left:0" @click="display">交易快照</c-button>
<c-button size="small" type="primary" style="margin-left:0" @click="display(model.trn.inr)">交易快照</c-button>
<c-button size="small" type="primary" style="margin-left:0">智能提示</c-button>
<c-button size="small" @click="exit" type="primary" style="margin-left:0">返回</c-button>
</c-col>
......@@ -479,17 +479,6 @@ export default {
this.$store.dispatch("TagsView/delView", this.$route)
this.$router.history.push("/taskList");
},
display() {
debugger
const inr = this.model.trn.inr;
Api.post("getTrnNameByInr", { inr: inr}).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
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');
}
});
},
async show(idx,row){
var params = {selDst:"recpan.smhstm",selIds:[idx+1],selBtnId:"A"}
let rtnmsg = await Api.post(`/business/trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
......
src/views/Business/index.vue
......@@ -11,6 +11,15 @@
<script>
export default {
name: "Business",
watch: {
$route() {
if (this.$route.path.startsWith("/review")) {
this.$store.commit("setMode", "display");
} else {
this.$store.commit("setMode", "normal");
}
},
},
created: () => {
console.log("进入业务交易界面");
},
......
src/views/Layout/components/TagsView/index.vue
......@@ -71,11 +71,6 @@ export default {
},
watch: {
$route() {
if (this.$route.path.startsWith("/review")) {
this.$store.commit("setMode", "display");
} else {
this.$store.commit("setMode", "normal");
}
this.addTags();
this.moveToCurrentTag();
},
......
src/views/TaskList/index.vue
......@@ -62,6 +62,7 @@
<t-diasel />
</c-content>
</el-tab-pane>
<!--
<el-tab-pane label="数据对比" name="compare">
<span slot="label">
数据对比
......@@ -70,6 +71,7 @@
<t-compare />
</c-content>
</el-tab-pane>
-->
</c-tabs>
</div>
</template>
......
vue.config.js
......@@ -65,8 +65,8 @@ module.exports = {
* ocr智能识别服务
*/
'/ocr/': {
target: 'http://192.168.0.110:5010',
// target: 'http://127.0.0.1:5000',
// target: 'http://192.168.0.110:5010',
target: 'http://127.0.0.1:5000',
changeOrigin: true,
pathRewrite: {
'^/ocr': '/'
......@@ -116,7 +116,7 @@ module.exports = {
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime`
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}])
.end()
......
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