Skip to content

V
vue-gjjs
Commit f3e55958 by liushikai
Options

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

# Conflicts:
#	src/views/Business/Trnrel/Inftrnps.vue
parents bc32f6b9 a313c613
Showing with 179 additions and 321 deletions
.babelrc
{ {
"presets": ["vue-app"] "presets": ["vue-app"],
"plugins": [
["transform-es2015-modules-commonjs", {
"allowTopLevelThis": true
}]
]
} }
package-lock.json
...@@ -865,7 +865,7 @@ ...@@ -865,7 +865,7 @@
}, },
"babel-plugin-transform-strict-mode": { "babel-plugin-transform-strict-mode": {
"version": "6.24.1", "version": "6.24.1",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-strict-mode/download/babel-plugin-transform-strict-mode-6.24.1.tgz",
"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
"dev": true, "dev": true,
"requires": { "requires": {
......
package.json
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
"autoprefixer": "^6.6.0", "autoprefixer": "^6.6.0",
"babel-core": "^6.24.1", "babel-core": "^6.24.1",
"babel-loader": "^6.4.0", "babel-loader": "^6.4.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
"babel-preset-vue-app": "^1.2.0", "babel-preset-vue-app": "^1.2.0",
"css-loader": "^0.27.0", "css-loader": "^0.27.0",
"file-loader": "^0.10.1", "file-loader": "^0.10.1",
......
src/components/BusinessButton.vue
<template> <template>
<div class="bus-button"> <div class="bus-button">
<c-button type="primary" v-on:click="save">{{ $t('buttons.submit') }}</c-button> <c-button type="primary" v-on:click="save">{{
<c-button type="primary" v-on:click="pedding">{{ $t('buttons.stash') }}</c-button> $t("buttons.submit")
<c-button type="primary" v-on:click="check">{{ $t('buttons.check') }}</c-button> }}</c-button>
<c-button v-on:click="exit">{{ $t('buttons.quit') }}</c-button> <c-button type="primary" v-on:click="pedding">{{
</div> $t("buttons.stash")
}}</c-button>
<c-button type="primary" v-on:click="check">{{
$t("buttons.check")
}}</c-button>
<c-button v-on:click="exit">{{ $t("buttons.quit") }}</c-button>
</div>
</template> </template>
<script> <script>
import commonApi from "~/mixin/commonApi" import commonApi from "~/mixin/commonApi";
import Utils from "~/utils" import Utils from "~/utils";
export default { export default {
props:["$pntvm"], props: ["$pntvm"],
data(){ data() {
return{ return {};
},
methods: {
async save() {
console.log(123);
let vm = this.getVM();
let result = await vm.save();
console.log(result);
// if (result.respCode == SUCCESS) {
// this.$notify({
// title: '成功',
// message: '保存成功',
// type: 'success'
// });
// this.$router.history.push("/business/trnrel")
// } else {
// }
if (
result.respCode == SUCCESS &&
Object.keys(result.fieldErrors).length == 0
) {
this.$notify({
title: "成功",
message: "保存成功",
type: "success",
});
this.$store.dispatch("TagsView/delView", this.$route);
this.$router.history.push("/taskList", () => {
this.$store.commit("setTaskListTabVal", "trnrel");
});
} else if (
result.fieldErrors &&
Object.keys(result.fieldErrors).length > 0
) {
let errorMsg = "";
let errorMsgkey = "";
let errorMsgVal = "";
for (const key in result.fieldErrors) {
errorMsgkey = key;
errorMsgVal = result.fieldErrors[key];
errorMsg = errorMsg + errorMsgkey + ":" + errorMsgVal + ";";
} }
this.$notify.error({
title: "失败",
message: "保存失败！错误信息[" + errorMsg + "]",
});
} else {
this.$notify({
title: "失败",
message: "保存失败",
type: "error",
});
}
},
async pedding() {
let result = await this.getVM().pedding();
console.log(result);
if (result.respCode == SUCCESS) {
this.$notify({
title: "成功",
message: "暂存成功",
type: "success",
});
this.$router.history.push("/business/sptsel");
} else {
this.$notify({
title: "失败",
message: "暂存失败",
type: "error",
});
}
}, },
methods:{ async check() {
async save(){ let result = await this.getVM().checkAll();
console.log(123) if (result.respCode != SUCCESS) {
let vm = this.getVM(); this.$notify.error({ title: "错误", message: result.respMsg });
let result = await vm.save() } else {
console.log(result) // 清除之前的校验状态
if (result.respCode == SUCCESS) { this.getVM().$refs.modelForm.clearValidate();
this.$notify({ const fields = this.getVM().$refs.modelForm.fields;
title: '成功', const fieldErrors = result.fieldErrors;
message: '保存成功', this.getVM().updateModel(result.data);
type: 'success' Utils.positioningErrorMsg(fieldErrors, fields);
}); const tab = Utils.positioningErrorMsg(fieldErrors, fields);
this.$router.history.push("/business/trnrel") if (tab) {
} else { // tab切换之后，需出发tab-click的事件
this.$notify({ this.getVM().tabClick(tab);
title: '失败',
message: '保存失败',
type: 'error'
});
}
},
async pedding(){
let result = await this.getVM().pedding()
console.log(result)
if (result.respCode == SUCCESS) {
this.$notify({
title: '成功',
message: '暂存成功',
type: 'success'
});
this.$router.history.push("/business/sptsel")
} else {
this.$notify({
title: '失败',
message: '暂存失败',
type: 'error'
});
}
},
async check(){
let result = await this.getVM().checkAll()
if(result.respCode != SUCCESS) {
this.$notify.error({title: '错误',message: result.respMsg});
} else {
// 清除之前的校验状态
this.getVM().$refs.modelForm.clearValidate()
const fields = this.getVM().$refs.modelForm.fields
const fieldErrors = result.fieldErrors;
this.getVM().updateModel(result.data)
Utils.positioningErrorMsg(fieldErrors, fields)
const tab = Utils.positioningErrorMsg(fieldErrors, fields);
if(tab) {
// tab切换之后，需出发tab-click的事件
this.getVM().tabClick(tab);
}
}
},
exit(){
this.$confirm('您有未保存的数据，确定退出吗, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(()=>{
this.$router.history.push("/home")
})
},
getVM(){
return this.$pntvm
} }
} }
} },
exit() {
this.$confirm("您有未保存的数据，确定退出吗, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.$router.history.push("/home");
});
},
getVM() {
return this.$pntvm;
},
},
};
</script> </script>
<style> <style>
.bus-button { .bus-button {
margin-bottom: 10px; margin-bottom: 10px;
} }
.bus-button :first-child { .bus-button :first-child {
margin-left: 0; margin-left: 0;
} }
</style> </style>
\ No newline at end of file
src/model/Trnrel/Event.js
...@@ -152,8 +152,9 @@ export default { ...@@ -152,8 +152,9 @@ export default {
for (const key in rtnmsg.fieldErrors) { for (const key in rtnmsg.fieldErrors) {
errorMsgkey = key; errorMsgkey = key;
errorMsgVal = rtnmsg.fieldErrors[key]; errorMsgVal = rtnmsg.fieldErrors[key];
errorMsg = errorMsg + errorMsgkey + ':' + errorMsgVal + ";";
} }
errorMsg = errorMsgkey + ':' + errorMsgVal;
} else if (rtnmsg.respMsg) { } else if (rtnmsg.respMsg) {
errorMsg = rtnmsg.respMsg; errorMsg = rtnmsg.respMsg;
} }
...@@ -397,6 +398,7 @@ export default { ...@@ -397,6 +398,7 @@ export default {
type: 'success' type: 'success'
}); });
} }
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
}, },
async handleReset() { async handleReset() {
......
src/views/Business/Bdtset/index.vue
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import Utils from "~/utils/index";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Bdtset from "~/model/Bdtset" import Bdtset from "~/model/Bdtset"
import CommonProcess from "~/mixin/CommonProcess" import CommonProcess from "~/mixin/CommonProcess"
...@@ -179,21 +180,26 @@ export default { ...@@ -179,21 +180,26 @@ export default {
}, },
created:async function(){ created:async function(){
console.log("进入bdtset交易");
console.log(new Bdtset().data)
let rtnmsg = await this.init({})
let that = this;
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
that.$refs.utlp.stmData.data=rtnmsg.data.liaall_tenstm.rows
//TODO 处理数据逻辑
console.log("进入bdtset交易");
let rtnmsg = await this.init(this.$route.query)
let that = this;
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
console.log(rtnmsg)
Utils.copyValueFromVO(this.model,rtnmsg.data)
that.$refs.utlp.stmData.data=rtnmsg.data.liaall_tenstm.rows
console.log(this.model);
if(this.isInDisplay){
this.restoreDisplay()
} }
else }
{ else
this.$notify.error({title: '错误',message: '服务请求失败！'}); {
} this.$notify.error({title: '错误',message: '服务请求失败！'});
}
} }
} }
</script> </script>
......
src/views/Business/Ditdck/index.vue
...@@ -76,6 +76,7 @@ import Utils from "~/utils/index"; ...@@ -76,6 +76,7 @@ import Utils from "~/utils/index";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Ditdck from "~/model/Ditdck"; import Ditdck from "~/model/Ditdck";
import CommonProcess from "~/mixin/CommonProcess"; import CommonProcess from "~/mixin/CommonProcess";
import CommonFuncs from "~/mixin/CommonFuncs";
import Pattern from "~/model/Ditdck/Pattern"; import Pattern from "~/model/Ditdck/Pattern";
import Default from "~/model/Ditdck/Default"; import Default from "~/model/Ditdck/Default";
import Check from "~/model/Ditdck/Check"; import Check from "~/model/Ditdck/Check";
...@@ -113,7 +114,7 @@ export default { ...@@ -113,7 +114,7 @@ export default {
root: this, root: this,
}; };
}, },
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理 mixins: [CommonProcess,CommonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
isShowDocpre:false, isShowDocpre:false,
...@@ -134,30 +135,30 @@ export default { ...@@ -134,30 +135,30 @@ export default {
}, },
created: async function () { created: async function () {
// console.log("进入ditdck交易");
// let rtnmsg = await this.init(this.$route.query)
// if(rtnmsg.respCode == SUCCESS)
// {
// //TODO 处理数据逻辑
// console.log(rtnmsg)
// Utils.copyValueFromVO(this.model,rtnmsg.data)
// console.log(this.model);
// if(this.isInDisplay){
// this.restoreDisplay()
// }
// }
// else
// {
// this.$notify.error({title: '错误',message: '服务请求失败！'});
// }
console.log("进入ditdck交易"); console.log("进入ditdck交易");
let rtnmsg = await this.init({}); let rtnmsg = await this.init(this.$route.query)
if (rtnmsg.respCode == SUCCESS) { if(rtnmsg.respCode == SUCCESS)
Utils.copyValueFromVO(this.model, rtnmsg.data); {
} else { //TODO 处理数据逻辑
this.$notify.error({ title: "错误", message: "服务请求失败！" }); console.log(rtnmsg)
Utils.copyValueFromVO(this.model,rtnmsg.data)
console.log(this.model);
if(this.isInDisplay){
this.restoreDisplay()
}
} }
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
// console.log("进入ditdck交易");
// let rtnmsg = await this.init({});
// if (rtnmsg.respCode == SUCCESS) {
// Utils.copyValueFromVO(this.model, rtnmsg.data);
// } else {
// this.$notify.error({ title: "错误", message: "服务请求失败！" });
// }
}, },
methods: { methods: {
changeShowDocpre(val) { changeShowDocpre(val) {
......
src/views/Business/Trnrel/Inftrnps.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="创建时间" style="width: 100%"> <el-form-item label="创建时间" style="width: 100%" prop="trncorco.inidatfro">
<c-col :span="11"> <c-col :span="11">
<c-date-picker <c-date-picker
type="date" type="date"
......
src/views/Business/Trnrel/Trnfnd/Inftrnps.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="创建时间" style="width: 100%"> <el-form-item label="创建时间" style="width: 100%" prop="trncorco.inidatfro">
<c-col :span="11"> <c-col :span="11">
<c-date-picker <c-date-picker
type="date" type="date"
......
src/views/Review/RefuseNode.vue deleted 100644 → 0
<template>
<div>
<el-radio-group v-model="model">
<el-radio v-for="item in nodelist" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
<p v-if="errShow" style="color: red">{{errMsg}}</p>
</div>
</template>
<script>
import Request from '~/utils/request'
export default {
props: ['txSriNo'],
data: function () {
return {
nodelist: [],
model: '',
errShow: false,
errMsg: ''
}
},
mounted: function () {
console.log('mounted')
this.getList()
},
// watch: {
// 'dialogVisible': function() {
// // if (this.dialogVisible && this.nodelist.length == 0 && this.txSriNo) {
// // this.getList()
// // }
// if (!this.dialogVisible) {
// this.errShow = false
// this.errMsg = ''
// }
// }
// },
methods: {
getList: function () {
Request.get('/v1/pm/process/taskBackQry/'+ this.txSriNo).then(res => {
if (res.code == '000000' && res.data && res.data.length > 0) {
this.nodelist = []
res.data.forEach(item => {
if (item.taskName && item.returnNodeNo) {
this.nodelist.push(
{
label: item.taskName || item.taskDesc || '',
value: item.returnNodeNo || item.taskId || ''
}
)
}
return
})
}
})
},
check: function () {
if (this.model) {
this.errShow = false
this.errMsg = ''
return this.model
} else {
this.errShow = true
this.errMsg = '请选择需要打回的节点'
return false
}
}
}
}
</script>
\ No newline at end of file
src/views/Review/btnStatusConfig.js deleted 100644 → 0
export const TaskFlagStatusMap = {
'3': { // 未完成详情
showStart: false,
showSubmit: false,
showCheck: false,
showSave: false,
showRefuse: false,
showAccRefuse: false,
showPass: false,
showReSubmit: false,
showReAcc: false,
showCheckAcc: false,
showEdit: false
},
'4': { // 已完成详情
showStart: false,
showSubmit: false,
showCheck: false,
showSave: false,
showRefuse: false,
showAccRefuse: false,
showPass: false,
showReSubmit: false,
showReAcc: false,
showCheckAcc: false,
showEdit: false
},
'5': { // 草稿箱进入
showStart: true,
showSubmit: false,
showCheck: true,
showSave: true,
showPass: false,
showRefuse: false,
showAccRefuse: false,
showReSubmit: false,
showReAcc: false,
showCheckAcc: false,
showEdit: false
}
}
export const ProcessStatusMap = {
'0': { // 受理中心经办
showStart: false,
showSubmit: true,
showCheck: true,
showSave: true,
showPass: false,
showRefuse: false,
showAccRefuse: false,
// showReSubmit: false,
showReAcc: false,
showCheckAcc: false,
showEdit: true
},
'1': { // 复核
showStart: false,
showSubmit: false,
showCheck: false,
showSave: false,
showPass: true,
showRefuse: true,
showAccRefuse: false,
// showReSubmit: false,
showReAcc: false,
showCheckAcc: false,
showEdit: false
},
'2': { // 单证中心经办
showStart: false,
showSubmit: true,
showCheck: true,
showSave: false,
showPass: false,
showRefuse: true,
showAccRefuse: false,
// showReSubmit: false,
showReAcc: false,
showCheckAcc: false,
showEdit: true
},
'3': { // 受理中心经办 打回
showStart: false,
showSubmit: true,
showCheck: true,
showSave: false,
showPass: false,
showRefuse: false,
showAccRefuse: false,
// showReSubmit: false,
showReAcc: false,
showCheckAcc: false,
showEdit: true
},
'4': { // 单证中心经办 打回
showStart: false,
showSubmit: true,
showCheck: true,
showSave: false,
showPass: false,
showRefuse: true,
showAccRefuse: false,
// showReSubmit: false,
showReAcc: false,
showCheckAcc: false,
showEdit: true
},
'5': { // 人工确认
showStart: false,
showSubmit: false,
showCheck: false,
showSave: false,
showPass: false,
showRefuse: false,
showAccRefuse: true,
// showReSubmit: true,
showReAcc: true,
showCheckAcc: true,
showEdit: false
}
}
export const NoSaveList = [
'public/refMessage/EleMessageReg'
]
\ 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