Skip to content

V
vue-gjjs
Commit d9ed5e7b by xionglin
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents 7498dfd4 8d810cfd
Showing with 127 additions and 52 deletions
src/business/brtacp/model/index.js
......@@ -232,14 +232,14 @@ export default class Brtacp {
totamt: '',
nam: '',
docprbrol: '',
rcvdat:'',
advdat:'',
docflg:'',
tenmaxday:'',
docsta:'',
rcvdat: '',
advdat: '',
docflg: '',
tenmaxday: '',
docsta: '',
},
matp: {
mattxtlab:'',
mattxtlab: '',
},
cbs: {
opn1: {
......@@ -257,7 +257,7 @@ export default class Brtacp {
max2: {
amt: ''
},
}
},
brtp: {
......@@ -276,7 +276,68 @@ export default class Brtacp {
cur: '',
amt: 0
}
}
},
ben: {
modifySet: [],
ptsinr: '',
rol: '',
nam: '',
ptanam1: '',
ptyinr: '',
ptainr: '',
extkey: '',
dftdsp: '',
dftcur: '',
dftact: '',
dftfeecur: '',
dftactptainr: '',
dftselrol: '',
glggrpflg: '',
pansta: '',
ptytyp: '',
ptyextkey: '',
adrblk: '',
rolsetflg: '',
mdtflg: '',
chnguaflg: '',
namelc: '',
adrelc: '',
ref: '',
dbfadrblkcn: '',
rskcty: '',
dbfadrblk: '',
pts: {
inr: '',
objtyp: '',
objinr: '',
rol: 'PRB',
ptainr: '',
ptyinr: '',
extkey: '',
adrblk: '',
ref: '',
nam: '',
ownref: '',
dftcur: '',
dftdsp: '',
dftact: '',
dftfeecur: '',
dftactptainr: '',
dftsetrol: '',
glggrpflg: '',
extact: '',
ver: '',
ptcnam: '',
ptcoe: '',
issbaninf: '',
bankno: '',
jigomc: '',
dizhii: '',
youzbm: '',
dihdig: ''
},
maps: {}
},
},
gcdgrp: {
prb: {
......
src/business/brtacp/views/index.vue
......@@ -22,6 +22,7 @@
</c-content>
</el-tab-pane>
<!--PD000510 -->
<el-tab-pane label="备查/附言" name="addbcb">
<c-content>
......@@ -60,8 +61,9 @@
</div>
</template>
<script>
import event from '../event';
import commonFuncs from "~/mixin/commonFuncs";
import operationFunc from "~/mixin/operationFunc";
import CodeTable from "~/config/CodeTable"
import formRules from '../model/check'
import Brtacp from "../model"
......@@ -102,7 +104,7 @@
root: this
}
},
mixins: [event,commonFuncs],
mixins: [event,operationFunc,],
data(){
return {
tabVal: "ovwp",
......
src/business/brtame/model/index.js
......@@ -3,6 +3,12 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Brtame {
constructor() {
this.data = {
gidgrp:{
rec:{
branchinr:''
}
},
gitp:{},
brdgrp: {
blk: {
notpty: '',
......@@ -29,7 +35,8 @@ export default class Brtame {
trpdoctyp: '',
reltyp: '',
tramod: '',
nam: ''
nam: '',
branchinr:''
},
cbs: {
max: {
......
src/business/brtdck/event/index.js
......@@ -31,13 +31,15 @@ export default {
lidgrp:{
rec:{
inr:"00000026",
}
},
},
brdgrp:{
rec:{
inr:"00000059",
inr:"00000049",
},
inr:"000058"
},
liaccv:{
concur:"CNY"
}
});
if (!res.data) {
......
src/business/brtdck/model/index.js
......@@ -14,7 +14,6 @@ export default class Brtdck {
pts: new Pts().data,
},
brdgrp: {
inr:'',
prb: {
pts: new Pts().data,
},
......@@ -149,6 +148,7 @@ export default class Brtdck {
days: '',
lidgrp: {
rec: {
inr : '',
expdat: '',
aplref: '',
ownref: '',
......
src/business/brtset/event/buildCommons.js
......@@ -27,7 +27,7 @@ export default {
}
let dataObj = {
rec: {
objtyp: 'brd',
objtyp: 'lid',
ownref: model.brdgrp.rec.ownref,
opndat: model.brdgrp.rec.opndat,
expdat: model.brdgrp.rec.expdat,
......@@ -114,7 +114,7 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'brd',
objtyp: 'lid',
objinr: model.brdgrp.rec.objinr,
ownref: model.brdgrp.rec.ownref,
},
......@@ -125,7 +125,7 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'brd',
objtyp: 'lid',
objinr: model.brdgrp.rec.objinr,
ownref: model.brdgrp.rec.ownref,
swiftflg: model.brtp.swiftflg,
......
src/business/litcan/model/check.js
......@@ -56,10 +56,10 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"lidgrp.rec.opndat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"lidgrp.rec.shpdat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"lidgrp.adv.pts.ref":[
{type: "string", required: false, message: "必输项"},
......@@ -67,7 +67,7 @@ export default {
],
"lidgrp.rec.expdat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"lidgrp.rec.expplc":[
{type: "string", required: false, message: "必输项"},
......
src/business/litcan/model/index.js
......@@ -56,7 +56,8 @@ export default class Litcan{
strinf:'', // Narrative .litcanf.strinf
},
byinst:'', // On Applicant instruction .byinst
pageId: '' // ctx的key
pageId: '', // ctx的key
}
}
}
\ No newline at end of file
src/business/litcan/views/Canp.vue
......@@ -64,7 +64,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<!-- <c-col :span="24">
<el-form-item label="提货日期" prop="lidgrp.rec.shpdat">
<c-date-picker disabled type="date" v-model="model.lidgrp.rec.shpdat" style="width:100%" placeholder="请选择日期"></c-date-picker>
</el-form-item>
......@@ -73,7 +73,7 @@
<el-form-item label="有效期限" prop="lidgrp.rec.expdat">
<c-date-picker disabled type="date" v-model="model.lidgrp.rec.expdat" style="width:100%" placeholder="请选择到期日"></c-date-picker>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="12">
<el-form-item label="到期地点" prop="lidgrp.rec.expplc">
......
src/business/litdck/model/check.js
......@@ -279,22 +279,22 @@ let checkObj = {
{ max: 20, message: '长度不能超过20' },
],
'brdgrp.rec.rptref': [{ required: true, message: '必输项' }],
'mtabut.coninf.oitinf.oit.inftxt': [
{ type: 'string', required: false, message: '必输项' },
{ max: 60, message: '长度不能超过60' },
],
'mtabut.coninf.oitset.oit.inftxt': [
{ type: 'string', required: false, message: '必输项' },
{ max: 60, message: '长度不能超过60' },
],
// 'mtabut.coninf.oitinf.oit.inftxt': [
// { type: 'string', required: false, message: '必输项' },
// { max: 60, message: '长度不能超过60' },
// ],
// 'mtabut.coninf.oitset.oit.inftxt': [
// { type: 'string', required: false, message: '必输项' },
// { max: 60, message: '长度不能超过60' },
// ],
'mtabut.coninf.conexedat': [
{ type: 'string', required: false, message: '输入正确的日期' },
],
'mtabut.coninf.usr.extkey': [
{ type: 'string', required: false, message: '必输项' },
{ max: 8, message: '长度不能超过8' },
],
// 'mtabut.coninf.conexedat': [
// { type: 'string', required: false, message: '输入正确的日期' },
// ],
// 'mtabut.coninf.usr.extkey': [
// { type: 'string', required: false, message: '必输项' },
// { max: 8, message: '长度不能超过8' },
// ],
'trnmod.trndoc.advnam': [
{ type: 'string', required: false, message: '必输项' },
{ max: 50, message: '长度不能超过50' },
......@@ -375,12 +375,12 @@ let checkObj = {
{ max: 40, message: '长度不能超过40' },
],
'liaall.limmod.ccvamt': [
{ type: 'string', required: false, message: '必输项' },
{ max: 18, message: '整数位不能超过14位' },
{
pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/,
message: '小数位不能超过3位',
},
// { type: 'string', required: false, message: '必输项' },
// { max: 18, message: '整数位不能超过14位' },
// {
// pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/,
// message: '小数位不能超过3位',
// },
],
'liaall.limmod.limpts.pfcod1': [
{ type: 'string', required: false, message: '必输项' },
......@@ -394,7 +394,7 @@ let checkObj = {
'brdgrp.srm.djudat': [{ type: 'string', required: false }],
'brdgrp.srm.djuref': [{ type: 'string', required: false }],
invtyp: [{ type: 'string', required: true, message: '必输项' }],
'outlen.szflg': [{ type: 'string', required: true, message: '必输项' }],
// 'outlen.szflg': [{ type: 'string', required: true, message: '必输项' }],
'outlen.acttyp': [{ type: 'string', required: false, message: '必输项' }],
'brdgrp.srm.djutyp': [{ type: 'string', required: true, message: '必输项' }],
};
......
src/business/litdck/model/index.js
......@@ -3,6 +3,7 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Litdck {
constructor() {
this.data = {
szflg: '',
outlen:{
szflg: ''
},
......
src/business/litdck/views/Litdckp.vue
......@@ -211,9 +211,9 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="申报类型" prop="outlen.szflg">
<el-form-item label="申报类型" prop="szflg">
<c-select
v-model="model.outlen.szflg"
v-model="model.szflg"
style="width: 100%"
:code="codes.szflg"
>
......
src/business/litdck/views/index.vue
......@@ -42,7 +42,7 @@
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="费用/账务" name="setpan">
<el-tab-pane label="费用/账务" name="setmod">
<c-content>
<m-setmod
:model="model"
......@@ -116,7 +116,7 @@ import Docpre from "./Docpre";
import Srmp from "./Srmp";
import Engp from "~/components/business/engp/views";
import Coninfp from "~/components/business/coninfp/views";
import Doctre from "~/views/Public/Doctre";
import Doctre from "~/components/business/doctre/views";
import Limitbody from "~/views/Public/Limitbody"
import Setmod from "~/components/business/setmod/views";
import Glentry from "~/components/business/glentry/views";
......
src/mixin/operationFunc.js
......@@ -165,7 +165,7 @@ export default {
gidgrp: this.model.gidgrp,
gitp: this.model.gitp,
lidgrp: this.model.lidgrp,
branchinr:this.model.gidgrp.rec.branchinr,
// branchinr:this.model.gidgrp.rec.branchinr,
}
const res = await Api.post(`/service/${this.trnName}/txnHold`, params);
if (res.respCode === SUCCESS) {
......
src/views/Public/Docpre.vue
......@@ -26,7 +26,7 @@
</template>
</el-table-column>
<el-table-column label="单据" prop="docnam" width="auto">
<template slot="header" slot-scope="scope">
<template slot="header" >
<c-row>
<c-col :span="12">
<span style="line-height: 64px;">单据</span>
......
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