Skip to content

V
vue-gjjs
Commit 07a651db by lianyang
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 3d915cd6 c7423839
Showing with 171 additions and 72 deletions
src/model/Botpay/index.js
...@@ -137,29 +137,30 @@ export default class Botpay { ...@@ -137,29 +137,30 @@ export default class Botpay {
// exttotamt: "", // Total booking amount external assinged .liaall.exttotamt // exttotamt: "", // Total booking amount external assinged .liaall.exttotamt
// }, // },
liaall: new Pub().data.Liaall, liaall: new Pub().data.Liaall,
mtabut: { // mtabut: {
clsflg: "", // Close Flag .mtabut.clsflg // clsflg: "", // Close Flag .mtabut.clsflg
coninf: { // coninf: {
oitinf: { // oitinf: {
labinftxt: "", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt // labinftxt: "", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt
oit: { // oit: {
inftxt: "", // Infotext .mtabut.coninf.oitinf.oit.inftxt // inftxt: "", // Infotext .mtabut.coninf.oitinf.oit.inftxt
inflev: "", // Infotext Level .mtabut.coninf.oitinf.oit.inflev // inflev: "", // Infotext Level .mtabut.coninf.oitinf.oit.inflev
}, // },
}, // },
oitset: { // oitset: {
labinftxt: "", // Label for INFTXT .mtabut.coninf.oitset.labinftxt // labinftxt: "", // Label for INFTXT .mtabut.coninf.oitset.labinftxt
oit: { // oit: {
inftxt: "", // Infotext .mtabut.coninf.oitset.oit.inftxt // inftxt: "", // Infotext .mtabut.coninf.oitset.oit.inftxt
inflev: "", // Infotext Level .mtabut.coninf.oitset.oit.inflev // inflev: "", // Infotext Level .mtabut.coninf.oitset.oit.inflev
}, // },
}, // },
conexedat: "", // 执行日期 .mtabut.coninf.conexedat // conexedat: "", // 执行日期 .mtabut.coninf.conexedat
usr: { // usr: {
extkey: "", // User ID .mtabut.coninf.usr.extkey // extkey: "", // User ID .mtabut.coninf.usr.extkey
}, // },
}, // },
}, // },
mtabut: new Pub().data.Mtabut,
// trnmod: { // trnmod: {
// trndoc: { // trndoc: {
// advlabel: "", // ADVLABEL .trnmod.trndoc.advlabel // advlabel: "", // ADVLABEL .trnmod.trndoc.advlabel
...@@ -178,10 +179,7 @@ export default class Botpay { ...@@ -178,10 +179,7 @@ export default class Botpay {
// filrecv: "", // File Receiver .trnmod.trndoc.filrecv // filrecv: "", // File Receiver .trnmod.trndoc.filrecv
// }, // },
// }, // },
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod, trnmod: new Pub().data.Trnmod,
liaall: new Pub().data.Liaall,
pageId: "" // ctx的key pageId: "" // ctx的key
} }
} }
......
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/Bftdcr/Betdcrs.vue
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
disabled
> >
<span <span
style="font-size: 15px; font-family: '宋体'; font-weight: bold" style="font-size: 15px; font-family: '宋体'; font-weight: bold"
...@@ -75,7 +74,6 @@ ...@@ -75,7 +74,6 @@
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="onSeainf"
disabled
> >
<span <span
style="font-size: 15px; font-family: '宋体'; font-weight: bold" style="font-size: 15px; font-family: '宋体'; font-weight: bold"
......
src/views/Business/Bftdcr/index.vue
...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
if(this.isInDisplay){ if(this.isInDisplay){
this.restoryDispaly(); this.restoreDisplay();
} }
//TODO 处理数据逻辑 //TODO 处理数据逻辑
} else { } else {
......
src/views/Business/Bftset/index.vue
...@@ -120,6 +120,9 @@ export default { ...@@ -120,6 +120,9 @@ export default {
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
this.updateModel(rtnmsg.data) this.updateModel(rtnmsg.data)
if(this.isInDisplay){
this.restoreDisplay();
}
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection(); this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
} }
else else
......
src/views/Business/Bftsnd/Rgfp.vue
...@@ -410,7 +410,7 @@ ...@@ -410,7 +410,7 @@
v-model="model.bfdgrp.rec.matdat" v-model="model.bfdgrp.rec.matdat"
style="width: 100%" style="width: 100%"
placeholder="请选择到期日期" placeholder="请选择到期日期"
:disabled="model.bfdgrp.rec.matdat!=''||model.bfdgrp.rec.doctypcod === 'P'" :disabled="model.bfdgrp.blk.matper!=''||model.bfdgrp.rec.doctypcod === 'P'"
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -509,7 +509,7 @@ ...@@ -509,7 +509,7 @@
maxlength="65" maxlength="65"
show-word-limit show-word-limit
placeholder="请输入远期单据到期时间" placeholder="请输入远期单据到期时间"
:disabled="model.bfdgrp.blk.matper!=''||model.bfdgrp.rec.doctypcod === 'P'" :disabled="(model.bfdgrp.rec.matdat &&model.bfdgrp.rec.matdat!='')||model.bfdgrp.rec.doctypcod === 'P'"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Business/Botacc/index.vue
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-tab-pane> </el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="engp" name="engp"> <el-tab-pane label="表外/或有" name="engp">
<m-engp :model="model" :codes="codes" /> <m-engp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
...@@ -31,26 +31,26 @@ ...@@ -31,26 +31,26 @@
<!-- <el-tab-pane label="setpan" name="setpan"> <!-- <el-tab-pane label="setpan" name="setpan">
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</el-tab-pane> --> </el-tab-pane> -->
<el-tab-pane label="setpan" name="setpan"> <el-tab-pane label="费用及账务" name="setpan">
<c-content> <c-content>
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="coninfp" name="coninfp"> <el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" /> <m-coninfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="docpan" name="docpan"> <el-tab-pane label="面函" name="docpan">
<c-content> <c-content>
<m-docpan :model="model" :codes="codes" /> <m-docpan :model="model" :codes="codes" />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000546 --> <!--PD000546 -->
<el-tab-pane label="doctre" name="doctre"> <el-tab-pane label="附件" name="doctre">
<m-doctre :model="model" :codes="codes" /> <m-doctre :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
......
src/views/Business/Botdav/Ovwp.vue
...@@ -188,15 +188,12 @@ ...@@ -188,15 +188,12 @@
</c-table> </c-table>
</c-col> --> </c-col> -->
<c-docpre <c-docpre :model="model" :argadr="{
:model="model" path: 'bodgrp.blk.docpre',
:argadr="{
path:'bodgrp.blk.docpre',
grp: 'botp', grp: 'botp',
code:'docpre' code: 'docpre'
}"></c-docpre> }"></c-docpre>
</c-col> </c-col>
<!-- ====================右边======================= --> <!-- ====================右边======================= -->
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
......
src/views/Business/Botpay/index.vue
...@@ -23,32 +23,32 @@ ...@@ -23,32 +23,32 @@
</el-tab-pane> </el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="engp" name="engp"> <el-tab-pane label="表外/或有" name="engp">
<m-engp :model="model" :codes="codes" /> <m-engp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="setpan" name="setpan"> <el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="glepan" name="glepan"> <el-tab-pane label="分录" name="glepan">
<m-glepan :model="model" :codes="codes" /> <m-glepan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="coninfp" name="coninfp"> <el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" /> <m-coninfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="docpan" name="docpan"> <el-tab-pane label="面函" name="docpan">
<m-docpan :model="model" :codes="codes" /> <m-docpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000546 --> <!--PD000546 -->
<el-tab-pane label="doctre" name="doctre"> <el-tab-pane label="附件" name="doctre">
<m-doctre :model="model" :codes="codes" /> <m-doctre :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { codes: {
...CodeTable
}, },
} }
}, },
......
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">
<el-table-column label="1st" width="auto" prop="cmail1" background-color="red">
<template slot-scope="scope"> <template slot-scope="scope">
<c-input v-model="scope.row.cmail1" @change="docpre" :disabled="disabledCmail1" <c-input v-model="scope.row.cmail1" @change="docpre" :disabled="disabledCmail1"
maxlength="12"> maxlength="12">
...@@ -27,27 +28,36 @@ ...@@ -27,27 +28,36 @@
</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="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"> <template slot-scope="scope">
<!-- {{scope.row.docnam}} --> <!-- {{scope.row.docnam}} -->
<c-select style="width: 100%" placeholder="请选择" v-model="scope.row.docnam" <c-select style="width: 100%" placeholder="请选择" v-model="scope.row.docnam"
:disabled="disabledDocnam"> :disabled="disabledDocnam">
<el-option v-for="item in codes[argadr.code]" :key="item.value" :label="item.label" @change="docpre" <el-option v-for="item in codes[argadr.code]" :key="item.value" :label="item.label"
:value="item.value"> @change="docpre" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</template> </template>
</el-table-column> </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> </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
src/views/Review/Business/ReviewBftset.vue 0 → 100644
<template>
<ReviewWrapper>
<Bftset></Bftset>
</ReviewWrapper>
</template>
<script>
import Bftset from "~/views/Business/Bftset";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewBftsnd",
components: { ReviewWrapper, Bftset },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/ReviewRouter.js
...@@ -23,6 +23,7 @@ import ReviewBdteus from "./Business/ReviewBdteus.vue"; ...@@ -23,6 +23,7 @@ import ReviewBdteus from "./Business/ReviewBdteus.vue";
import ReviewBftsnd from "./Business/ReviewBftsnd.vue"; import ReviewBftsnd from "./Business/ReviewBftsnd.vue";
import ReviewBftdcr from "./Business/ReviewBftdcr.vue"; import ReviewBftdcr from "./Business/ReviewBftdcr.vue";
import ReviewLitopn from "./Business/ReviewLitopn.vue"; import ReviewLitopn from "./Business/ReviewLitopn.vue";
import ReviewBftset from "./Business/ReviewBftset.vue";
const ReviewRouter = [ const ReviewRouter = [
...@@ -68,6 +69,7 @@ const ReviewRouter = [ ...@@ -68,6 +69,7 @@ const ReviewRouter = [
{ path: "letamc", component: ReviewLetamc, name: "ReviewLetamc", meta: { title: "复核-Letamc" } }, { path: "letamc", component: ReviewLetamc, name: "ReviewLetamc", meta: { title: "复核-Letamc" } },
{ path: "letame", component: ReviewLetame, name: "ReviewLetame", meta: { title: "复核-Letame" } }, { path: "letame", component: ReviewLetame, name: "ReviewLetame", meta: { title: "复核-Letame" } },
{ path: "litopn", component: ReviewLitopn, name: "ReviewLitopn", meta: { title: "复核-Litopn" } }, { path: "litopn", component: ReviewLitopn, name: "ReviewLitopn", meta: { title: "复核-Litopn" } },
{ path: "bftset", component: ReviewBftset, name: "ReviewBftset", meta: { title: "复核-Bftset" } },
{ path: "litame", component: ReviewLitame, name: "ReviewLitame", meta: { title: "复核-Litame" } }, { path: "litame", component: ReviewLitame, name: "ReviewLitame", meta: { title: "复核-Litame" } },
]; ];
......
vue.config.js
...@@ -26,7 +26,8 @@ module.exports = { ...@@ -26,7 +26,8 @@ module.exports = {
assetsDir: 'static', assetsDir: 'static',
productionSourceMap: false, productionSourceMap: false,
devServer: { devServer: {
port: port, host:'127.0.0.1',
port: 8010,
open: true, open: true,
overlay: { overlay: {
warnings: false, warnings: false,
......
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