diff --git a/src/mixin/commonApi.js b/src/mixin/commonApi.js
index 033c9ae..99b87a7 100644
--- a/src/mixin/commonApi.js
+++ b/src/mixin/commonApi.js
@@ -10,41 +10,28 @@ export default {
},
methods:{
init(params){
- params = params||{}
return Api.post(this.declareParams.trnName+"/init",{params})
},
save(params){
- params = params||{}
- let data = Utils.flatObject(this.model)
- return Api.post(this.declareParams.trnName+"/saveData",{...data,params})
+ return Api.post(this.declareParams.trnName+"/saveData", Utils.getRequestDataFn.call(this, params))
},
exeuteCheck(rulePath,params){
- params = params||{}
- let data = Utils.flatObject(this.model)
- return Api.post(this.declareParams.trnName+"/executeCheck/"+rulePath,{...data,params})
+ return Api.post(this.declareParams.trnName+"/executeCheck/"+rulePath, Utils.getRequestDataFn.call(this, params))
},
executeDefault(rulePath,params)
{
- params = params||{}
- let data = Utils.flatObject(this.model)
- return Api.post(this.declareParams.trnName+"/executeDefault/"+rulePath,{...data,params})
+ return Api.post(this.declareParams.trnName+"/executeDefault/"+rulePath, Utils.getRequestDataFn.call(this, params))
},
executeRule(rulePath,params)
{
- params = params||{}
- let data = Utils.flatObject(this.model)
- return Api.post(this.declareParams.trnName+"/executeRule/"+rulePath,{...data,params})
+ return Api.post(this.declareParams.trnName+"/executeRule/"+rulePath, Utils.getRequestDataFn.call(this, params))
},
async checkAll(params){
- params = params||{}
- let data = Utils.flatObject(this.model)
- const res = await Api.post(this.declareParams.trnName+"/checkAll",{...data,params})
+ const res = await Api.post(this.declareParams.trnName+"/checkAll", Utils.getRequestDataFn.call(this, params))
return res
},
pedding(params){
- params = params||{}
- let data = Utils.flatObject(this.model)
- return Api.post(this.declareParams.trnName+"/pending",{...data,params})
+ return Api.post(this.declareParams.trnName+"/pending", Utils.getRequestDataFn.call(this, params))
},
async restoreDisplay()
{
diff --git a/src/model/Ditopn/Event.js b/src/model/Ditopn/Event.js
index 590625b..ae35a1b 100644
--- a/src/model/Ditopn/Event.js
+++ b/src/model/Ditopn/Event.js
@@ -2,7 +2,7 @@ import Api from "~/service/Api"
import Utils from "~/utils/index"
export default {
async onDitpButgetref() {
- let rtnmsg = await Api.post("ditopn/executeRule/ditp.butgetref", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/executeRule/ditp.butgetref", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
const ownref = rtnmsg.data.didgrp_rec_ownref
@@ -35,7 +35,7 @@ export default {
}
},
async onAplpDet() {
- let rtnmsg = await Api.post("ditopn/executeRule/ditp.aplp.det", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/executeRule/ditp.aplp.det", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
// console.log(rtnmsg.data);
@@ -48,7 +48,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/benp_det", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/benp_det", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -62,7 +62,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/revclause_buttxmsel", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/revclause_buttxmsel", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -76,7 +76,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/lcrgod_buttxmsel", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/lcrgod_buttxmsel", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -90,7 +90,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/lcrdoc_buttxmsel", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/lcrdoc_buttxmsel", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -104,7 +104,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/adlcnd_buttxmsel", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/adlcnd_buttxmsel", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -118,7 +118,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/insbnk_buttxmsel", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/insbnk_buttxmsel", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -132,7 +132,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/rmbp_det", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/rmbp_det", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -146,7 +146,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/defdet_buttxmsel", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/defdet_buttxmsel", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -160,7 +160,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/preper_buttxmsel", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/preper_buttxmsel", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -174,7 +174,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/setmod_det", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/setmod_det", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -188,7 +188,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/liaall_butmisamt", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/liaall_butmisamt", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -202,7 +202,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/liaall_butmissig", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/liaall_butmissig", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -216,7 +216,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/wrkp_det", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/wrkp_det", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -230,7 +230,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/othp_det", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/othp_det", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -244,7 +244,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/limpts_get1", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/limpts_get1", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -258,7 +258,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/limpts_get2", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/limpts_get2", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -272,7 +272,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/limmod_trycal", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/limmod_trycal", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -286,7 +286,7 @@ export default {
// this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
// if (!valid)
// return;
- // let rtnmsg = await Api.post("ditopn/liaccv_add", Utils.flatObject(this.model))
+ // let rtnmsg = await Api.post("ditopn/liaccv_add", Utils.getRequestDataFn.call(this))
// if (rtnmsg.respCode == "AAAAAA") {
// //TODO 处理数据逻辑
@@ -295,7 +295,7 @@ export default {
// this.$notify.error({ title: '错误', message: '服务请求失败！' });
// }
// })
- let rtnmsg = await Api.post("ditopn/executeRule/liaall.liaccv.add", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/executeRule/liaall.liaccv.add", Utils.getRequestDataFn.call(this))
//const that = this.$parent.$parent.$parent.$parent;
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -313,7 +313,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("ditopn/liaccv_del", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/liaccv_del", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -331,14 +331,14 @@ export default {
let rtnmsg
if (cortyp == 'SWT'|| cortyp == 'FMT' || cortyp == 'CMT') {
this.model.setmod.msgmod.doccod = row.id
- rtnmsg = await Api.post('cptopn/msgmod_butshw', { data: Utils.flatObject(this.model) })
+ rtnmsg = await Api.post('cptopn/msgmod_butshw', { data: Utils.getRequestDataFn.call(this) })
} else {
this.model.trnmod.trndoc.doccod = row.id
this.model.trnmod.trndoc.cortyp = cortyp
const params = {
index: index
}
- rtnmsg = await Api.post("ditopn/executeDocpan", { ...Utils.flatObject(this.model), params })
+ rtnmsg = await Api.post("ditopn/executeDocpan", { ...Utils.getRequestDataFn.call(this), params })
}
if (rtnmsg.respCode == "AAAAAA") {
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
@@ -393,7 +393,7 @@ export default {
const params = {
index: index
}
- let rtnmsg = await Api.post("ditopn/executeDocpanDetail", { ...Utils.flatObject(this.model), params })
+ let rtnmsg = await Api.post("ditopn/executeDocpanDetail", { ...Utils.getRequestDataFn.call(this), params })
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
this.title = row.pandsc
@@ -403,21 +403,21 @@ export default {
}
},
async BlurBennam(e){
- let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark
}
},
async BlurAplname(e){
- let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark
}
},
async BlurSignam(e){
- let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark
@@ -429,7 +429,7 @@ export default {
async pickDepItem(row){
var params = {'selsptinr':row[0]};
//{params:{'selsptinr':row[0]}}
- let rtnmsg = await Api.post("ditopn/executeRule/liaall.liaccv.add",{...Utils.flatObject(this.model),params})
+ let rtnmsg = await Api.post("ditopn/executeRule/liaall.liaccv.add",{...Utils.getRequestDataFn.call(this),params})
if (rtnmsg.respCode == "AAAAAA") {
this.dialogTableVisible = false;
Utils.copyValueFromVO(this.model,rtnmsg.data);
diff --git a/src/model/Sptsel/Event.js b/src/model/Sptsel/Event.js
index 715c924..d3516e4 100644
--- a/src/model/Sptsel/Event.js
+++ b/src/model/Sptsel/Event.js
@@ -5,7 +5,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("sptsel/usfmod_shwflt", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("sptsel/usfmod_shwflt", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -19,7 +19,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("sptsel/butypt", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("sptsel/butypt", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -33,7 +33,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("sptsel/dlmft", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("sptsel/dlmft", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -47,7 +47,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("sptsel/dlaxq", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("sptsel/dlaxq", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -61,7 +61,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("sptsel/butimg", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("sptsel/butimg", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
diff --git a/src/model/Trnrel/Default.js b/src/model/Trnrel/Default.js
index f99e1d2..3e49cb1 100644
--- a/src/model/Trnrel/Default.js
+++ b/src/model/Trnrel/Default.js
@@ -56,7 +56,7 @@ function defaultTrnInfdsp() {
}
function defaultRecpanIncben() {
}
-async function defaultUsrcon() {
+function defaultUsrcon() {
const that = this;
that.executeDefault("usrcon").then(res => {
this.model.usrcon = res.data.usrcon;
@@ -76,7 +76,7 @@ function defaultImgmodNewhisimg() {
}
function defaultRecpanCpltxt() {
}
-async function defaultTrncorcoDflg() {
+function defaultTrncorcoDflg() {
const that = this;
that.executeDefault("trncorco.dflg").then(res => {
that.model.trncorco.dflg = res.data.trncorco_dflg;
@@ -86,7 +86,7 @@ function defaultOrddsp() {
}
function defaultRecpanUsrExtkey() {
}
-async function defaultAtptxt() {
+function defaultAtptxt() {
const that = this;
that.executeDefault("atptxt").then(res => {
that.model.atptxt = res.data.atptxt;
diff --git a/src/model/Trnrel/Event.js b/src/model/Trnrel/Event.js
index f359902..ea22396 100644
--- a/src/model/Trnrel/Event.js
+++ b/src/model/Trnrel/Event.js
@@ -11,7 +11,7 @@ export default {
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm;
})
- // let rtnmsg = await Api.post("trnrel/executeRule/searow", Utils.flatObject(this.model))
+ // let rtnmsg = await Api.post("trnrel/executeRule/searow", Utils.getRequestDataFn.call(this))
// if (rtnmsg.respCode == "AAAAAA") {
// //TODO 处理数据逻辑
// this.stmData.data = rtnmsg.data.trncorco_trnstm.rows;
@@ -36,7 +36,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/seactr", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/seactr", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -51,7 +51,7 @@ export default {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/searow", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/searow", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -65,7 +65,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/dsp", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/dsp", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -79,7 +79,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/imgmod_newimg", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/imgmod_newimg", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -93,7 +93,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/imgmod_newhisimg", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/imgmod_newhisimg", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -107,7 +107,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/diacon_butdia", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/diacon_butdia", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -121,7 +121,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/imgmod_hisimg", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/imgmod_hisimg", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -139,7 +139,7 @@ export default {
that.model.trncorco.selinr = {
"rows": that.multipleSelection.map(idx => that.model.trncorco.trnstm.rows[idx])
}
- const data = Utils.flatObject(this.model)
+ const data = Utils.getRequestDataFn.call(this)
let rtnmsg = await Api.post("/trnrel/executeRule/relrow", data)
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -169,7 +169,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/printe", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/printe", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -183,7 +183,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/reprow", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/reprow", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -201,7 +201,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
// if (!valid)
// return;
- let rtnmsg = await Api.post("trnrel/rejrow", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/rejrow", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
var cacheFileName = rtnmsg.data.cacheFileName;
@@ -225,7 +225,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/relcor", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/relcor", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -239,7 +239,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/exi", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/exi", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -254,7 +254,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/recpan_det", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/recpan_det", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -268,7 +268,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/syswrn_butshw", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/syswrn_butshw", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -282,7 +282,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/recpan_notmap", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/recpan_notmap", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -296,7 +296,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/recpan_butspt", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/recpan_butspt", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -310,7 +310,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/recpan_inc", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/recpan_inc", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -324,7 +324,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/recpan_butord", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/recpan_butord", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -338,7 +338,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/imgmod_image", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/imgmod_image", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -352,7 +352,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/recpan_incben", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/recpan_incben", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
@@ -366,7 +366,7 @@ export default {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
- let rtnmsg = await Api.post("trnrel/inftxt_buttxmsel", Utils.flatObject(this.model))
+ let rtnmsg = await Api.post("trnrel/inftxt_buttxmsel", Utils.getRequestDataFn.call(this))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
diff --git a/src/service/Api.js b/src/service/Api.js
index 7d119c5..7ea8475 100644
--- a/src/service/Api.js
+++ b/src/service/Api.js
@@ -1,5 +1,6 @@
import axios from 'axios'
import { MessageBox } from 'element-ui'
+import RequestManager from './RequestManager.js';
export const BASE_HOST = "/gjjs/"
export const BASE_URI=BASE_HOST+"";
@@ -13,6 +14,8 @@ const instance = axios.create({
const CODE_KEY = "respCode"
const MESSAGE_KEY = "respMsg"
+const requestManager = new RequestManager()
+
export default class Api
{
static pget(url,data)
@@ -56,17 +59,20 @@ export default class Api
})
}
- static logout(){
+ static logout(){
console.log('asdasdasdasdasd')
window.location.href="#/login";
}
- static _post(url,data,method="post")
- {
+ static async _post(url,data,method="post")
+ {
let token = window.sessionStorage.token
let userId = window.sessionStorage.userId
let headers = {userId,token,"terminal":"WEB"};
if(url!= `${BASE_URI}login` && token)
headers.token = token;
+ if (typeof data === "function") {
+ data = await data()
+ }
return new Promise( (resolve, reject) =>{
axios.post(url,data,{
headers,
@@ -119,16 +125,17 @@ export default class Api
}
static _get(url,data)
{
-
- return this._post(url,data,"get");
+ // return this._post(url,data,"get");
+ return requestManager.pushRequest(this._post.bind(this, BASE_URI+url, data, "get"))
}
static post(url,data)
{
- return this._post(BASE_URI+url,data)
+ // return this._post(BASE_URI+url,data)
+ return requestManager.pushRequest(this._post.bind(this, BASE_URI+url, data))
}
static get(url,data)
{
- return this._get(BASE_HOST+url,data)
+ return this._get(BASE_HOST+url,data)
}
}
\ No newline at end of file
diff --git a/src/service/RequestManager.js b/src/service/RequestManager.js
new file mode 100644
index 0000000..6c6227d
--- /dev/null
+++ b/src/service/RequestManager.js
@@ -0,0 +1,34 @@
+class RequestManager {
+ constructor() {
+ // 并发请求数
+ this.concurrency = 1;
+ this.running = 0;
+ this.requestQueue = [];
+ }
+
+ async pushRequest(request) {
+ if (this.running >= this.concurrency) {
+ // resolve()未被执行之前，当前request会在这里await
+ await new Promise(resolve => this.requestQueue.push(resolve));
+ }
+ return this._handleRequest(request);
+ }
+
+ async _handleRequest(request) {
+ this.running++;
+ try {
+ return await request();
+ } catch (error) {
+ return Promise.reject(error)
+ } finally {
+ this.running--;
+ if (this.requestQueue.length > 0) {
+ // 执行下一个resolve
+ this.requestQueue[0]();
+ this.requestQueue.shift();
+ }
+ }
+ }
+}
+
+export default RequestManager
\ No newline at end of file
diff --git a/src/utils/index.js b/src/utils/index.js
index 5d36247..593f6ed 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -141,4 +141,20 @@ export default class Utils {
return output.join('');
}
+
+ static getRequestDataFn(params) {
+ params = params||{}
+ const fn = async () => {
+ const that = this;
+ const data = await new Promise(resolve => {
+ // 保证前一次请求结果赋值VO完成
+ setTimeout(() => {
+ const d = Utils.flatObject(that.model)
+ resolve(d)
+ }, 0)
+ })
+ return {...data, params}
+ }
+ return fn;
+ }
}
\ No newline at end of file
diff --git a/src/views/Business/Ditopn/Detp.vue b/src/views/Business/Ditopn/Detp.vue
index 9ffd032..5aea3ff 100644
--- a/src/views/Business/Ditopn/Detp.vue
+++ b/src/views/Business/Ditopn/Detp.vue
@@ -148,7 +148,7 @@ export default {
this.model.didgrp.rec.tenmaxday = 0;
this.model.didgrp.blk.defdet = "";
}
- const arg = Utils.flatObject(this.model);
+ const arg = Utils.getRequestDataFn.call(this);
Api.post("ditopn/executeCheck/didgrp.rec.avbby", arg).then(
(res) => {
if (res.respCode == "AAAAAA"){
@@ -158,7 +158,7 @@ export default {
);
},
recTenmaxdayEvent(){
- const arg = Utils.flatObject(this.model);
+ const arg = Utils.getRequestDataFn.call(this);
Api.post("ditopn/executeDefault/didgrp.rec.tenmaxday", arg).then(
(res) => {
if (res.respCode = "AAAAAA"){
diff --git a/src/views/Business/Ditopn/Docpan.vue b/src/views/Business/Ditopn/Docpan.vue
index 51d1462..4cfe44f 100644
--- a/src/views/Business/Ditopn/Docpan.vue
+++ b/src/views/Business/Ditopn/Docpan.vue
@@ -516,7 +516,7 @@ export default {
this.model.trnmod.trndoc.doceot.splice(this.index, 1, this.dialog);
let res = Api.post(
"ditopn/executeRule/trnmod.trndoc.doccur.butaddok",
- Utils.flatObject(this.model)
+ Utils.getRequestDataFn.call(this)
);
if(res.data.respCode=="AAAAAA"){
//TODO
diff --git a/src/views/Business/Ditopn/Ovwp.vue b/src/views/Business/Ditopn/Ovwp.vue
index d119866..860f47a 100644
--- a/src/views/Business/Ditopn/Ovwp.vue
+++ b/src/views/Business/Ditopn/Ovwp.vue
@@ -711,8 +711,7 @@ export default {
methods: {
...Event,
aplExtkeyEvent() {
- const data = Utils.flatObject(this.model);
- Api.post("ditopn/executeRule/didgrp.apl.pts.extkey", data).then(
+ Api.post("ditopn/executeRule/didgrp.apl.pts.extkey", Utils.getRequestDataFn.call(this)).then(
(res) => {
if (res.respCode = "AAAAAA"){
//失去焦点，避免多次触发
@@ -724,8 +723,7 @@ export default {
);
},
benExtkeyEvent() {
- const data = Utils.flatObject(this.model);
- Api.post("ditopn/executeRule/didgrp.ben.pts.extkey", data).then(
+ Api.post("ditopn/executeRule/didgrp.ben.pts.extkey", Utils.getRequestDataFn.call(this)).then(
(res) => {
if (res.respCode = "AAAAAA"){
Utils.copyValueFromVO(this.model, res.data);
@@ -734,12 +732,12 @@ export default {
);
},
banknoEvent() {
- const data = Utils.flatObject(this.model);
- var temp = this.model.didgrp.beb.pts.bankno;
- if (temp.length < 6){
- return;
- }
- Api.post("ditopn/executeRule/didgrp.beb.pts.bankno", data).then(
+ // const data = Utils.flatObject(this.model);
+ // var temp = this.model.didgrp.beb.pts.bankno;
+ // if (temp.length < 6){
+ // return;
+ // }
+ Api.post("ditopn/executeRule/didgrp.beb.pts.bankno", Utils.getRequestDataFn.call(this)).then(
(res) => {
if (res.respCode = "AAAAAA"){
if (JSON.stringify(res.fieldErrors) != '{}'){
@@ -768,7 +766,7 @@ export default {
},
nom1CurEvent(){
const data = Utils.flatObject(this.model);
- Api.post("ditopn/executeDefault/didgrp.cbs.nom1.cur", data).then(
+ Api.post("ditopn/executeDefault/didgrp.cbs.nom1.cur", Utils.getRequestDataFn.call(this)).then(
(res) => {
if (res.respCode = "AAAAAA"){
Utils.copyValueFromVO(this.model, res.data);
diff --git a/src/views/Business/Office/index.vue b/src/views/Business/Office/index.vue
index 031fad6..56b9b15 100644
--- a/src/views/Business/Office/index.vue
+++ b/src/views/Business/Office/index.vue
@@ -1,5 +1,5 @@
<template>
-<el-form :model="model" :rules="rules" ref="modelForm" label-width="100px" size="small" style="height:100%;">
+<el-form :model="model" :rules="rules" ref="modelForm" label-width="100px" size="small" style="height:100%;" :validate-on-rule-change="false">
<el-container style="height:100%;">
<el-main style="padding:0">
@@ -188,7 +188,7 @@ export default {
console.log("进入office交易");
if(1) return
- let rtnmsg = await Api.post("office/init",{params:{}})
+ let rtnmsg = await Api.post("office/init",Utils.getRequestDataFn.call(this, {}))
console.log(rtnmsg)
if(rtnmsg.code == SUCCESS)
{
diff --git a/src/views/Business/Sptsel/index.vue b/src/views/Business/Sptsel/index.vue
index 8bc446b..c0cf06e 100644
--- a/src/views/Business/Sptsel/index.vue
+++ b/src/views/Business/Sptsel/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="eContainer">
- <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small">
+ <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small" :validate-on-rule-change="false">
<el-tabs ref="elment" type="border-card" @tab-click="tabClick">
<el-tab-pane label="待办任务查询">
<m-menu :model="model" :codes="codes" ref="Menu"/>
diff --git a/src/views/Business/Trnrel/index.vue b/src/views/Business/Trnrel/index.vue
index 0442123..0e4f7a4 100644
--- a/src/views/Business/Trnrel/index.vue
+++ b/src/views/Business/Trnrel/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="eContainer">
- <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small">
+ <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" :validate-on-rule-change="false" label-width="170px" size="small">
<el-tabs ref="elment" type="border-card" @tab-click="tabClick">
<el-tab-pane label="复核夹查询">
<m-inftrnps :model="model" :codes="codes" ref="inftrnps" />