Skip to content

V
vue-gjjs
Commit 60f0517d by Wuyuqiu
Options

bftdcr、bftdrv、bftsnd交易bug提交

parent 7586ae0a
Showing with 109 additions and 306 deletions
src/config/CodeTable/index.js
......@@ -33432,6 +33432,20 @@ const CodeTable = {
],
seagtyp:[
{ label: "农民工工资保函", value: "1" },
],
prsdoc:[
{ label: "增值税发票", value: "增值税发票" },
{ label: "发票", value: "发票" },
{ label: "装箱单", value: "装箱单" },
{ label: "空运单", value: "空运单" },
{ label: "海运提单", value: "海运提单" },
{ label: "铁路运单", value: "铁路运单" },
{ label: "货物收据", value: "货物收据" },
{ label: "邮政收据", value: "邮政收据" },
{ label: "出库单", value: "出库单" },
{ label: "保险单", value: "保险单" },
{ label: "质检证", value: "质检证" },
{ label: "受益人证明", value: "受益人证明" },
]
}
export default CodeTable;
\ No newline at end of file
src/model/Bftdcr/index.js
......@@ -54,6 +54,7 @@ export default class Bftdcr {
intdis: "", // Internal Discrepancies .bfdgrp.blk.intdis
docdis: "", // Discrepancies .bfdgrp.blk.docdis
docdisflg: "", // Discrepancies modified .bfdgrp.blk.docdisflg
prsdoc: "", //.bfdgrp.blk.prsdoc
},
},
mtabut: {
......
src/model/Bftdrv/index.js
......@@ -41,6 +41,7 @@ export default class Bftdrv {
intdis: "", // Internal Discrepancies .bfdgrp.blk.intdis
docdis: "", // Discrepancies .bfdgrp.blk.docdis
docdisflg: "", // Discrepancies modified .bfdgrp.blk.docdisflg
prsdoc: "", //.bfdgrp.blk.prsdoc
},
prb: {
pts: new Pts().data,
......
src/model/Bftsnd/index.js
......@@ -20,7 +20,7 @@ export default class Bftsnd {
},
docgrdm: {
docdsclab: "", // Label of document description .bftp.docgrdm.docdsclab
docgrd: [], //.bftp.docgrdm.docgrd
docgrd: "", //.bftp.docgrdm.docgrd
},
prbp: {
ptsget: {
......
src/model/Public/Liaall/index.js
......@@ -3,6 +3,7 @@ export default class Liaall {
constructor() {
this.data = {
tenstm: "",
tensetstm:"",
misamt: "", // Amount not yet assigned .liaall.misamt
concur: "", // External Booking Amount .liaall.concur
outpct: "", // Sight Amount Percentage .liaall.outpct
......
src/views/Business/Bftdcr/Betdcrd.vue
......@@ -58,54 +58,16 @@
<c-checkbox v-model="docdisflg">不符点修改</c-checkbox>
</c-col>
<!-- <c-col :span="24" style="height: 24px; margin-top: 20px">
<el-form-item :label="model.bftp.docgrdm.docdsclab" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="24" style="height: 0px; margin-top: 5px">
<el-divider></el-divider>
</c-col>
<c-col :span="24">
<c-table :data="model.bftp.docgrdm.docgrd" style="width: 100%">
<el-table-column prop="cmail1" label="1st"> </el-table-column>
<el-table-column prop="cmail2" label="2st"> </el-table-column>
<el-table-column label="Document" prop="docnam">
<template slot-scope="scope">
<c-select v-model="scope.row.ptydbt">
<el-option
v-for="item in codes.ptydbt"
:key="item.value"
:label="item.value"
:value="item.value"
>
<span style="float: left">{{ item.label }}</span>
</el-option>
</c-select>
</template>
</el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right">
<template slot-scope="scope" slot="header">
<el-button
circle
style="padding: 4px"
class="el-icon-plus"
size="mini"
@click="addRow(scope)"
>
</el-button>
<el-button
style="padding: 4px"
circle
class="el-icon-minus"
size="mini"
@click="removeRow(scope)"
>
</el-button>
</template>
</el-table-column>
</c-table>
</c-col> -->
<c-col :span="24" style="height: 24px; margin-top: -10px">
<c-docpre
:model="model"
:argadr="{
path: 'bfdgrp.blk.prsdoc',
grp: 'bftp',
code: 'prsdoc',
}"
>
</c-docpre>
<!-- <c-col :span="24" style="height: 24px; margin-top: -10px">
<el-form-item :label="model.bftp.docgrdm.docdsclab" class="messageLabel">
<c-button style="float: right" @click="addTableValue" type="primary"
>新增单据</c-button
......@@ -146,7 +108,6 @@
</el-table-column>
<el-table-column label="Document" prop="docnam" width="auto">
<template slot-scope="scope">
<!-- {{scope.row.docnam}} -->
<c-select
style="width: 100%"
placeholder="请选择"
......@@ -170,7 +131,7 @@
</template>
</el-table-column>
</c-table>
</c-col>
</c-col> -->
</div>
</template>
<script>
......@@ -179,43 +140,16 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Bftdcr/Event";
import Utils from "~/utils";
import Docpre from "~/views/Public/Docpre";
export default {
name:'Docpre',
components:{"c-docpre": Docpre,},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
TableValue: [
{
id: 0,
cmail1: "",
cmail2: "",
docnam: "",
serialNum: "",
tableName: "",
tcddoc: "",
},
],
newValue: {
id: 0,
cmail1: "",
cmail2: "",
docnam: "",
serialNum: "",
tableName: "",
tcddoc: "",
},
codeTable: [
{ label: "增值税发票", value: "1" },
{ label: "发票", value: "2" },
{ label: "装箱单", value: "3" },
{ label: "空运单", value: "4" },
{ label: "海运提单", value: "5" },
{ label: "铁路运单", value: "6" },
{ label: "货物收据", value: "7" },
{ label: "邮政收据", value: "8" },
],
};
},
computed:{
......@@ -231,24 +165,9 @@ export default {
},
methods: { ...Event,
addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue);
const serial=Utils.generateUUID();
newTableValue.serialNum=serial;
// this.model.bftp.docgrdm.docgrd.push(newTableValue);
this.model.bftp.docgrdm.docgrd.splice(index-1,0,newTableValue);
},
deleteTable(index) {
this.model.bftp.docgrdm.docgrd.splice(index, 1);
},
},
created: function () {},
};
</script>
<style>
.messageLabel >>> .el-form-item__label {
text-align: left;
font-weight: bold;
font-size: 12px;
}
</style>
src/views/Business/Bftdrv/Dscins.vue
......@@ -147,76 +147,19 @@
>
</c-ptap>
</c-col>
<!-- <c-col :span="24">
<c-ptap
:model="model"
:argadr="{
title: '付款人',
grp: 'bfdgrp',
rol: 'oth',
}"
:disabled="true"
>
</c-ptap>
</c-col> -->
</c-col>
<!-- <c-col :span="24">
<span
v-text="model.bftp.docgrdm.docdsclab"
data-path=".bftp.docgrdm.docdsclab"
>
</span>
</c-col> -->
<c-docpre
:model="model"
:argadr="{
path: 'bfdgrp.blk.prsdoc',
grp: 'bftp',
code: 'prsdoc',
}"
>
</c-docpre>
<!-- <c-col :span="24" style="height: 24px; margin-top: 20px">
<el-form-item :label="model.bftp.docgrdm.docdsclab" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="24" style="height: 0px; margin-top: 5px">
<el-divider></el-divider>
</c-col>
<c-col :span="24">
<c-table :data="model.bftp.docgrdm.docgrd" style="width: 100%">
<el-table-column prop="cmail1" label="1st"> </el-table-column>
<el-table-column prop="cmail2" label="2st"> </el-table-column>
<el-table-column label="Document" prop="docnam">
<template slot-scope="scope">
<c-select v-model="scope.row.ptydbt">
<el-option
v-for="item in codes.ptydbt"
:key="item.value"
:label="item.value"
:value="item.value"
>
<span style="float: left">{{ item.label }}</span>
</el-option>
</c-select>
</template>
</el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right">
<template slot-scope="scope" slot="header">
<el-button
circle
style="padding: 4px"
class="el-icon-plus"
size="mini"
@click="addRow(scope)"
>
</el-button>
<el-button
style="padding: 4px"
circle
class="el-icon-minus"
size="mini"
@click="removeRow(scope)"
>
</el-button>
</template>
</el-table-column>
</c-table>
</c-col> -->
<c-col :span="24" style="height: 24px; margin-top: -10px">
<!-- <c-col :span="24" style="height: 24px; margin-top: -10px">
<el-form-item :label="model.bftp.docgrdm.docdsclab" class="messageLabel">
<c-button style="float: right" @click="addTableValue" type="primary"
>新增单据</c-button
......@@ -257,7 +200,6 @@
</el-table-column>
<el-table-column label="Document" prop="docnam" width="auto">
<template slot-scope="scope">
<!-- {{scope.row.docnam}} -->
<c-select
style="width: 100%"
placeholder="请选择"
......@@ -281,7 +223,7 @@
</template>
</el-table-column>
</c-table>
</c-col>
</c-col> -->
</div>
</template>
<script>
......@@ -291,46 +233,19 @@ import CodeTable from "~/config/CodeTable";
import Event from "~/model/Detdrv/Event";
import Ptap from "~/views/Public/Ptap";
import Utils from "~/utils";
import Docpre from "~/views/Public/Docpre";
export default {
name:'Docpre',
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
components: {
"c-ptap": Ptap,
"c-docpre": Docpre
},
data() {
return {
TableValue: [
{
id: 0,
cmail1: "",
cmail2: "",
docnam: "",
serialNum: "",
tableName: "",
tcddoc: "",
},
],
newValue: {
id: 0,
cmail1: "",
cmail2: "",
docnam: "",
serialNum: "",
tableName: "",
tcddoc: "",
},
codeTable: [
{ label: "增值税发票", value: "1" },
{ label: "发票", value: "2" },
{ label: "装箱单", value: "3" },
{ label: "空运单", value: "4" },
{ label: "海运提单", value: "5" },
{ label: "铁路运单", value: "6" },
{ label: "货物收据", value: "7" },
{ label: "邮政收据", value: "8" },
],
};
},
computed: {
......@@ -345,24 +260,9 @@ export default {
},
methods: {
...Event,
addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue);
const serial=Utils.generateUUID();
newTableValue.serialNum=serial;
// this.model.bftp.docgrdm.docgrd.push(newTableValue);
this.model.bftp.docgrdm.docgrd.splice(index-1,0,newTableValue);
},
deleteTable(index) {
this.model.bftp.docgrdm.docgrd.splice(index, 1);
},
},
created: function () {},
};
</script>
<style>
.messageLabel >>> .el-form-item__label {
text-align: left;
font-weight: bold;
font-size: 12px;
}
</style>
src/views/Business/Bftset/Setp.vue
......@@ -419,7 +419,7 @@
<c-col :span="24">
<el-form-item label="" prop="bfdgrp.rec.frepayflg">
<c-checkbox v-model="frepayflg">无偿放单</c-checkbox>
<c-checkbox v-model="frepayflg" >无偿放单</c-checkbox>
</el-form-item>
</c-col>
......@@ -448,7 +448,7 @@
v-model="model.setmod.redamt"
placeholder="请输入扣减金额"
:disabled="frepayflg"
@change="selectOrCheckboxChangeExecuteRule('setmod.redamt')"
@change="selectOrCheckboxRule('setmod.redamt')"
></c-input>
</el-form-item>
</c-col>
......@@ -485,8 +485,6 @@
</c-table>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender" prop="bftp.dedget.sdamod.dadsnd">
<c-input
......@@ -845,7 +843,7 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Bftset/Event";
import Ptsmsg from "~/views/Public/Ptsmsg";
import Utils from "~/utils/index"
import Utils from "~/utils/index";
// import PtapDome from "~/views/Public/PtapDome";
// import Ptap from "~/views/Public/Ptap"; "c-ptapdome": PtapDome, "c-ptap": Ptap
......@@ -864,11 +862,20 @@ export default {
'4 4 "Cur" 250',
'5 5 "Amt" 250 2 8 1 4',
// '6 6 "Mat.Dat." 250 4 7 1',
{index:6,position:6,width:250,render:(item, scope) => {return scope.row[item.prop] === 'null' ? '' : scope.row[item.prop]},label:'Mat.Dat.'},
{
index: 6,
position: 6,
width: 250,
render: (item, scope) => {
return scope.row[item.prop] === "null"
? ""
: scope.row[item.prop];
},
label: "Mat.Dat.",
},
],
data: [],
},
preSelectedRow: 0
};
},
computed: {
......@@ -893,37 +900,38 @@ export default {
return this.model.mtabut.coninf.usr.extkey == "";
},
},
mounted (){
this.$nextTick(() => {
})
mounted() {
this.$nextTick(() => {});
},
methods: {
...Event,
async multipleSelect(selection) {
if (selection.length > 1) {
// this.$
this.$notify({
title: "失败",
message: "You cannot select more than one tenor",
type: "error",
});
} else {
let idx;
let selIds;
if (selection.length === 0) {
idx = this.preSelectedRow
selIds = []
this.model.liaall.tensetstm.rows = []
// this.model.liaall.tenstm.rows = []
} else {
idx = selection[0]
this.preSelectedRow = idx
selIds = [selection[0] + 1]
}
//
let params = {selDst:"liaall.tenstm",selIds: [idx+1]}
const rtnmsg = await this.executeRule("liaall.tenstm",params);
console.log(this.model.liaall.tensetstm);
let params = { selDst: "liaall.tenstm", selIds };
const rtnmsg = await this.executeRule("liaall.tenstm", params);
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data)
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
this.updateModel(rtnmsg.data);
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
}
// console.log(selection);
// if (selection) {
// let selIds = selection.map(x=>x+1);
......@@ -953,7 +961,7 @@ export default {
// }
},
},
created: function () {},
};
</script>
......
src/views/Business/Bftsnd/Rgfp.vue
......@@ -310,7 +310,16 @@
</c-col>
<!-- next part -->
<c-col :span="24" style="height: 24px; margin-top: -10px">
<c-docpre
:model="model"
:argadr="{
path: 'bfdgrp.blk.prsdoc',
grp: 'bftp',
code: 'prsdoc',
}"
>
</c-docpre>
<!-- <c-col :span="24" style="height: 24px; margin-top: -10px">
<el-form-item :label="model.bftp.docgrdm.docdsclab" class="messageLabel">
<c-button style="float: right" @click="addTableValue" type="primary"
>新增单据</c-button
......@@ -342,7 +351,6 @@
</el-table-column>
<el-table-column label="Document" prop="docnam" width="auto">
<template slot-scope="scope">
<!-- {{scope.row.docnam}} -->
<c-select
style="width: 100%"
placeholder="请选择"
......@@ -367,7 +375,7 @@
</el-table-column>
</c-table>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24">
<c-col :span="12">
......@@ -410,7 +418,10 @@
v-model="model.bfdgrp.rec.matdat"
style="width: 100%"
placeholder="请选择到期日期"
:disabled="model.bfdgrp.blk.matper!=''||model.bfdgrp.rec.doctypcod === 'P'"
:disabled="
model.bfdgrp.blk.matper != '' ||
model.bfdgrp.rec.doctypcod === 'P'
"
></c-date-picker>
</el-form-item>
</c-col>
......@@ -509,7 +520,10 @@
maxlength="65"
show-word-limit
placeholder="请输入远期单据到期时间"
:disabled="(model.bfdgrp.rec.matdat &&model.bfdgrp.rec.matdat!='')||model.bfdgrp.rec.doctypcod === 'P'"
:disabled="
(model.bfdgrp.rec.matdat && model.bfdgrp.rec.matdat != '') ||
model.bfdgrp.rec.doctypcod === 'P'
"
></c-input>
</el-form-item>
</c-col>
......@@ -806,45 +820,21 @@ import Ptsmsg from "~/views/Public/Ptsmsg";
import PtapDome from "~/views/Public/PtapDome";
import Ptap from "~/views/Public/Ptap";
import Utils from "~/utils";
import Docpre from "~/views/Public/Docpre";
export default {
components: { "c-ptsmsg": Ptsmsg, "c-ptapdome": PtapDome, "c-ptap": Ptap },
name:'Docpre',
components: {
"c-ptsmsg": Ptsmsg,
"c-ptapdome": PtapDome,
"c-ptap": Ptap,
"c-docpre": Docpre,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
TableValue: [
{
id: 0,
cmail1: "",
cmail2: "",
docnam: "",
serialNum: "",
tableName: "",
tcddoc: "",
},
],
newValue: {
id: 0,
cmail1: "",
cmail2: "",
docnam: "",
serialNum: "",
tableName: "",
tcddoc: "",
},
codeTable: [
{ label: "增值税发票", value: "1" },
{ label: "发票", value: "2" },
{ label: "装箱单", value: "3" },
{ label: "空运单", value: "4" },
{ label: "海运提单", value: "5" },
{ label: "铁路运单", value: "6" },
{ label: "货物收据", value: "7" },
{ label: "邮政收据", value: "8" },
],
};
return {};
},
computed: {
flag() {
......@@ -853,41 +843,9 @@ export default {
},
methods: {
...Event,
addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue);
const serial=Utils.generateUUID();
newTableValue.serialNum=serial;
// this.model.bftp.docgrdm.docgrd.push(newTableValue);
this.model.bftp.docgrdm.docgrd.splice(index-1,0,newTableValue);
},
deleteTable(index) {
this.model.bftp.docgrdm.docgrd.splice(index, 1);
// for (let i = 0; i < this.TableValue.length; i++) {
// if (this.TableValue[i].id == row.id) {
// this.TableValue.splice(i, 1);
// break;
// }
// }
},//表格输入传入数据库
async prsdoc() {
let rtnmsg = await this.executeDefault("bfdgrp.blk.prsdoc")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
} else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
},
created: function () {},
};
</script>
<style>
.messageLabel >>> .el-form-item__label {
text-align: left;
font-weight: bold;
font-size: 12px;
}
</style>
src/views/Public/Docpre.vue
......@@ -9,7 +9,7 @@
</el-form-item>
</c-col> -->
<c-col :span="24" style="margin-bottom: 30px;">
<el-form-item :prop="'${argadr.grp}.docgrdm.docgrd'" label="" style="margin-left:-150px;">
<el-form-item :prop="`${argadr.grp}.docgrdm.docgrd`" label="" style="margin-left:-150px;">
<c-table max-height="300px" style="text-align: center;" stripe
:list="this.model[argadr.grp].docgrdm.docgrd || []" :paginationShow="false" :border="true">
<el-table-column :label="model[argadr.grp].docgrdm.docdsclab || 'Documents Presented'" class="messageLabel">
......
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