Skip to content

V
vue-gjjs
Commit 49bd435e by wangren
Options

Infpty交易模块

parents 092d68fe ec0a74ca
Showing with 467 additions and 229 deletions
.babelrc deleted 100644 → 0
{
"presets": ["vue-app"],
"plugins": [
["transform-es2015-modules-commonjs", {
"allowTopLevelThis": true
}]
]
}
babel.config.js 0 → 100644
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
]
}
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
"author": "psbc", "author": "psbc",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "webpack-dev-server --inline --hot --env.dev", "start": "vue-cli-service serve",
"build": "rimraf dist && webpack -p --progress --hide-modules" "build": "vue-cli-service build"
}, },
"dependencies": { "dependencies": {
"async-validator": "^3.5.2", "async-validator": "^3.5.2",
"axios": "^0.19.2", "axios": "^0.19.2",
"bignumber.js": "^9.0.1", "bignumber.js": "^9.0.1",
"cluster": "^0.7.7", "cluster": "^0.7.7",
"core-js": "^3.6.4",
"echarts": "^5.2.2", "echarts": "^5.2.2",
"element-ui": "^2.13.2", "element-ui": "^2.13.2",
"es6-promise": "^4.2.8", "es6-promise": "^4.2.8",
...@@ -26,24 +27,18 @@ ...@@ -26,24 +27,18 @@
"vue-draggable-resizable": "^2.2.0" "vue-draggable-resizable": "^2.2.0"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=8.9",
"npm": ">= 3.0.0"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.6.0", "@vue/cli-plugin-babel": "4.4.4",
"babel-core": "^6.24.1", "@vue/cli-service": "4.4.4",
"babel-loader": "^6.4.0", "autoprefixer": "9.5.1",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", "babel-plugin-dynamic-import-node": "2.3.3",
"babel-preset-vue-app": "^1.2.0", "html-webpack-plugin": "3.2.0",
"css-loader": "^0.27.0", "sass": "1.26.2",
"file-loader": "^0.10.1", "sass-loader": "8.0.2",
"html-webpack-plugin": "^2.24.1", "script-ext-html-webpack-plugin": "2.1.3",
"postcss-loader": "^1.3.3", "vue-template-compiler": "^2.6.11"
"rimraf": "^2.5.4",
"style-loader": "^0.13.2",
"url-loader": "^0.5.8",
"vue-loader": "^13.3.0",
"vue-template-compiler": "^2.6.11",
"webpack": "^2.4.1",
"webpack-dev-server": "^2.4.2"
} }
} }
postcss.config.js
module.exports = { module.exports = {
plugins: [ plugins: {
require('autoprefixer')() autoprefixer: {}
] }
} }
src/index.html → public/index.html
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>新押汇系统</title> <title>新押汇系统</title>
<style> <style>
html,body,#app{ html,body,#app{
......
src/components/Cms.vue 0 → 100644
<template>
<div class="cms-container">
<div class="cms-left">
<div class="screenage-list-registered">
<c-table>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="影像名称" prop="imgName" width="auto"></el-table-column>
<el-table-column label="类型名称" prop="type" width="auto"></el-table-column>
<el-table-column label="操作" width="auto">
<template slot-scope="scope">
<div>
<c-button type="primary">删除</c-button>
<c-button type="primary">修改</c-button>
</div>
</template>
</el-table-column>
</c-table>
</div>
<div class="screenage-list-deleted">
<c-table>
<el-table-column label="删除影像" prop="deleteImg" width="auto"></el-table-column>
<el-table-column label="类型名称" prop="type" width="auto"></el-table-column>
<el-table-column label="操作" width="auto">
<template slot-scope="scope">
<div>
<c-button type="primary">恢复</c-button>
<c-button type="primary">清除</c-button>
</div>
</template>
</el-table-column>
</c-table>
</div>
</div>
<div class="cms-center">
<div class="cms-operate-options">
<el-select v-model="selectedType">
<el-option v-for="(item, idx) in typeOptions" :key="idx" :label="item.value + item.label" :value="item.value"></el-option>
</el-select>
<c-button style="margin-left: 15px;" type="primary">扫描/上传</c-button>
<c-button type="primary">取消</c-button>
<c-button type="primary">提交</c-button>
<c-button type="primary">删除</c-button>
<c-button type="primary">重命名</c-button>
</div>
<div class="screenage-content">
<div></div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "Cms",
props: [],
data() {
return {
selectedType: '',
typeOptions: [
{ label: '单据', value: '00' },
{ label: '发票', value: '01' },
{ label: '贸易合同', value: '02' },
{ label: '审查审批', value: '03' },
{ label: '其他', value: '04' },
]
}
},
methods: {
}
};
</script>
<style scoped>
.cms-container {
width: 100%;
height: 100%;
display: flex;
background-color: #f7fbfd;
}
.cms-left {
width: 25%;
display: flex;
flex-direction: column;
background-color: #fff;
}
.cms-left .screenage-list-registered, .cms-left .screenage-list-deleted {
height: 50%;
}
.cms-center {
flex: 1;
display: flex;
flex-direction: column;
padding: 0 10px;
}
.cms-center .screenage-content {
flex: 1;
}
</style>
src/components/IntellectIcon.vue
...@@ -49,10 +49,12 @@ ...@@ -49,10 +49,12 @@
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="2" :offset="1"> <el-col :span="2" :offset="1">
<el-card :body-style="{ padding: '5px' }"> <el-card :body-style="{ padding: '0px' }" style="height:100%">
<div style="padding: 5px;">
<!-- <img :src="require('~/assets/add.png')" class="image" @click="AddIcon"> --> <!-- <img :src="require('~/assets/add.png')" class="image" @click="AddIcon"> -->
<!-- <span style="text-align:center;font-size:5px">添加</span> --> <!-- <span style="text-align:center;font-size:5px">添加</span> -->
<el-button type="text" class="button" icon="el-icon-plus" @click="AddIcon"></el-button> <el-button type="text" class="button" icon="el-icon-plus" @click="AddIcon"></el-button>
</div>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
...@@ -159,4 +161,9 @@ export default { ...@@ -159,4 +161,9 @@ export default {
</script> </script>
<style> <style>
.icon_card{
display: flex;
justify-content: center;
align-items: center;
}
</style> </style>
\ No newline at end of file
src/mixin/commonProcess.js
...@@ -258,6 +258,18 @@ export default { ...@@ -258,6 +258,18 @@ export default {
}, },
gotoUrl(url) { gotoUrl(url) {
this.$router.push(url) this.$router.push(url)
},
/**
* 设置拖动组件的内容
* @param {String} currentTool
* @param {String} toolTitle
*/
setDraggableContent(currentTool, toolTitle) {
const layout = this.$root.$children[0].$children[0]
layout.dragShow = true;
layout.changeSize(1);
layout.currentTool = currentTool;
layout.toolTitle = toolTitle;
} }
}, },
computed: { computed: {
......
src/model/Ditopn/Check.js
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
"didgrp.apl.pts.dihdig": [checkDidgrpAplPtsDihdigN100,], "didgrp.apl.pts.dihdig": [checkDidgrpAplPtsDihdigN100,],
//"didgrp.rec.conno": [checkDidgrpRecConnoN100, checkDidgrpRecConnoN1001,], //"didgrp.rec.conno": [checkDidgrpRecConnoN100, checkDidgrpRecConnoN1001,],
"didgrp.rec.conno": [checkDidgrpRecConnoN100,], "didgrp.rec.conno": [checkDidgrpRecConnoN100,],
"didgrp.blk.defdet": [checkDidgrpBlkDefdetN100, checkDidgrpBlkDefdetN100, checkDidgrpBlkDefdetN1001,], "didgrp.blk.defdet": [checkDidgrpBlkDefdetN100, checkDidgrpBlkDefdetN1001,],
"didgrp.rec.elcflg": [checkDidgrpRecElcflgN100,], "didgrp.rec.elcflg": [checkDidgrpRecElcflgN100,],
"didgrp.blk.insbnk": [checkDidgrpBlkInsbnkN100,], "didgrp.blk.insbnk": [checkDidgrpBlkInsbnkN100,],
"liaall.liaccv.totcovamt": [checkLiaallLiaccvTotcovamtN100,], "liaall.liaccv.totcovamt": [checkLiaallLiaccvTotcovamtN100,],
...@@ -95,11 +95,11 @@ export default { ...@@ -95,11 +95,11 @@ export default {
//"didgrp.rec.tenmaxday": [checkDidgrpRecTenmaxdayN1000, checkDidgrpRecTenmaxdayN1050,], //"didgrp.rec.tenmaxday": [checkDidgrpRecTenmaxdayN1000, checkDidgrpRecTenmaxdayN1050,],
"didgrp.rec.tenmaxday": [checkDidgrpRecTenmaxdayN1000,], "didgrp.rec.tenmaxday": [checkDidgrpRecTenmaxdayN1000,],
"didgrp.cbs.nom1.amt": [checkDidgrpCbsNom1AmtN100,], "didgrp.cbs.nom1.amt": [checkDidgrpCbsNom1AmtN100,],
"didgrp.blk.preper": [checkDidgrpBlkPreperN100, checkDidgrpBlkPreperN100,], "didgrp.blk.preper": [checkDidgrpBlkPreperN100,],
"didgrp.apl.adrelc": [checkDidgrpAplAdrelcN100,], "didgrp.apl.adrelc": [checkDidgrpAplAdrelcN100,],
"ditp.rmbp.ptsget.sdamod.dadsnd": [checkDitpRmbpPtsgetSdamodDadsndN100,], "ditp.rmbp.ptsget.sdamod.dadsnd": [checkDitpRmbpPtsgetSdamodDadsndN100,],
"didgrp.ben.pts.extact": [checkDidgrpBenPtsExtactN1001,], "didgrp.ben.pts.extact": [checkDidgrpBenPtsExtactN1001,],
"didgrp.blk.adlcnd": [checkDidgrpBlkAdlcndN100, checkDidgrpBlkAdlcndN100,], "didgrp.blk.adlcnd": [checkDidgrpBlkAdlcndN100,],
"litameadv": [checkLitameadvN100,ruleLitameadvN100,], "litameadv": [checkLitameadvN100,ruleLitameadvN100,],
"liaall.liaccv.relcshpct": [checkLiaallLiaccvRelcshpctN100,], "liaall.liaccv.relcshpct": [checkLiaallLiaccvRelcshpctN100,],
"didgrp.rec.bdflg":[resetDidgrpRecBdflg,], "didgrp.rec.bdflg":[resetDidgrpRecBdflg,],
...@@ -479,9 +479,9 @@ function checkDidgrpBlkDefdetN100(rule, value, callback) { ...@@ -479,9 +479,9 @@ function checkDidgrpBlkDefdetN100(rule, value, callback) {
* source:ditp.@0047.script * source:ditp.@0047.script
* ditp * ditp
*/ */
function checkDidgrpBlkDefdetN100(rule, value, callback) { // function checkDidgrpBlkDefdetN100(rule, value, callback) {
callback() // callback()
} // }
/** /**
* source:ditp.@0104.script * source:ditp.@0104.script
* ditp * ditp
...@@ -988,9 +988,9 @@ function checkDidgrpBlkPreperN100(rule, value, callback) { ...@@ -988,9 +988,9 @@ function checkDidgrpBlkPreperN100(rule, value, callback) {
* source:ditp.@0083.script * source:ditp.@0083.script
* ditp * ditp
*/ */
function checkDidgrpBlkPreperN100(rule, value, callback) { // function checkDidgrpBlkPreperN100(rule, value, callback) {
callback() // callback()
} // }
/** /**
* source:ptsp.@0039.script * source:ptsp.@0039.script
* ditp.aplp * ditp.aplp
...@@ -1026,9 +1026,9 @@ function checkDidgrpBlkAdlcndN100(rule, value, callback) { ...@@ -1026,9 +1026,9 @@ function checkDidgrpBlkAdlcndN100(rule, value, callback) {
* source:ditp.@0102.script * source:ditp.@0102.script
* ditp * ditp
*/ */
function checkDidgrpBlkAdlcndN100(rule, value, callback) { // function checkDidgrpBlkAdlcndN100(rule, value, callback) {
callback() // callback()
} // }
/** /**
* source:ditopn.@0090.script * source:ditopn.@0090.script
* *
......
src/vendor.js deleted 100644 → 0
import Vue from 'vue'
import ElementUI from 'element-ui'
\ No newline at end of file
src/views/Business/Bftsnd/Rgfp.vue
...@@ -460,7 +460,7 @@ ...@@ -460,7 +460,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onBFDSeainf" @click="onBFDSeainf"
......
src/views/Business/Cptadv/CptAdvChangePanel.vue
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<!-- <c-col :span="12"> --> <!-- <c-col :span="12"> -->
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<c-col :span="6" style="text-align: right"> --> <c-col :span="6" style="text-align: right"> -->
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -432,7 +432,7 @@ ...@@ -432,7 +432,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -556,7 +556,7 @@ ...@@ -556,7 +556,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
......
src/views/Business/Cptadv/Opnp1.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf"> @click="onSeainf">
......
src/views/Business/Cptopn/CptOpnp1Common.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<!-- <c-col :span="12"> --> <!-- <c-col :span="12"> -->
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<c-col :span="6" style="text-align: right"> --> <c-col :span="6" style="text-align: right"> -->
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -484,7 +484,7 @@ ...@@ -484,7 +484,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -531,7 +531,7 @@ ...@@ -531,7 +531,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -610,7 +610,7 @@ ...@@ -610,7 +610,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
......
src/views/Business/Cptopn/Opnp1.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
......
src/views/Business/Cptopn/Payment103.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
......
src/views/Business/Ditdck/Docpre.vue
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<!-- =================已交单据====================== --> <!-- =================已交单据====================== -->
<c-col :span="24"> <c-col :span="24">
<el-button slot="reference" style="float:right" @click="addDocgrdDataStore">添加</el-button> <el-button style="margin-bottom:5px;float:right" @click="addDocgrdDataStore" type="primary">新增单据</el-button>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<!-- :list="model.bdtp.docgrdm.docgrd" --> <!-- :list="model.bdtp.docgrdm.docgrd" -->
...@@ -149,8 +149,9 @@ ...@@ -149,8 +149,9 @@
{{scope.row.cmail1}} {{scope.row.cmail1}}
</div> </div>
<div v-else> <div v-else>
<c-col :span="20">
<div v-for="(item, idx) in scope.row.list" :key="idx" > <div v-for="(item, idx) in scope.row.list" :key="idx" >
<c-col :span="6" :offset="1" > <c-col :span="6" :offset="2" >
<div style="border:1px solid #eaeaea;padding:8px 8px 8px 15px;margin:5px;background:#f5ffff;height:75px"> <div style="border:1px solid #eaeaea;padding:8px 8px 8px 15px;margin:5px;background:#f5ffff;height:75px">
<div style="height:20px"> <div style="height:20px">
<span>{{item.discribe}}</span> <span>{{item.discribe}}</span>
...@@ -164,11 +165,12 @@ ...@@ -164,11 +165,12 @@
</div> </div>
</c-col> </c-col>
</div> </div>
<c-col :span="6" :offset="1" > <c-col :span="6" :offset="2" >
<div class="addCss" style="border:1px dashed;padding:8px;margin:5px;height:75px;text-align:center"> <div class="addCss" style="border:1px dashed;padding:8px;margin:5px;height:75px;display: flex;justify-content: center;align-items: center;">
<el-button type="text" class="button" icon="el-icon-plus" @click="InsertErrorDialog(scope.$index)" style="text-align:center"></el-button><br> <el-button type="text" class="button" icon="el-icon-plus" @click="InsertErrorDialog(scope.$index)" style="text-align:center"></el-button><br>
</div> </div>
</c-col> </c-col>
</c-col>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -178,8 +180,8 @@ ...@@ -178,8 +180,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="state" label="状态" width="auto"> <el-table-column prop="state" label="状态" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="操作" prop="det" width="100px" fixed="right"> <el-table-column label="操作" prop="det" width="170px" fixed="right">
<template slot="header"> <!-- <template slot="header">
<span>操作</span> <span>操作</span>
<el-button <el-button
circle circle
...@@ -189,7 +191,7 @@ ...@@ -189,7 +191,7 @@
@click="addDialogVisible = true" @click="addDialogVisible = true"
> >
</el-button> </el-button>
</template> </template> -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover
placement="right" placement="right"
...@@ -209,15 +211,17 @@ ...@@ -209,15 +211,17 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="file-add" title="导入文件"> <div class="file-add" title="导入文件" @click="importFile">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</div> </div>
<el-button slot="reference" @click="addPDF(scope.row.id)">添加</el-button> <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>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col>
<!-- 不符点 -->
<c-col> <c-col>
<el-dialog :visible.sync="InsertErrorDialogVisibal" center width="500px"> <el-dialog :visible.sync="InsertErrorDialogVisibal" center width="500px">
<c-col :span="24"> <c-col :span="24">
...@@ -229,7 +233,23 @@ ...@@ -229,7 +233,23 @@
</c-col> </c-col>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="InsertError()">确定</el-button> <el-button type="primary" @click="InsertError()">确定</el-button>
<el-button @click="InsertErrorDialogVisibal = false">取消</el-button> <el-button @click="InsertErrorDialogVisibal = false;newInsertError= ''">取消</el-button>
</span>
</el-dialog>
</c-col>
<!-- 新加单据 -->
<c-col>
<el-dialog :visible.sync="InsertGridDataDialogVisibal" center width="500px">
<c-col :span="24">
<c-col :span="20">
<el-form-item label="单据名称" label-width="100px">
<c-input v-model="newInsertGridData"></c-input>
</el-form-item>
</c-col>
</c-col>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="InsertGridData()">确定</el-button>
<el-button @click="InsertGridDataDialogVisibal = false;newInsertGridData = ''">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
</c-col> </c-col>
...@@ -253,8 +273,10 @@ export default { ...@@ -253,8 +273,10 @@ export default {
return { return {
addDialogVisible: false, addDialogVisible: false,
InsertErrorDialogVisibal: false, InsertErrorDialogVisibal: false,
InsertGridDataDialogVisibal: false,
newInsertError:"", newInsertError:"",
newInsertErrorIndex: -1, newInsertErrorIndex: -1,
newInsertGridData:"",
dialog: { dialog: {
cmail1: "", cmail1: "",
cmail2: "", cmail2: "",
...@@ -357,6 +379,9 @@ export default { ...@@ -357,6 +379,9 @@ export default {
}, },
methods: { methods: {
...Event, ...Event,
importFile() {
this.root.setDraggableContent('cms', '影像信息');
},
addRow(){ addRow(){
this.addDialogVisible=false; this.addDialogVisible=false;
let newRow = {...this.dialog}; let newRow = {...this.dialog};
...@@ -368,14 +393,26 @@ export default { ...@@ -368,14 +393,26 @@ export default {
addPDF(idx){ addPDF(idx){
this.selectPDFData = idx; this.selectPDFData = idx;
}, },
detailPDF(id){
this.openPdfDialog(id, 0);
},
openPdfDialog(id, idx) { openPdfDialog(id, idx) {
this.$refs.ocrRecognition.show = true this.$refs.ocrRecognition.show = true
var tempId = 0;
for(let i = 0; i < this.docgrdDataStore.length; i++){
if(id == this.docgrdDataStore[i].id){
tempId = i;
break;
}
}
this.$refs.ocrRecognition.formData.type = this.$refs.ocrRecognition.fileType[tempId].value;
this.selectedPdf.id = id; this.selectedPdf.id = id;
this.selectedPdf.index = idx; this.selectedPdf.index = idx;
}, },
selectGridPDF(){ selectGridPDF(){
const id = this.selectedPdf.id; const id = this.selectedPdf.id;
const idx = this.selectedPdf.index; // const idx = this.selectedPdf.index;
const idx = 0; //PDF全部展示，就不存在idx
var tempData = []; var tempData = [];
var list = []; var list = [];
var flag = false; var flag = false;
...@@ -439,6 +476,19 @@ export default { ...@@ -439,6 +476,19 @@ export default {
this.newInsertError = ""; this.newInsertError = "";
this.InsertErrorDialogVisibal = false; this.InsertErrorDialogVisibal = false;
}, },
addDocgrdDataStore(){
this.InsertGridDataDialogVisibal = true;
},
InsertGridData(){
var index = this.docgrdData.length;
var tempData = this.dialog;
tempData.cmail1 = this.newInsertGridData;
tempData.id = "tempId" + index;
tempData.state = "符合";
this.docgrdData.push(this.dialog);
this.InsertGridDataDialogVisibal = false;
this.newInsertGridData = "";
}
}, },
created: function () { created: function () {
var IconList = JSON.parse(sessionStorage.getItem("IconList")); var IconList = JSON.parse(sessionStorage.getItem("IconList"));
...@@ -481,6 +531,28 @@ export default { ...@@ -481,6 +531,28 @@ export default {
.addCss { .addCss {
} }
/* 如果要增加竖线上方加上.el-table td */
/* 鼠标滑过td上作用的样式，ie6不支持:hover伪类属性，如果是ie6要写成tr.over样式 */
/* 如果td没有颜色，可以去掉，这里加上保险 */
/* .el-table{
background-color: transparent;
color:white;
}
.el-table th, .el-table tr{
border: 0;
background-color: transparent;
}
.el-table tbody tr:hover>td {
background-color:transparent!important;
}
.el-table__body tr.hover-row>td {
background-color: transparent;
} */
/* .el-table tbody tr:hover>td {
background-color:#ffffff!important
} */
.file-add { .file-add {
margin-top: 16px; margin-top: 16px;
text-align: center; text-align: center;
......
src/views/Business/Ditdck/OcrRecognition.vue
...@@ -186,9 +186,9 @@ ...@@ -186,9 +186,9 @@
<script> <script>
import axios from 'axios' import axios from 'axios'
import bill_of_ladingPdf from "~/assets/demo-files/bill_of_lading.pdf"; // import bill_of_ladingPdf from "~/assets/demo-files/bill_of_lading.pdf";
import commercial_invoicePdf from "~/assets/demo-files/commercial_invoice.pdf"; // import commercial_invoicePdf from "~/assets/demo-files/commercial_invoice.pdf";
import marine_cargo_certificatePdf from "~/assets/demo-files/marine_cargo_certificate.pdf"; // import marine_cargo_certificatePdf from "~/assets/demo-files/marine_cargo_certificate.pdf";
export default { export default {
name: "OcrRecognition", name: "OcrRecognition",
...@@ -286,7 +286,7 @@ export default { ...@@ -286,7 +286,7 @@ export default {
formData.append('mode', 'formdata'); formData.append('mode', 'formdata');
formData.append('the_file', file) formData.append('the_file', file)
const loading = this.$parent.root.loading("正在识别中...") const loading = this.$parent.root.loading("正在识别中...")
axios.post('/ocr/file', formData, { axios.post('/ocr/mockfile', formData, {
'Content-Type': 'multipart/form-data' 'Content-Type': 'multipart/form-data'
}).then(res => { }).then(res => {
const data = res.data const data = res.data
......
src/views/Business/Ditopn/Ovwp.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0px 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
......
src/views/Business/Ditopn/Tk.vue
...@@ -116,7 +116,7 @@ export default { ...@@ -116,7 +116,7 @@ export default {
IconList:[ IconList:[
"invoice","receipt", "invoice","receipt",
], ],
spanVal:5, spanVal:6,
} }
}, },
methods:{ methods:{
......
src/views/Business/Ditopn/index.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:handleStash="handleStash" :handleStash="handleStash"
> >
<el-button size="small">备忘录</el-button> <el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button> <el-button size="small" @click="setDraggableContent('cms', '影像信息')">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> --> <!-- <el-button size="small">保存模板</el-button> -->
<!-- <el-button size="small">使用模板</el-button> --> <!-- <el-button size="small">使用模板</el-button> -->
<el-button size="small">制裁信息</el-button> <el-button size="small">制裁信息</el-button>
...@@ -87,9 +87,9 @@ ...@@ -87,9 +87,9 @@
<el-tab-pane label="表外" name="engp"> <el-tab-pane label="表外" name="engp">
<!--PD000027 --> <!--PD000027 -->
<c-content> <c-content>
<m-engp :model="model" :codes="codes" /> <m-engp :model="model" :codes="codes" />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="保证金" name="ccvpan"> <el-tab-pane label="保证金" name="ccvpan">
......
src/views/Business/Infcpd/Infconp.vue
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
></c-button> ></c-button>
<c-button <c-button
size="small" size="small"
...@@ -419,7 +419,7 @@ ...@@ -419,7 +419,7 @@
<c-input v-model="model.cpdgrp.orc.pts.extkey"></c-input> <c-input v-model="model.cpdgrp.orc.pts.extkey"></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin: 0px 10px 0 10; padding: 0 12px" style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
......
src/views/Business/Infdid/Ovwp.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0px 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
......
src/views/Business/Infdid/Ptap.vue
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
......
src/views/Business/Mgrtsk/Tskmgr.vue
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<el-form-item <el-form-item
label="h" label="h"
prop="wfetsk.tsklist.jobstrtimhh" prop="wfetsk.tsklist.jobstrtimhh"
label-width="20px" label-width="25px"
style="width: 100%" style="width: 100%"
> >
<c-input <c-input
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<c-col :span="4" :offset="1"> <c-col :span="4" :offset="1">
<el-form-item <el-form-item
label="min" label="min"
label-width="20px" label-width="25px"
style="width: 100%" style="width: 100%"
> >
<c-input <c-input
...@@ -148,7 +148,8 @@ ...@@ -148,7 +148,8 @@
<el-form-item <el-form-item
label="h" label="h"
prop="wfetsk.tsklist.downtimehh" prop="wfetsk.tsklist.downtimehh"
label-width="20px" label-width="25px"
style="width: 100%"
> >
<c-input <c-input
v-model="model.wfetsk.tsklist.downtimehh" v-model="model.wfetsk.tsklist.downtimehh"
...@@ -159,11 +160,12 @@ ...@@ -159,11 +160,12 @@
</c-col> </c-col>
<c-col :span="4" :offset="1"> <c-col :span="4" :offset="1">
<el-form-item label="min" prop="" label-width="20px"> <el-form-item label="min" prop="" label-width="25px" style="width: 100%">
<c-input <c-input
v-model="model.wfetsk.tsklist.downtimemm" v-model="model.wfetsk.tsklist.downtimemm"
disabled disabled
placeholder="" placeholder=""
style="width: 100%"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -173,7 +175,7 @@ ...@@ -173,7 +175,7 @@
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
style="margin-left: 0" style="margin-left: 10px"
:disabled="buttonFlag" :disabled="buttonFlag"
@click="Update" @click="Update"
>Update</c-button >Update</c-button
...@@ -181,7 +183,7 @@ ...@@ -181,7 +183,7 @@
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
style="margin-left: 0" style="margin-left: 10px"
:disabled="buttonFlag" :disabled="buttonFlag"
@click="Start" @click="Start"
>Start</c-button >Start</c-button
...@@ -189,7 +191,7 @@ ...@@ -189,7 +191,7 @@
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
style="margin-left: 0" style="margin-left: 10px"
:disabled="!buttonFlag" :disabled="!buttonFlag"
@click="Stop" @click="Stop"
>Stop</c-button >Stop</c-button
...@@ -359,13 +361,13 @@ export default { ...@@ -359,13 +361,13 @@ export default {
}, },
methods: { methods: {
...Event, ...Event,
Entry(idx, row) { async Entry(idx, row) {
const selIds = [idx + 1]; const selIds = [idx + 1];
const selDst = "wfetsk.wfestm"; //列表对应后台模型中的stream const selDst = "wfetsk.wfestm"; //列表对应后台模型中的stream
let params = { selDst, selIds }; let params = { selDst, selIds };
this.executeRule("wfetsk.tsklist.butexe", params).then((res) => { await this.executeRule("wfetsk.tsklist.butexe", params).then((res) => {
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, res.data); this.Update();
} else { } else {
const h = this.$createElement; const h = this.$createElement;
const msg = res.respMsg || "请求执行失败!"; const msg = res.respMsg || "请求执行失败!";
...@@ -380,34 +382,39 @@ export default { ...@@ -380,34 +382,39 @@ export default {
} }
}); });
}, },
Update() { async Update() {
let rtnmsg = this.executeRule("wfetsk.tsklist.butupd"); let rtnmsg = await this.executeRule("wfetsk.tsklist.butupd");
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
// Utils.copyValueFromVO(this.model, rtnmsg.data);
this.stmData.data = rtnmsg.data.wfetsk_wfestm.rows;
} }
}, },
Start() { async Start() {
this.buttonFlag = true; this.buttonFlag = true;
let rtnmsg = this.executeRule("wfetsk.tsklist.butstr"); let rtnmsg = await this.executeRule("wfetsk.tsklist.butstr");
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = rtnmsg.data.wfetsk_wfestm.rows;
} }
//定时任务 //定时任务
var timeVal = this.model.wfetsk.tsklist.redotime * 1000; var timeVal = this.model.wfetsk.tsklist.redotime * 1000;
var that = this; var that = this;
this.timer = setInterval(function () { this.timer = setInterval(async function () {
let rtnmsg = that.executeRule("wfetsk.tsklist.butstr"); let rtnmsg = await that.executeRule("wfetsk.tsklist.butstr");
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
that.stmData.data = rtnmsg.data.wfetsk_wfestm.rows;
} }
}, timeVal); }, timeVal);
}, },
Stop() { async Stop() {
this.buttonFlag = false; this.buttonFlag = false;
clearInterval(this.timer); clearInterval(this.timer);
let rtnmsg = this.executeRule("wfetsk.tsklist.butstp"); let rtnmsg = await this.executeRule("wfetsk.tsklist.butstp");
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = rtnmsg.data.wfetsk_wfestm.rows;
} }
}, },
}, },
......
src/views/Business/Office/index.vue
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess" import commonProcess from "~/mixin/commonProcess"
import Pattern from "~/Model/Office/Pattern" import Pattern from "~/model/Office/Pattern"
import Default from "~/model/Office/Default"; import Default from "~/model/Office/Default";
import Check from "~/model/Office/Check"; import Check from "~/model/Office/Check";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
......
src/views/Business/Sptsel/Sptbrk/index.vue
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Sptsel from "~/Model/Sptsel" import Sptsel from "~/model/Sptsel"
import commonProcess from "~/mixin/commonProcess.js" import commonProcess from "~/mixin/commonProcess.js"
import Pattern from "~/Model/Sptsel/Pattern" import Pattern from "~/model/Sptsel/Pattern"
import Utils from "~/utils/index" import Utils from "~/utils/index"
import Default from "~/model/Sptsel/Default"; import Default from "~/model/Sptsel/Default";
import Check from "~/model/Sptsel/Check"; import Check from "~/model/Sptsel/Check";
......
src/views/Business/Sptsel/Sptpopup.vue
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
</c-page> </c-page>
</template> </template>
<script> <script>
import Sptsel from "~/Model/Sptsel"; import Sptsel from "~/model/Sptsel";
import Api from "~/service/Api"; import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
......
src/views/Business/Sptsel/index.vue
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
</div> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable"
import Sptsel from "~/Model/Sptsel"; import Sptsel from "~/model/Sptsel"
import commonProcess from "~/mixin/commonProcess.js"; import commonProcess from "~/mixin/commonProcess.js"
import Pattern from "~/Model/Sptsel/Pattern"; import Pattern from "~/model/Sptsel/Pattern"
import Utils from "~/utils/index"; import Utils from "~/utils/index"
import Default from "~/model/Sptsel/Default"; import Default from "~/model/Sptsel/Default";
import Check from "~/model/Sptsel/Check"; import Check from "~/model/Sptsel/Check";
import Menu from "./Menu"; import Menu from "./Menu";
......
src/views/Business/Trnrel/InftrnpsDetail.vue
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
</template> </template>
<script> <script>
import Trnrel from "~/Model/Trnrel"; import Trnrel from "~/model/Trnrel";
import Api from "~/service/Api" import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
</template> </template>
<script> <script>
import Trnrel from "~/Model/Trnrel"; import Trnrel from "~/model/Trnrel";
import Api from "~/service/Api" import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
......
src/views/Business/Trnrel/Trnfnd/index.vue
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Trnrel from "~/Model/Trnrel"; import Trnrel from "~/model/Trnrel";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import Pattern from "~/Model/Trnrel/Pattern"; import Pattern from "~/model/Trnrel/Pattern";
import Default from "~/model/Trnrel/Default"; import Default from "~/model/Trnrel/Default";
import Check from "~/model/Trnrel/Check"; import Check from "~/model/Trnrel/Check";
import Inftrnps from "./Inftrnps"; import Inftrnps from "./Inftrnps";
......
src/views/Business/Trnrel/index.vue
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Trnrel from "~/Model/Trnrel"; import Trnrel from "~/model/Trnrel";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import Pattern from "~/Model/Trnrel/Pattern"; import Pattern from "~/model/Trnrel/Pattern";
import Default from "~/model/Trnrel/Default"; import Default from "~/model/Trnrel/Default";
import Check from "~/model/Trnrel/Check"; import Check from "~/model/Trnrel/Check";
import Inftrnps from "./Inftrnps"; import Inftrnps from "./Inftrnps";
......
src/views/Layout/index.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
v-show="dragStatus !== 0" v-show="dragStatus !== 0"
></div> ></div>
<div :draggable="false" :class="dragStyle" v-show="dragStatus !== 0"> <div :draggable="false" :class="dragStyle" v-show="dragStatus !== 0">
<m-undisabled> <m-undisabled style="height: 100%;">
<div v-if="currentTool === 'tool-caculate'"> <div v-if="currentTool === 'tool-caculate'">
<calculator ref="calculator" /> <calculator ref="calculator" />
</div> </div>
...@@ -90,6 +90,9 @@ ...@@ -90,6 +90,9 @@
<!-- <div v-if="currentTool === 'tool-txSerialNo'"> <!-- <div v-if="currentTool === 'tool-txSerialNo'">
<txSerialNo ref="txSerialNo"/> <txSerialNo ref="txSerialNo"/>
</div>--> </div>-->
<div v-if="currentTool === 'cms'" style="height: 100%;">
<cms></cms>
</div>
</m-undisabled> </m-undisabled>
</div> </div>
<div <div
...@@ -119,14 +122,16 @@ import sideMenu from "./SideMenu"; ...@@ -119,14 +122,16 @@ import sideMenu from "./SideMenu";
import tagViews from "./components/TagsView"; import tagViews from "./components/TagsView";
import business from "../Business"; import business from "../Business";
import toolbars from "~/components/Toolbars"; import toolbars from "~/components/Toolbars";
import calculator from "~/widget/Calculator"
import VueDraggableResizable from 'vue-draggable-resizable' import VueDraggableResizable from 'vue-draggable-resizable'
import cms from "~/components/Cms"
import calculator from "~/widget/Calculator"
export default { export default {
name: "Layout", name: "Layout",
components: { headerCom, sideMenu, tagViews, business, toolbars, components: { headerCom, sideMenu, tagViews, business, toolbars,
calculator, calculator,
cms,
'vue-draggable-resizable': VueDraggableResizable, 'vue-draggable-resizable': VueDraggableResizable,
}, },
data(){ data(){
...@@ -219,7 +224,7 @@ export default { ...@@ -219,7 +224,7 @@ export default {
} }
this.dragStyle = 'm-draggable-content' this.dragStyle = 'm-draggable-content'
} }
} },
} }
}; };
</script> </script>
......
src/views/Public/CptOpnp1Common.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<!-- <c-col :span="12"> --> <!-- <c-col :span="12"> -->
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<c-col :span="6" style="text-align: right"> --> <c-col :span="6" style="text-align: right"> -->
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
</el-form-item> </el-form-item>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
......
src/views/Public/Limitbody.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 5px 0 10;padding: 0 12px;" style="margin:0 5px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
......
src/views/Public/Ptap.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
......
src/widget/Calculator/norCalc.vue
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
} }
}; };
</script> </script>
<style> <style scoped>
.calculator { .calculator {
width: 500px; width: 500px;
padding: 20px; padding: 20px;
......
vue.config.js 0 → 100644
'use strict'
const path = require('path')
function resolve(dir) {
return path.join(__dirname, dir)
}
// If your port is set to 80,
// use administrator privileges to execute the command line.
// For example, Mac: sudo npm run
// You can change the port by the following method:
// port = 9527 npm run dev OR npm run dev --port = 9527
const port = process.env.port || process.env.npm_config_port || 8010 // dev port
// All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = {
/**
* You will need to set publicPath if you plan to deploy your site under a sub path,
* for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
* then publicPath should be set to "/bar/".
* In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: '/',
outputDir: 'dist',
assetsDir: 'static',
productionSourceMap: false,
devServer: {
port: port,
open: true,
overlay: {
warnings: false,
errors: true
},
proxy: {
'/gjjs/': {
target: 'http://127.0.0.1:8081',
changeOrigin: true,
pathRewrite: {
'^/gjjs': '/gjjs'
}
},
/**
* ocr智能识别服务
*/
'/ocr/': {
target: 'http://192.168.0.110:5010',
// target: 'http://127.0.0.1:5000',
changeOrigin: true,
pathRewrite: {
'^/ocr': '/'
}
}
}
},
configureWebpack: {
// provide the app's title in webpack's name field, so that
// it can be accessed in index.html to inject the correct title.
devtool: 'source-map',
resolve: {
alias: {
'~': resolve('src')
}
},
output: {
// 方便浏览器看源码
devtoolModuleFilenameTemplate: (info) => {
const resPath = info.resourcePath;
if ((/\.vue$/.test(resPath) && info.allLoaders !== '') || /node_modules/.test(resPath)) {
return `webpack:///${resPath}?${info.hash}`;
}
return `webpack:///${resPath.replace('./src', 'SourceCode')}`;
}
}
},
chainWebpack(config) {
// it can improve the speed of the first screen, it is recommended to turn on preload
config.plugin('preload').tap(() => [
{
rel: 'preload',
// to ignore runtime.js
// https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171
fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/],
include: 'initial'
}
])
// when there are many pages, it will cause too many meaningless requests
config.plugins.delete('prefetch')
config
.when(process.env.NODE_ENV !== 'development',
config => {
config
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}])
.end()
config
.optimization.splitChunks({
chunks: 'all',
cacheGroups: {
libs: {
name: 'chunk-libs',
test: /[\\/]node_modules[\\/]/,
priority: 10,
chunks: 'initial' // only package third parties that are initially dependent
},
elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: 'chunk-commons',
test: resolve('src/components'), // can customize your rules
minChunks: 3, // minimum common number
priority: 5,
reuseExistingChunk: true
}
}
})
// https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk
config.optimization.runtimeChunk('single')
}
)
}
}
webpack.config.js deleted 100644 → 0
const resolve = require('path').resolve
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const url = require('url')
const publicPath = ''
module.exports = (options = {}) => ({
entry: {
vendor: './src/vendor',
index: './src/main.js'
},
output: {
path: resolve(__dirname, 'dist'),
filename: options.dev ? '[name].js' : '[name].js?[chunkhash]',
chunkFilename: '[id].js?[chunkhash]',
publicPath: options.dev ? '/assets/' : publicPath
},
module: {
rules: [{
test: /\.vue$/,
use: ['vue-loader']
},
{
test: /\.js$/,
use: ['babel-loader'],
exclude: /node_modules/
},
{
test: /\.css$/,
use: ['style-loader', 'css-loader', 'postcss-loader']
},
{
test: /\.(png|jpg|jpeg|gif|eot|ttf|woff|woff2|svg|svgz)(\?.+)?$/,
use: [{
loader: 'url-loader',
options: {
limit: 10000
}
}]
},
{
test: /\.pdf$/,
loader: 'file-loader?mimetype=application/pdf&name=[name].pdf'
}
]
},
plugins: [
new webpack.optimize.CommonsChunkPlugin({
names: ['vendor', 'manifest']
}),
new HtmlWebpackPlugin({
template: 'src/index.html'
})
],
resolve: {
alias: {
'~': resolve(__dirname, 'src')
},
extensions: ['.js', '.vue', '.json', '.css']
},
devServer: {
host: '127.0.0.1',
port: 8010,
proxy: {
'/gjjs/': {
target: 'http://127.0.0.1:8081',
changeOrigin: true,
pathRewrite: {
'^/gjjs': '/gjjs'
}
},
/**
* ocr智能识别服务
*/
'/ocr/': {
target: 'http://192.168.0.110:5010',
// target: 'http://127.0.0.1:5000',
changeOrigin: true,
pathRewrite: {
'^/ocr': '/'
}
}
},
historyApiFallback: {
index: url.parse(options.dev ? '/assets/' : publicPath).pathname
}
},
devtool: '#source-map'
})
yarn.lock deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
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