Skip to content

V
vue-gjjs
Commit 0f41ebd9 by Wuyuqiu
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents e72ce35f a16349be
Showing with 157 additions and 130 deletions
src/model/Getamc/Pattern.js
......@@ -45,7 +45,6 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"gidgrp.ctr.pts.nam":[
{type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"}
......@@ -69,7 +68,7 @@ export default {
"gidgrp.blk.contag79":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
"gidgrp.cbs.cnf.cur":[
......@@ -86,14 +85,12 @@ export default {
{max: 5,message:"长度不能超过5"}
],
"reqdat":[
{type: "date", required: false, message: "输入正确的日期"}
{required: false, message: "输入正确的日期"}
],
"gidgrp.rec.cnfdat":[
{type: "date", required: false, message: "输入正确的日期"}
],
"gidgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......@@ -118,18 +115,16 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.apl.namelc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.apl.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.apl.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gitp.usr.extkey":[
......@@ -141,14 +136,11 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.apl.adrelc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.rec.gartypin":[
{type: "string", required: false, message: "必输项"},
{max: 4,message:"长度不能超过4"}
......@@ -162,10 +154,6 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"gidgrp.adv.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......@@ -208,45 +196,40 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.iss.namelc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.adv.namelc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.iss.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.iss.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.adv.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.adv.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.rec.opndat":[
{type: "date", required: false, message: "输入正确的日期"}
],
"gidgrp.iss.adrelc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.adv.adrelc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
......@@ -255,22 +238,19 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"gidgrp.ben.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"gidgrp.blk.exptxt":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.blk.atxexptxt":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.rec.inudat":[
{type: "date", required: false, message: "输入正确的日期"}
],
......@@ -287,37 +267,30 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.ben.namelc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.ben.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.ben.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.blk.liatxtc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.blk.atxliatxtc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.ben.adrelc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.gidcxm.warran":[
......@@ -325,40 +298,31 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"gidgrp.rec.deloritxt":[
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.blk.deltoadr":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.blk.feetxt":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.blk.preper":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.blk.atxpreper":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.blk.trfcond":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
......@@ -367,7 +331,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"gidgrp.ghd.aplnam":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
......@@ -386,24 +350,20 @@ export default {
{max: 10,message:"长度不能超过10"}
],
"gidgrp.blk.covgodsrv":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.blk.atxcovgodsrv":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.rec.bilvvv":[
{type: "string", required: false, message: "必输项"},
{max: 8,message:"长度不能超过8"}
],
"gitp.indirectswiadd":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.rec.orcrat":[
......@@ -417,7 +377,7 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gidgrp.blk.orcplc":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.rec.acc":[
......@@ -444,7 +404,7 @@ export default {
{type: "date", required: false, message: "输入正确的日期"}
],
"gidgrp.ghd.remark":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.rec.mannum":[
......@@ -452,11 +412,10 @@ export default {
{max: 12,message:"长度不能超过12"}
],
"gidgrp.blk.addinf":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.ghd.wahnum":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
......@@ -467,18 +426,14 @@ export default {
],
"gidgrp.blk.gidtxt":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.blk.gtxgidtxt":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"liaall.outamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
......@@ -498,7 +453,6 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"liaall.exttotoldamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
......@@ -514,16 +468,12 @@ export default {
{max: 16,message:"长度不能超过16"}
],
"setmod.docamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"setmod.zmqacc":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
......@@ -536,13 +486,13 @@ export default {
],
"mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"}
],
"mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"}
],
......@@ -559,7 +509,7 @@ export default {
{max: 50,message:"长度不能超过50"}
],
"trnmod.trndoc.amdapl":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
......@@ -576,14 +526,6 @@ export default {
{max: 1,message:"长度不能超过1"}
],
"trnmod.trndoc.condocstm":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
......@@ -649,10 +591,6 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"liaall.limmod.limpts.pfcod1":[
{type: "string", required: false, message: "必输项"},
{max: 14,message:"长度不能超过14"}
......@@ -662,4 +600,15 @@ export default {
{max: 14,message:"长度不能超过14"}
],
"gidgrp.rec.purpos":[
{required: false, message: "必输项"},
],
"gidgrp.rec.exptyp":[
{required: false, message: "必输项"},
],
}
\ No newline at end of file
src/model/Getsel/index.js
......@@ -17,6 +17,7 @@ export default class Getsel{
dspgcdclsdat:"", // Display Closing Date of Claims .dspgcdclsdat
gidgrp:{
rec:{
inr:"",
ownref:"", // Reference .gidgrp.rec.ownref
nam:"", // Externally Displayed Name to Identify the Contract .gidgrp.rec.nam
gartyp:"", // Type of Undertaking .gidgrp.rec.gartyp
......
src/views/Business/Botdav/Ovwp.vue
......@@ -188,15 +188,12 @@
</c-table>
</c-col> -->
<c-docpre
:model="model"
:argadr="{
path:'bodgrp.blk.docpre',
<c-docpre :model="model" :argadr="{
path: 'bodgrp.blk.docpre',
grp: 'botp',
code:'docpre'
code: 'docpre'
}"></c-docpre>
</c-col>
<!-- ====================右边======================= -->
<c-col :span="11" :offset="1">
......
src/views/Business/Getamc/index.vue
......@@ -25,11 +25,6 @@
:validate-on-rule-change="false"
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD001291 -->
<el-tab-pane label="开立方式" name="opnp">
<m-opnp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000017 -->
<el-tab-pane label="Confirmation" name="conp">
<m-conp :model="model" :codes="codes" />
......@@ -127,6 +122,11 @@
</c-content>
</el-tab-pane>
<!--PD001291 -->
<el-tab-pane label="开立方式" name="opnp">
<m-opnp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
......@@ -187,7 +187,7 @@ export default {
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "",
tabVal: "conp",
trnName: "getamc",
model: new Getamc().data,
checkRules: Check,
......
src/views/Public/Docpre.vue
<!-- 前后端字段path及前后端字段docgrdm.docgrd 后端docgrd为List<Docgrd>类型 -->
<template>
<div>
<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[argadr.grp].docgrdm.docdsclab" class="messageLabel">
<div v-if="ifShowAdd">
<c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button>
</div>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24" style="margin-bottom: 30px;">
<el-form-item :prop="'${argadr.grp}.docgrdm.docgrd'" label="">
<c-table height="200px" style="text-align: center" :list="this.model[argadr.grp].docgrdm.docgrd || []"
:paginationShow="false" :border="true">
<el-table-column label="1st" width="auto" prop="cmail1">
<el-form-item :prop="'${argadr.grp}.docgrdm.docgrd'" label="" style="margin-left:-150px;">
<c-table 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">
<el-table-column label="1st" width="auto" prop="cmail1" background-color="red">
<template slot-scope="scope">
<c-input v-model="scope.row.cmail1" @change="docpre" :disabled="disabledCmail1"
maxlength="12">
......@@ -27,27 +28,36 @@
</c-input>
</template>
</el-table-column>
<el-table-column label="Document" width="180px" prop="docnam" >
<el-table-column label="Document" prop="docnam" width="auto">
<template slot="header" slot-scope="scope">
<row>
<c-col :span="12">
<span style="line-height: 36px;">Document</span>
</c-col>
<c-col :span="12">
<div style="float: right;">
<span class="add_del_button add_button" @click="addTableValue">+</span>
<span class="add_del_button" @click="deleteTable">-</span>
</div>
</c-col>
</row>
</template>
<template slot-scope="scope">
<!-- {{scope.row.docnam}} -->
<c-select style="width: 100%" placeholder="请选择" v-model="scope.row.docnam"
:disabled="disabledDocnam">
<el-option v-for="item in codes[argadr.code]" :key="item.value" :label="item.label" @change="docpre"
:value="item.value">
<el-option v-for="item in codes[argadr.code]" :key="item.value" :label="item.label"
@change="docpre" :value="item.value">
</el-option>
</c-select>
</template>
</el-table-column>
<el-table-column label="操作" width="70px" fixed="right">
<template slot-scope="scope" >
<div v-if="ifShowDelete" >
<c-button style="margin-left:-5px" @click="deleteTable(scope.$index)" type="primary">删除</c-button>
</div>
</template>
</el-table-column>
</c-table>
</el-form-item>
</c-col>
</div>
</template>
<script>
......@@ -57,6 +67,7 @@ import Event from "~/model/Botdcr/Event"
import Utils from "~/utils";
export default {
inject: ["root"],
mixins: [commonProcess],
......@@ -122,6 +133,25 @@ export default {
methods: {
...Event,
setColSpan: function () {
// console.log(this.$el.getElementsByClassName("el-table__header"))
// 获取表头的所有单元格
var x = this.$el.getElementsByClassName("el-table__header")
console.log(x)
var x1 = this.$el.getElementsByClassName("el-table__header")[0].rows[1].cells
var x2 = this.$el.getElementsByClassName("el-table__header")[0].rows[0].cells
x1[2].colSpan = 2 // document
// 将gutter的display设为none
x1[3].style.display = 'none' //gutter
x2[0].colSpan = 4 // docdsclab
// x2[0].style.background-color = '#FFF'
// 将gutter的display设为none
x2[1].style.display = 'none' //gutter
},
addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue);
const serial = Utils.generateUUID();
......@@ -132,7 +162,6 @@ export default {
},
deleteTable(index) {
// 'this.model.${argadr.grp}.docgrdm.docgrd.splice(index, 1)';
console.log("join function");
var grp = this.argadr.grp;
this.model[grp].docgrdm.docgrd.splice(index, 1);
},
......@@ -149,10 +178,17 @@ export default {
},
},
created: function () {
},
mounted() {
// 注意一定要保证DOM渲染完成后在进行合并操作，否则会找不到元素
this.$nextTick(function () {
this.setColSpan();
})
}
};
</script>
<style>
.messageLabel>>>.el-form-item__label {
......@@ -160,4 +196,46 @@ export default {
font-weight: bold;
font-size: 12px;
}
.add_del_button:hover {
cursor: pointer;
background-color: rgb(230, 227, 227);
}
.add_del_button {
display: block;
flex: 0;
line-height: 15px;
text-align: center;
font-size: 12px;
border-radius: 5px;
border: 1px solid rgb(194, 192, 192);
background-color: rgb(240, 240, 240);
}
.add_button {
margin-bottom: 2px;
}
/* body .el-table th.gutter {
display: table-cell !important;
height:0px;
font-weight: 0px;
border-bottom: 1px solid #bbb !important;
position: absolute;
right:0;
top: 0;
} */
/*
.gutter {
display: none;
width: 0px !important;
background: rgb(51, 51, 51);
}
tr {
background: rgb(51, 51, 51);
} */
</style>
\ No newline at end of file
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