Commit d9fba1ce by 李少勇

修改一些问题

parent 69ba29b1
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
...doctre, ...doctre,
async init () { async init () {
const params = { const params = {
spt: this.toHandleRowData['row_' + this.trnName] spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
} }
const res = await Api.post('/service/gitopn/init', { const res = await Api.post('/service/gitopn/init', {
...params, ...params,
......
...@@ -375,11 +375,11 @@ export default { ...@@ -375,11 +375,11 @@ export default {
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"gidgrp.blk.exptxt":[ "gidgrp.blk.exptxt":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 780,message:"长度不能超过780"} {max: 780,message:"长度不能超过780"}
], ],
"gidgrp.blk.atxexptxt":[ "gidgrp.blk.atxexptxt":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 65,message:"长度不能超过65"}
], ],
"gidgrp.rec.inudat":[ "gidgrp.rec.inudat":[
......
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
<c-fullbox> <c-fullbox>
<c-input <c-input
v-model="model.gidgrp.con.pts.extkey" v-model="model.gidgrp.con.pts.extkey"
disabled
maxlength="16" maxlength="16"
placeholder="请输入" placeholder="请输入"
@keyup.enter.native="queryGridEtyPromptDialogData('CON', 'B')" @keyup.enter.native="queryGridEtyPromptDialogData('CON', 'B')"
......
...@@ -141,7 +141,6 @@ import Glentry from "~/components/business/glentry/views"; ...@@ -141,7 +141,6 @@ import Glentry from "~/components/business/glentry/views";
import Docpan from "~/components/business/docpan/views"; import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views"; import Doctre from "~/components/business/doctre/views";
import Limitbody from "~/components/business/limitbody/views"; import Limitbody from "~/components/business/limitbody/views";
import { mapState } from 'vuex';
export default { export default {
name: "Gitopn", name: "Gitopn",
...@@ -175,11 +174,6 @@ export default { ...@@ -175,11 +174,6 @@ export default {
"m-limitbody": Limitbody, "m-limitbody": Limitbody,
"m-aacp": Aacp, "m-aacp": Aacp,
}, },
computed: {
...mapState({
toHandleRowData: (state) => state.gitopn.toHandleRowData
})
},
provide() { provide() {
return { return {
root: this, root: this,
......
...@@ -52,14 +52,10 @@ export default { ...@@ -52,14 +52,10 @@ export default {
this.$router.push({ path: 'business-new/sptpopup', query: { inr: inr } }); this.$router.push({ path: 'business-new/sptpopup', query: { inr: inr } });
}, },
async continueEdit(row, scope) { async continueEdit(row, scope) {
this.updateToHandleRowData({ localStorage.setItem(`row_${row.frm.toLowerCase()}`, JSON.stringify(row))
...this.toHandleRowData,
[`row_${row.frm.toLowerCase()}`]: row
})
let trnName = row.frm.toLowerCase(); let trnName = row.frm.toLowerCase();
this.$router.push({ this.$router.push({
path: 'business-new/' + trnName, path: 'business-new/' + trnName,
params: { prePageId: this.model.pageId },
}); });
}, },
// pageSize改变 // pageSize改变
......
...@@ -148,15 +148,9 @@ ...@@ -148,15 +148,9 @@
<script> <script>
import Api from '~/service/Api'; import Api from '~/service/Api';
import event from '../event' import event from '../event'
import { mapMutations, mapState } from 'vuex';
export default { export default {
inject: ['root'], inject: ['root'],
props: ['model', 'codes'], props: ['model', 'codes'],
computed: {
...mapState({
toHandleRowData: (state) => state.gitopn.toHandleRowData
})
},
mixins: [event], mixins: [event],
data() { data() {
return { return {
...@@ -240,7 +234,6 @@ export default { ...@@ -240,7 +234,6 @@ export default {
]; ];
}, },
methods: { methods: {
...mapMutations(['updateToHandleRowData']),
getInidatfro() { getInidatfro() {
let datetime = new Date(); let datetime = new Date();
datetime = datetime.setDate(datetime.getDate() - 10); datetime = datetime.setDate(datetime.getDate() - 10);
......
...@@ -147,7 +147,6 @@ export default { ...@@ -147,7 +147,6 @@ export default {
const selDst = 'trncorco.trnstm'; //列表对应后台模型中的stream const selDst = 'trncorco.trnstm'; //列表对应后台模型中的stream
let params = { selDst: selDst, selIds: selIds }; let params = { selDst: selDst, selIds: selIds };
let rtnmsg = await this.executeRule('relrow', params); let rtnmsg = await this.executeRule('relrow', params);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
let errorMsg = ''; let errorMsg = '';
......
...@@ -211,7 +211,6 @@ ...@@ -211,7 +211,6 @@
watch: { watch: {
reload(val) { reload(val) {
if(val) { if(val) {
debugger
this.handleSearch() this.handleSearch()
} }
} }
......
...@@ -7,7 +7,7 @@ export default { ...@@ -7,7 +7,7 @@ export default {
let objtyp = trndocRequest.rec.objtyp; let objtyp = trndocRequest.rec.objtyp;
let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/docpan/assertTrndoc`, trndocRequest); let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/docpan/assertTrndoc`, trndocRequest);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model.docpan, rtnmsg.data); this.copyValueFromVoData(this.model.docpan, rtnmsg.data)
} }
loading.close(); loading.close();
} }
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="24" style=""> <c-col :span="24" style="">
<el-table :data="stmData.data" :columns="stmData.columns"> <el-table :data="stmData.data">
<el-table-column label="介质" width="110px"> <el-table-column label="介质" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -139,22 +139,18 @@ ...@@ -139,22 +139,18 @@
suppress suppress
" "
@click=" @click="
handleDisplay( handleDisplay(scope.row.index, scope.row)"
scope.row.index,
scope.row,
model.docpan.doceot[scope.row.idx]
)
"
style="margin-right: 10px" style="margin-right: 10px"
>预览</c-button >预览</c-button
> >
<c-button <!-- 2023.4.13临时注释,为了当次演示使用,后期详情接口做完了在放开注释联调 -->
<!-- <c-button
size="small" size="small"
type="primary" type="primary"
style="margin-left: 0" style="margin-left: 0"
@click="handleDetail(scope.row.index, scope.row)" @click="handleDetail(scope.row.index, scope.row)"
>详情</c-button >详情</c-button
> > -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -502,15 +498,7 @@ export default { ...@@ -502,15 +498,7 @@ export default {
}, },
centerDialogVisible: false, centerDialogVisible: false,
stmData: { stmData: {
columns: [ columns: [],
//注释的已改成静态
'role 收报人 70px',
'pandsc 描述 250px',
//"cortyp 类型",
//"docsnf 报文格式",
//"docuil 语言",
//"apf 传送方式"
],
data: [], data: [],
}, },
gitopn: { gitopn: {
...@@ -573,11 +561,10 @@ export default { ...@@ -573,11 +561,10 @@ export default {
} }
); );
}, },
async handleDisplay(index, row, doceot) { async handleDisplay(index, row) {
//后续要根据快照模式切换请求方式 //后续要根据快照模式切换请求方式
let cortyp = row.cortyp; let cortyp = row.cortyp;
let docuil = doceot.docuil; let docnam = row.docnam;
let docnam = doceot.docnam || '';
docnam = docnam docnam = docnam
.substr(docnam.indexOf('\\') + 1) .substr(docnam.indexOf('\\') + 1)
.toLowerCase() .toLowerCase()
......
...@@ -97,6 +97,22 @@ export default { ...@@ -97,6 +97,22 @@ export default {
}); });
this.$nextTick(() => { this.$nextTick(() => {
let isError = document.querySelectorAll('.is-error') let isError = document.querySelectorAll('.is-error')
let fields = this.$refs['modelForm'].fields
fields.map((fieldItem) => {
if (fieldItem.validateState === 'error') {
let errorComponentName = fieldItem.$options.componentName
console.log('fieldItem===', fieldItem)
// 切换tab
if (errorComponentName === 'ElTabPane') {
fieldItem.$parent.currentName = fieldItem.name
// 切换收缩框
} else if (errorComponentName === 'ElCollapseItem') {
if (fieldItem.collapse.activeNames.indexOf(fieldItem.name) < 0) {
fieldItem.collapse.activeNames.push(fieldItem.name)
}
}
}
})
isError[0].scrollIntoView({ isError[0].scrollIntoView({
block: 'center', block: 'center',
behavior: 'smooth' behavior: 'smooth'
...@@ -106,6 +122,9 @@ export default { ...@@ -106,6 +122,9 @@ export default {
}) })
}) })
}, },
showFrontendErrors () {
},
// 后端校验 // 后端校验
showBackendErrors(fieldErrors) { showBackendErrors(fieldErrors) {
// 清除之前的校验状态 // 清除之前的校验状态
...@@ -134,7 +153,7 @@ export default { ...@@ -134,7 +153,7 @@ export default {
setfeg: this.model.setmod.setfeg, setfeg: this.model.setmod.setfeg,
setglg: this.model.setmod.setglg, setglg: this.model.setmod.setglg,
doceot: this.model.docpan.doceot, doceot: this.model.docpan.doceot,
spt: this.toHandleRowData['row_' + this.trnName] || {}, spt: JSON.parse(localStorage.getItem('row_' + this.trnName)) || {},
gidgrp: this.model.gidgrp, gidgrp: this.model.gidgrp,
gitp: this.model.gitp, gitp: this.model.gitp,
} }
......
...@@ -2,11 +2,12 @@ import Api from '~/service/Api'; ...@@ -2,11 +2,12 @@ import Api from '~/service/Api';
export default { export default {
methods: { methods: {
async init() { async init() {
const params = {
spt: this.toHandleRowData,
};
const res = await Api.post('/service/gitopn/init', { const res = await Api.post('/service/gitopn/init', {
...params, trnmodVo: {
trn: {
inr: this.$route.query.trn
}
},
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
}); });
...@@ -72,8 +73,11 @@ export default { ...@@ -72,8 +73,11 @@ export default {
//处理-复核 //处理-复核
async handlePass(val) { async handlePass(val) {
let params = {}; let params = {
let rtnmsg = await Api.post('', params); transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
}
let rtnmsg = await Api.post('/service/trnrel/relrow', params);
if (rtnmsg.respCode === SUCCESS) { if (rtnmsg.respCode === SUCCESS) {
let errorMsg = ''; let errorMsg = '';
let fieldErrorsFlag = JSON.stringify(rtnmsg.fieldErrors) == '{}'; let fieldErrorsFlag = JSON.stringify(rtnmsg.fieldErrors) == '{}';
......
...@@ -247,26 +247,27 @@ export default { ...@@ -247,26 +247,27 @@ export default {
} }
}, },
}, },
created: async function () { mounted () {
console.log("进入gitopn交易"); this.init()
let params = { // console.log("进入gitopn交易");
transName: this.trnName, // let params = {
trnmodVo: { // transName: this.trnName,
trn: { // trnmodVo: {
inr: this.$route.query.trn // trn: {
} // inr: this.$route.query.trn
} // }
} // }
let res = await Api.post('/service/gitopn/init', params); // }
if (res && res.respCode == SUCCESS) { // let res = await Api.post('/service/gitopn/init', params);
this.model = res.data // if (res && res.respCode == SUCCESS) {
//TODO 处理数据逻辑 // this.model = res.data
if (this.isInDisplay) { // //TODO 处理数据逻辑
this.restoreDisplay(); // if (this.isInDisplay) {
} // this.restoreDisplay();
} else { // }
this.$notify.error({ title: "错误", message: "服务请求失败!" }); // } else {
} // this.$notify.error({ title: "错误", message: "服务请求失败!" });
// }
}, },
}; };
</script> </script>
......
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