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 130 additions and 53 deletions
src/model/Getsel/index.js
...@@ -17,6 +17,7 @@ export default class Getsel{ ...@@ -17,6 +17,7 @@ export default class Getsel{
dspgcdclsdat:"", // Display Closing Date of Claims .dspgcdclsdat dspgcdclsdat:"", // Display Closing Date of Claims .dspgcdclsdat
gidgrp:{ gidgrp:{
rec:{ rec:{
inr:"",
ownref:"", // Reference .gidgrp.rec.ownref ownref:"", // Reference .gidgrp.rec.ownref
nam:"", // Externally Displayed Name to Identify the Contract .gidgrp.rec.nam nam:"", // Externally Displayed Name to Identify the Contract .gidgrp.rec.nam
gartyp:"", // Type of Undertaking .gidgrp.rec.gartyp gartyp:"", // Type of Undertaking .gidgrp.rec.gartyp
......
src/views/Business/Botdav/Ovwp.vue
...@@ -188,14 +188,11 @@ ...@@ -188,14 +188,11 @@
</c-table> </c-table>
</c-col> --> </c-col> -->
<c-docpre <c-docpre :model="model" :argadr="{
:model="model" path: 'bodgrp.blk.docpre',
:argadr="{ grp: 'botp',
path:'bodgrp.blk.docpre', code: 'docpre'
grp: 'botp', }"></c-docpre>
code:'docpre'
}"></c-docpre>
</c-col> </c-col>
<!-- ====================右边======================= --> <!-- ====================右边======================= -->
...@@ -243,7 +240,7 @@ import Utils from "~/utils"; ...@@ -243,7 +240,7 @@ import Utils from "~/utils";
import Ptap from "~/views/Public/Ptap"; import Ptap from "~/views/Public/Ptap";
import Docpre from "~/views/Public/Docpre"; import Docpre from "~/views/Public/Docpre";
export default { export default {
components: { components: {
"c-ptap": Ptap, "c-ptap": Ptap,
"c-docpre": Docpre, "c-docpre": Docpre,
}, },
......
src/views/Business/Getamc/index.vue
...@@ -25,11 +25,6 @@ ...@@ -25,11 +25,6 @@
:validate-on-rule-change="false" :validate-on-rule-change="false"
> >
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <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 --> <!--PD000017 -->
<el-tab-pane label="Confirmation" name="conp"> <el-tab-pane label="Confirmation" name="conp">
<m-conp :model="model" :codes="codes" /> <m-conp :model="model" :codes="codes" />
...@@ -127,6 +122,11 @@ ...@@ -127,6 +122,11 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD001291 -->
<el-tab-pane label="开立方式" name="opnp">
<m-opnp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody"> <el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" /> <m-limitbody :model="model" :codes="codes" />
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
tabVal: "", tabVal: "conp",
trnName: "getamc", trnName: "getamc",
model: new Getamc().data, model: new Getamc().data,
checkRules: Check, checkRules: Check,
......
src/views/Public/Docpre.vue
<!-- 前后端字段path及前后端字段docgrdm.docgrd 后端docgrd为List<Docgrd>类型 --> <!-- 前后端字段path及前后端字段docgrdm.docgrd 后端docgrd为List<Docgrd>类型 -->
<template> <template>
<div> <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"> <el-form-item :label="model[argadr.grp].docgrdm.docdsclab" class="messageLabel">
<div v-if="ifShowAdd"> <div v-if="ifShowAdd">
<c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button> <c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button>
</div> </div>
</el-form-item> </el-form-item>
</c-col> </c-col> -->
<c-col :span="24" style="margin-bottom: 30px;"> <c-col :span="24" style="margin-bottom: 30px;">
<el-form-item :prop="'${argadr.grp}.docgrdm.docgrd'" label=""> <el-form-item :prop="'${argadr.grp}.docgrdm.docgrd'" label="" style="margin-left:-150px;">
<c-table height="200px" style="text-align: center" :list="this.model[argadr.grp].docgrdm.docgrd || []" <c-table height="300px" style="text-align: center;" stripe
:paginationShow="false" :border="true"> :list="this.model[argadr.grp].docgrdm.docgrd || []" :paginationShow="false" :border="true">
<el-table-column label="1st" width="auto" prop="cmail1"> <el-table-column :label="model[argadr.grp].docgrdm.docdsclab || 'Documents Presented'" class="messageLabel">
<template slot-scope="scope"> <el-table-column label="1st" width="auto" prop="cmail1" background-color="red">
<c-input v-model="scope.row.cmail1" @change="docpre" :disabled="disabledCmail1" <template slot-scope="scope">
maxlength="12"> <c-input v-model="scope.row.cmail1" @change="docpre" :disabled="disabledCmail1"
</c-input> maxlength="12">
</template> </c-input>
</template>
</el-table-column> </el-table-column>
<el-table-column label="2nd" width="auto" prop="cmail2"> <el-table-column label="2nd" width="auto" prop="cmail2">
<template slot-scope="scope"> <template slot-scope="scope">
<c-input v-model="scope.row.cmail2" @change="docpre" :disabled="disabledCmail2" <c-input v-model="scope.row.cmail2" @change="docpre" :disabled="disabledCmail2"
maxlength="12"> maxlength="12">
</c-input> </c-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="Document" width="180px" prop="docnam" > <el-table-column label="Document" prop="docnam" width="auto">
<template slot-scope="scope"> <template slot="header" slot-scope="scope">
<!-- {{scope.row.docnam}} --> <row>
<c-select style="width: 100%" placeholder="请选择" v-model="scope.row.docnam" <c-col :span="12">
:disabled="disabledDocnam"> <span style="line-height: 36px;">Document</span>
<el-option v-for="item in codes[argadr.code]" :key="item.value" :label="item.label" @change="docpre" </c-col>
:value="item.value"> <c-col :span="12">
</el-option> <div style="float: right;">
</c-select> <span class="add_del_button add_button" @click="addTableValue">+</span>
</template> <span class="add_del_button" @click="deleteTable">-</span>
</el-table-column> </div>
<el-table-column label="操作" width="70px" fixed="right"> </c-col>
<template slot-scope="scope" > </row>
<div v-if="ifShowDelete" >
<c-button style="margin-left:-5px" @click="deleteTable(scope.$index)" type="primary">删除</c-button> </template>
</div> <template slot-scope="scope">
</template> <!-- {{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>
</c-select>
</template>
</el-table-column>
</el-table-column> </el-table-column>
</c-table> </c-table>
</el-form-item> </el-form-item>
</c-col> </c-col>
</div> </div>
</template> </template>
<script> <script>
...@@ -57,6 +67,7 @@ import Event from "~/model/Botdcr/Event" ...@@ -57,6 +67,7 @@ import Event from "~/model/Botdcr/Event"
import Utils from "~/utils"; import Utils from "~/utils";
export default { export default {
inject: ["root"], inject: ["root"],
mixins: [commonProcess], mixins: [commonProcess],
...@@ -122,6 +133,25 @@ export default { ...@@ -122,6 +133,25 @@ export default {
methods: { methods: {
...Event, ...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) { addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue); var newTableValue = Object.assign({}, this.newValue);
const serial = Utils.generateUUID(); const serial = Utils.generateUUID();
...@@ -132,7 +162,6 @@ export default { ...@@ -132,7 +162,6 @@ export default {
}, },
deleteTable(index) { deleteTable(index) {
// 'this.model.${argadr.grp}.docgrdm.docgrd.splice(index, 1)'; // 'this.model.${argadr.grp}.docgrdm.docgrd.splice(index, 1)';
console.log("join function");
var grp = this.argadr.grp; var grp = this.argadr.grp;
this.model[grp].docgrdm.docgrd.splice(index, 1); this.model[grp].docgrdm.docgrd.splice(index, 1);
}, },
...@@ -149,10 +178,17 @@ export default { ...@@ -149,10 +178,17 @@ export default {
}, },
}, },
created: function () { created: function () {
},
mounted() {
// 注意一定要保证DOM渲染完成后在进行合并操作，否则会找不到元素
this.$nextTick(function () {
this.setColSpan();
})
} }
}; };
</script> </script>
<style> <style>
.messageLabel>>>.el-form-item__label { .messageLabel>>>.el-form-item__label {
...@@ -160,4 +196,46 @@ export default { ...@@ -160,4 +196,46 @@ export default {
font-weight: bold; font-weight: bold;
font-size: 12px; 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> </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