Commit 53139194 by 李少勇

修改bug

parent c3b0ac4d
......@@ -31,23 +31,24 @@ export default {
userId: window.sessionStorage.userId || 'ZL',
});
if (rtnmsg.respCode === SUCCESS) {
this.updateValueSet(rtnmsg.codeSet);
console.log('=====校验', rtnmsg)
// this.updateValueSet(rtnmsg.codeSet);
}
if (rtnmsg.respCode === SUCCESS) {
const fieldErrors = rtnmsg.fieldErrors;
this.updateModel(rtnmsg.data);
if (fieldErrors && Object.keys(fieldErrors).length === 0) {
// 清除之前的校验状态
this.getRoot().$refs.modelForm.clearValidate();
this.$notify({
title: '成功',
message: '校验成功',
type: 'success',
});
return;
}
}
// if (rtnmsg.respCode === SUCCESS) {
// const fieldErrors = rtnmsg.fieldErrors;
// this.updateModel(rtnmsg.data);
// if (fieldErrors && Object.keys(fieldErrors).length === 0) {
// // 清除之前的校验状态
// this.getRoot().$refs.modelForm.clearValidate();
// return;
// }
// }
// this.$notify({
// title: '成功',
// message: '校验成功',
// type: 'success',
// });
loading.close();
},
// 暂存
......
......@@ -4,7 +4,7 @@ import Utils from '~/utils';
export default {
async processLiaccv(liaccvRequest) {
const loading = this.loading('正在请求数据');
let objtyp = setfegRequest.rec.objtyp;
let objtyp = liaccvRequest.rec.objtyp;
let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/liaccv/assertLiaccv`, liaccvRequest);
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model.liaccv, rtnmsg.data);
......
......@@ -33,10 +33,7 @@
</c-select>
</c-col>
<c-col :span="16">
<c-input
:readonly="true"
v-model="model.liaccv.newamt"
></c-input>
<c-input :readonly="true" v-model="model.liaccv.newamt"></c-input>
</c-col>
</c-row>
</el-form-item>
......@@ -141,13 +138,14 @@
</c-col> -->
<el-form-item label="" style="text-align: left" prop="liaccv.gleflg">
<c-col :span="7" class="">
<el-form-item
label=""
style="text-align: left"
prop="liaccv.gleflg"
class="checkbox-left"
label-width="0px"
>
<c-col :span="7" class="">
<el-form-item label="" prop="liaccv.gleflg" class="checkbox-left" label-width="0px">
<c-checkbox v-model="model.liaccv.gleflg">过账</c-checkbox>
</el-form-item>
</c-col>
......@@ -158,7 +156,7 @@
size="small"
type="primary"
@click="onLiaccvAdd"
style="margin-left: 0px;float: right;"
style="margin-left: 0px; float: right"
>
添加
</c-button>
......@@ -307,17 +305,17 @@
</c-col>
</c-col>
</div>
</template>
<script>
import Event from "../event"
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Utils from "~/utils/index";
</template>
<script>
import Event from '../event';
import Api from '~/service/Api';
import commonProcess from '~/mixin/commonProcess';
import CodeTable from '~/config/CodeTable';
import Utils from '~/utils/index';
export default {
inject: ["root"],
props: ["model", "codes"],
export default {
inject: ['root'],
props: ['model', 'codes'],
mixins: [commonProcess],
data() {
return {
......@@ -326,41 +324,41 @@
columns: [
{
label: '编号',
prop: 'ownref'
prop: 'ownref',
},
{
label: '用户',
prop: 'ownusr'
prop: 'ownusr',
},
{
label: '申请人',
prop: 'aplnam',
width: 180
width: 180,
},
{
label: '账户',
prop: 'engact'
prop: 'engact',
},
{
label: '币种',
prop: 'cur'
prop: 'cur',
},
{
label: '金额',
prop: 'amt'
prop: 'amt',
},
{
label: '开立日期',
prop: 'opndat'
prop: 'opndat',
},
{
label: '标志',
prop: 'gleflg'
prop: 'gleflg',
},
{
label: '备注',
prop: 'reason'
}
prop: 'reason',
},
],
data: [],
},
......@@ -370,7 +368,7 @@
methods: {
...Event,
async onLiaccvAdd() {
let rulePath = "/service/liaccv/getFcdList";
let rulePath = '/service/liaccv/getFcdList';
let liaccvRequest = this.buildLiaccv(this.root);
let rtnmsg = await Api.post(rulePath, liaccvRequest);
if (rtnmsg.respCode == SUCCESS) {
......@@ -379,7 +377,7 @@
}
},
async pickDepItem(idx, row) {
let rulePath = "/service/liaccv/addLiaccvg";
let rulePath = '/service/liaccv/addLiaccvg';
let liaccvRequest = this.buildLiaccv(this.root);
liaccvRequest.fcdVo = row;
let rtnmsg = await Api.post(rulePath, liaccvRequest);
......@@ -390,27 +388,24 @@
},
async onLiaccvDel(index, row) {
let fcdVo = {
inr : row.fcdinr
}
let rulePath = "/service/liaccv/deleteLiaccvg";
inr: row.fcdinr,
};
let rulePath = '/service/liaccv/deleteLiaccvg';
let liaccvRequest = this.buildLiaccv(this.root);
liaccvRequest.fcdVo = fcdVo;
let rtnmsg = await Api.post(rulePath, liaccvRequest);
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model.liaccv, rtnmsg.data);
this.$message({
type: "success",
message: "删除成功!",
type: 'success',
message: '删除成功!',
});
} else {
this.$notify.error({ title: "错误", message: "服务请求失败!" });
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
},
created: function () {},
};
</script>
<style>
</style>
\ No newline at end of file
};
</script>
<style></style>
......@@ -4,7 +4,7 @@ import Utils from '~/utils';
export default {
async processTrndoc(trndocRequest) {
const loading = this.loading('正在请求数据')
let objtyp = setfegRequest.rec.objtyp;
let objtyp = trndocRequest.rec.objtyp;
let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/docpan/assertTrndoc`, trndocRequest);
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model.docpan, rtnmsg.data);
......
......@@ -4,7 +4,7 @@ import Utils from '~/utils';
export default {
async processLiaall(liaallRequest) {
const loading = this.loading('正在请求数据')
let objtyp = setfegRequest.rec.objtyp;
let objtyp = liaallRequest.rec.objtyp;
let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/liaall/assertLiaall`, liaallRequest);
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model.liaall, rtnmsg.data);
......
......@@ -88,7 +88,7 @@
label-width="0"
:prop="'liaall.liaallg.' + scope.$index + '.acc'"
>
{{scope.row.acc}}
{{ scope.row.acc }}
<!-- <c-input
v-model="scope.row.acc"
style="width: 100%"
......@@ -103,7 +103,13 @@
{{ dateFormat(scope.row.valdat) }}
</template>
</el-table-column>
<el-table-column label="" prop="det" width="150px" height="0px" fixed="right" >
<el-table-column
label=""
prop="det"
width="150px"
height="0px"
fixed="right"
>
<template slot-scope="scope" slot="header">
<c-button
circle
......@@ -172,7 +178,7 @@
placeholder=""
></c-input>
<c-input
style="width: 40%;margin-left:10px;"
style="width: 40%; margin-left: 10px"
disabled
v-model="model.liaall.misamt"
placeholder="请输入金额"
......@@ -219,18 +225,18 @@
</div>
</template>
<script>
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import EngpDialog from "./dialog.vue";
import Api from '~/service/Api';
import commonProcess from '~/mixin/commonProcess';
import CodeTable from '~/config/CodeTable';
import EngpDialog from './dialog.vue';
export default {
inject: ["root"],
inject: ['root'],
components: {
EngpDialog
EngpDialog,
},
mixins: [commonProcess],
props: ["model", "codes"],
props: ['model', 'codes'],
data() {
return {
dialogVisible: false,
......@@ -240,17 +246,17 @@ export default {
},
methods: {
async onLiaallButmisamt() {
let rtnmsg = await this.executeRule("liaall_butmisamt");
let rtnmsg = await this.executeRule('liaall_butmisamt');
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
} else {
this.$notify.error({ title: "错误", message: "服务请求失败!" });
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
detail1(index, row) {
const that = this;
const rule = "liaall.liaallg(" + (index + 1) + ").det";
const rule = 'liaall.liaallg(' + (index + 1) + ').det';
that.executeRule(rule).then((res) => {
that.$refs.engpDialog.visiable = true;
that.$refs.engpDialog.formData = Object.assign(
......@@ -265,5 +271,4 @@ export default {
created: function () {},
};
</script>
<style>
</style>
<style></style>
......@@ -3,7 +3,7 @@ import Api from '~/service/Api';
export default {
async processGlentry(glentryRequest) {
const loading = this.loading('正在请求数据')
let objtyp = setfegRequest.rec.objtyp;
let objtyp = glentryRequest.rec.objtyp;
let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/gle/assertGle`, glentryRequest);
if (rtnmsg.respCode == SUCCESS) {
this.model.setmod.glemod.gleshwstm = rtnmsg.data.gleshwstm;
......
......@@ -6,50 +6,43 @@
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Api from '~/service/Api';
import commonProcess from '~/mixin/commonProcess';
import CodeTable from '~/config/CodeTable';
export default {
inject: ['root'],
mixins: [commonProcess],
props:["model","codes"],
data(){
props: ['model', 'codes'],
data() {
return {
columns: [
"2 1 \"借/贷\" 80 1 0",
"6 2 \"账号\" 200",
"3 3 \"币种\" 70",
"4 4 \"金额\" 150 2 8:1 2 5",
"5 5 \"起息日\" 150",
"7 6 \"牌价类型\" 100",
"8 7 \"牌价\" 100 2 0 1 0",
"9 8 \"会计科目\" 100",
"0 9 \"分录序号\" 100 1 0"
'2 1 "借/贷" 80 1 0',
'6 2 "账号" 200',
'3 3 "币种" 70',
'4 4 "金额" 150 2 8:1 2 5',
'5 5 "起息日" 150',
'7 6 "牌价类型" 100',
'8 7 "牌价" 100 2 0 1 0',
'9 8 "会计科目" 100',
'0 9 "分录序号" 100 1 0',
],
data: [
]
}
data: [],
};
},
watch: {
//this.$refs.glepan.stmData.data = res.data.setmod_glemod_gleshwstm.rows;
'model.setmod.glemod.gleshwstm': {
handler(val, oldVal) {
if (val.rows) {
this.data = val.rows
this.data = val.rows;
}
},
immediate: true
}
immediate: true,
},
methods:{
},
created:function(){
}
}
methods: {},
created: function () {},
};
</script>
<style>
</style>
<style></style>
......@@ -273,7 +273,11 @@
<c-col :span="16">
<c-col :span="18">
<el-form-item label="费用">
<c-select v-model="dialog.cur" style="width: 100%" :code="codes.curtxt1">
<c-select
v-model="dialog.cur"
style="width: 100%"
:code="codes.curtxt1"
>
<!-- <el-option
v-for="item in codes.cur"
:key="item.value"
......@@ -461,7 +465,7 @@
<c-col :span="24" style="height: 24px; margin-top: 25px">
<el-form-item class="formItemLabel" label="结算:" label-width="48px">
<span style="color: red">{{
this.model.setmod.dspflg == "C" ? "temporary" : ""
this.model.setmod.dspflg == 'C' ? 'temporary' : ''
}}</span>
</el-form-item>
</c-col>
......@@ -510,7 +514,11 @@
</el-table-column>
<el-table-column label="处理方式" width="110px" prop="dsp">
<template #default="scope">
<c-select v-model="scope.row.dsp" @change="dspChange(scope.$index)" v-if="scope.row.debcdtflg=='D'">
<c-select
v-model="scope.row.dsp"
@change="dspChange(scope.$index)"
v-if="scope.row.debcdtflg == 'D'"
>
<el-option
v-for="item in codes.setgll_dsp2"
:key="item.value"
......@@ -523,7 +531,11 @@
}}</span>
</el-option>
</c-select>
<c-select v-model="scope.row.dsp" @change="dspChange(scope.$index)" v-if="scope.row.debcdtflg=='C'">
<c-select
v-model="scope.row.dsp"
@change="dspChange(scope.$index)"
v-if="scope.row.debcdtflg == 'C'"
>
<el-option
v-for="item in codes.setgll_dsp1"
:key="item.value"
......@@ -557,7 +569,6 @@
</template>
</el-table-column>
<el-table-column label="借/贷" prop="debcdtflg" width="70px">
</el-table-column>
<el-table-column label="原始币种" prop="cur" width="70px">
</el-table-column>
......@@ -1351,41 +1362,41 @@
</template>
<script>
// import Event from "~/model/Ditopn/Event";
import commonProcess from "~/mixin/commonProcess";
import SetpanDialog from "./dialog.vue";
import Utils from "~/utils/index";
import commonProcess from '~/mixin/commonProcess';
import SetpanDialog from './dialog.vue';
import Utils from '~/utils/index';
export default {
inject: ["root"],
inject: ['root'],
components: { SetpanDialog },
props: ["model", "codes"],
props: ['model', 'codes'],
mixins: [commonProcess],
data() {
return {
dialogVisible: false,
dialog: {
payee: "",
ptydbt: "",
txtpay: "",
txtdbt: "",
CG00005: "",
payee: '',
ptydbt: '',
txtpay: '',
txtdbt: '',
CG00005: '',
},
newdialog: {
payee: "",
ptydbt: "",
txtpay: "",
txtdbt: "",
CG00005: "",
payee: '',
ptydbt: '',
txtpay: '',
txtdbt: '',
CG00005: '',
},
dialog2: {
feetxtinf: "",
feetxt: "",
feetxtinf: '',
feetxt: '',
},
index: 0,
detpDialogVisible: false,
rattyp: "",
dcbrattyp: "",
scbrattyp: "",
rattyp: '',
dcbrattyp: '',
scbrattyp: '',
dialog3: {
setgrp: {
act: {
......@@ -1403,12 +1414,12 @@ export default {
};
},
watch: {
"model.setmod.setglg.setgll": {
'model.setmod.setglg.setgll': {
handler(val, oldVal) {
var stm = [];
for (let i = 0; i < val.length; i++) {
if (val[i].rol != "") {
val[i]["idx"] = i;
if (val[i].rol != '') {
val[i]['idx'] = i;
stm.push(val[i]);
}
}
......@@ -1442,7 +1453,7 @@ export default {
this.defaultFunction();
},
detail1(index, row) {
this.executeDefault("setfel.det").then((res) => {
this.executeDefault('setfel.det').then((res) => {
this.index = index;
this.dialogVisible = true;
this.dialog = row;
......@@ -1456,7 +1467,7 @@ export default {
// 第二个表格
detail2(index, row) {
const that = this;
const rule = "setmod.setfeg.setfel(" + (index + 1) + ").det";
const rule = 'setmod.setfeg.setfel(' + (index + 1) + ').det';
that.executeRule(rule).then((res) => {
that.index = index;
that.$refs.setpanDialog.visiable = true;
......@@ -1472,7 +1483,7 @@ export default {
},
async handleDetail(index, row) {
const that = this;
const rule = "setmod.setglg.setgll(" + (index + 1) + ").det";
const rule = 'setmod.setglg.setgll(' + (index + 1) + ').det';
let rtnmsg = await this.executeRule(rule);
if (rtnmsg.respCode == SUCCESS) {
that.index = index;
......@@ -1491,14 +1502,14 @@ export default {
}
},
strCalCode(str, code) {
var result = "";
var result = '';
for (let i = 0; i < code.length; i++) {
if (code[i].value === str) {
result = code[i].label;
continue;
}
}
if (result === "") {
if (result === '') {
return str;
} else {
return result;
......@@ -1511,22 +1522,22 @@ export default {
onSetgllCtysel() {},
onSetgllDetget() {},
async onSetmodDet() {
let rtnmsg = await this.executeRule("setmod.det");
let rtnmsg = await this.executeRule('setmod.det');
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
} else {
this.$notify.error({ title: "错误", message: "服务请求失败!" });
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async accucrChange(index) {
let rtnmsg = await this.executeRule(
"setmod.setglg.setgll(" + (index + 1) + ").acccur"
'setmod.setglg.setgll(' + (index + 1) + ').acccur'
);
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.$nextTick(() => {
this.executeRule("setmod.glemod.glepan").then((res) => {
this.executeRule('setmod.glemod.glepan').then((res) => {
//TODO 处理数据逻辑
if (res.respCode == SUCCESS) this.updateModel(res.data);
});
......@@ -1535,13 +1546,13 @@ export default {
},
async fmtaccamtChange(index) {
let rtnmsg = await this.executeRule(
"setmod.setglg.setgll(" + (index + 1) + ").fmtaccamt"
'setmod.setglg.setgll(' + (index + 1) + ').fmtaccamt'
);
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.$nextTick(() => {
this.executeRule("setmod.glemod.glepan").then((res) => {
this.executeRule('setmod.glemod.glepan').then((res) => {
//TODO 处理数据逻辑
if (res.respCode == SUCCESS) this.updateModel(res.data);
});
......@@ -1550,13 +1561,13 @@ export default {
},
async dspChange(index) {
let rtnmsg = await this.executeDefault(
"setmod.setglg.setgll(" + (index + 1) + ").dsp"
'setmod.setglg.setgll(' + (index + 1) + ').dsp'
);
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.$nextTick(() => {
this.executeRule("setmod.glemod.glepan").then((res) => {
this.executeRule('setmod.glemod.glepan').then((res) => {
//TODO 处理数据逻辑
if (res.respCode == SUCCESS) this.updateModel(res.data);
});
......@@ -1568,10 +1579,10 @@ export default {
computed: {
modifyflg: {
get() {
return this.dialog3.modifyflg === "X";
return this.dialog3.modifyflg === 'X';
},
set(val) {
this.dialog3.modifyflg = val ? "X" : "";
this.dialog3.modifyflg = val ? 'X' : '';
},
},
},
......
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