Skip to content

V
vue-gjjs
Commit a888fcf1 by wangyanjiao
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 9b7439ca 2fa56bd4
Showing with 91 additions and 40 deletions
src/model/Detopn/Pattern.js
......@@ -359,7 +359,7 @@ export default {
"dedgrp.rec.conamt":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"整数位不能超过13位"},
{max: 17,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/, message: "小数位不能超过2位" }
],
"dedgrp.blk.stamet":[
......
src/model/Litopn/Default.js
......@@ -27,7 +27,7 @@ export default {
"lidgrp.rec.rmbflg" :Utils.defaultFunction,
"lidgrp.ben.pts.extkey" :Utils.defaultFunction,
"lidgrp.adv.pts.extkey" :Utils.defaultFunction,
// "lidgrp.avb.pts.extkey" :Utils.defaultFunction,
"lidgrp.avb.pts.extkey" :Utils.defaultFunction,
"hmdmod2.bennam" :Utils.defaultFunction,
"liaall.limmod.comamt" :Utils.defaultFunction,
"liaall.limmod.ccvamt" :Utils.defaultFunction,
......@@ -39,7 +39,7 @@ export default {
"lidgrp.avb.adrelc" :Utils.defaultFunction,
"lidgrp.avb.namelc" :Utils.defaultFunction,
"lidgrp.avb.dbfadrblkcn" :Utils.defaultFunction,
//"lidgrp.avb.pts.adrblk" :Utils.defaultFunction,
"lidgrp.avb.pts.adrblk" :Utils.defaultFunction,
"cnybop.libflg" :Utils.defaultFunction,
"trnmod.trndia.dspstm" :Utils.defaultFunction,
"lidgrp.a2b.pts.extkey" :Utils.defaultFunction,
......
src/model/Litopn/Pattern.js
......@@ -253,8 +253,8 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"lidgrp.blk.avbwthtxt":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{type: "string", required: false},
{max: 135,message:"长度不能超过135"}
],
"lidgrp.avb.adrelc":[
......
src/model/Litopn/index.js
......@@ -140,6 +140,7 @@ export default class Litopn{
},
},
litp:{
avbwthtxt:"",
ptsaddp:{
ptsaddg:"",
},
......@@ -158,6 +159,7 @@ export default class Litopn{
},
},
aamp:{
addamtcov:"",
aammod:{
addamtflg:"", // Add. Amount .litp.aamp.aammod.addamtflg
},
......
src/views/Business/Detdrv/Dscins.vue
......@@ -101,7 +101,9 @@
>
</c-select>
<template slot="footer">
<c-checkbox v-model="model.bfdgrp.blk.docdisflg" style="margin-left: 10px"
<c-checkbox
v-model="model.bfdgrp.blk.docdisflg"
style="margin-left: 10px"
>录入不符点</c-checkbox
>
</template>
......@@ -144,24 +146,33 @@
>
</span>
</c-col> -->
<c-col :span="24" style="height:24px;margin-top:20px">
<el-form-item :label="model.bftp.docgrdm.docdsclab" class="messageLabel">
<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">
<c-col :span="24" style="height: 0px; margin-top: 5px">
<el-divider></el-divider>
</c-col>
<c-col :span="24">
<c-docpre
:model="model"
:argadr="{
path: 'bftp.docgrdm.docgrd',
grp: 'bftp',
code: 'bdtdck',
}"
>
</c-docpre>
<!-- <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 prop="cmail1" label="1st"> </el-table-column>
<el-table-column prop="cmail2" label="2st"> </el-table-column>
<el-table-column prop="docnam" label="Document">
</el-table-column>
</c-table>
</c-col>
</c-col> -->
</div>
</template>
<script>
......@@ -170,12 +181,13 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Detdrv/Event";
import Ptap from "~/views/Public/Ptap";
import Docpre from "~/views/Public/Docpre";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
components: { "c-ptap": Ptap },
components: { "c-ptap": Ptap, "c-docpre": Docpre },
data() {
return {};
},
......@@ -184,9 +196,9 @@ export default {
};
</script>
<style>
.messageLabel >>> .el-form-item__label{
.messageLabel >>> .el-form-item__label {
text-align: left;
font-weight:bold;
font-weight: bold;
font-size: 12px;
}
</style>
src/views/Business/Detopn/Ovwp.vue
......@@ -519,7 +519,6 @@
grp: 'dedgrp',
rol: 'ben',
}"
:disabled="true"
:isAdrblk="false"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
......@@ -636,7 +635,6 @@
grp: 'dedgrp',
rol: 'apl',
}"
:disabled="true"
:isAdrblk="false"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
......
src/views/Business/Litopn/Detp.vue
......@@ -27,7 +27,6 @@
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
@click="onSeainf('lidgrp.avb.pts.extkey')"
>
<span style="font-family:'宋体';font-weight:bold">i</span>
</c-button>
......@@ -58,13 +57,20 @@
</el-form-item>
</c-col> -->
<c-col :span="24">
<c-col :span="24" v-if="this.flag4">
<el-form-item label="Available in" prop="lidgrp.avb.pts.adrblk">
<c-input
:disabled="this.flag6"
type="textarea" v-model="model.lidgrp.avb.pts.adrblk" maxlength="135" :rows="4" show-word-limit placeholder="请输入Available in" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24" v-if="!this.flag4">
<el-form-item label="Available in" prop="lidgrp.blk.avbwthtxt">
<c-input
type="textarea" v-model="model.lidgrp.blk.avbwthtxt" maxlength="135" :rows="4" show-word-limit placeholder="请输入Available in" ></c-input>
</el-form-item>
</c-col>
<!--
<c-col :span="24">
<el-form-item label="Address Block" prop="lidgrp.avb.pts.adrblk">
......@@ -377,6 +383,9 @@ export default {
this.flag6=false
}else{
this.flag4=true;
// if(val == 'I'){
// this.model.lidgrp.avb.pts.adrblk='Any Bank'
// }
}
}
},
......
src/views/Business/Litopn/Ovwp.vue
......@@ -273,7 +273,7 @@
v-model="model.lidgrp.rec.shppar"
style="width: 100%"
placeholder="请选择Partial Shipment"
:code="codes.shppar"
:code="codes.shppars18"
>
</c-select>
</el-form-item>
......
src/views/Business/Litopn/Ptyp.vue
......@@ -365,6 +365,7 @@
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('lidgrp.avb.pts.extkey')"
></c-input>
<template slot="footer">
<c-button
......
src/views/Public/Setpan.vue
......@@ -46,10 +46,10 @@
<c-checkbox v-model="model.setmod.xreflg">Recalculate Rates</c-checkbox>
</c-col>
-->
<c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
</c-col>
<!-- ==============中部表格===================== -->
<c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
</c-col>
<!-- ==============第一个表格===================== -->
<c-col :span="23" style="height:24px;margin-left:9px">
<el-form-item class="formItemLabel" label="Foreign Commission/Charges:" label-width="300px">
......@@ -100,10 +100,21 @@
</el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right">
<template slot-scope="scope" slot="header">
<c-button circle style="padding:4px" class="el-icon-plus" size="mini" @click="addRow(scope)">
<c-button
circle
style="padding:4px"
class="el-icon-plus"
size="mini"
@click="addRowSetfol(scope)"
>
</c-button>
<c-button style="padding:4px" circle class="el-icon-minus" size="mini"
@click="removeRow(scope)">
<c-button
style="padding:4px"
circle
class="el-icon-minus"
size="mini"
@click="removeRowSetfol(scope)"
>
</c-button>
</template>
<template slot-scope="scoped">
......@@ -214,11 +225,22 @@
<el-table-column label="Fee Amount" prop="amt" width="150px">
</el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right">
<template slot-scope="scope" slot="header">
<c-button circle style="padding:4px" class="el-icon-plus" size="mini" @click="addRow(scope)">
<template slot-scope="scope" slot="header">
<c-button
circle
style="padding:4px"
class="el-icon-plus"
size="mini"
@click="addRowSetfel(scope)"
>
</c-button>
<c-button style="padding:4px" circle class="el-icon-minus" size="mini"
@click="removeRow(scope)">
<c-button
style="padding:4px"
circle
class="el-icon-minus"
size="mini"
@click="removeRowSetfel(scope)"
>
</c-button>
</template>
<template slot-scope="scoped">
......@@ -947,18 +969,25 @@ export default {
},
methods: {
//第一个表格
addRow() {
let newRow = { ...dialog };
this.model.setmod.setfog.setfol.push(newRow);
addRowSetfol() {
let newRow = { ...this.dialog };
this.model.setmod.setfog.setfol.splice(0, 0, newRow);
},
removeRow() {
this.model.setmod.setfog.setfol.pop();
removeRowSetfol() {
this.model.setmod.setfog.setfol.shift();
},
saveDialog() {
this.dialogVisible = false;
this.model.setmod.setfog.setfol[this.index] = this.dialog;
},
// 第二个表格
addRowSetfel() {
let newRow = { ...this.dialog2 };
this.model.setmod.setfeg.setfel.splice(0, 0, newRow);
},
removeRowSetfel() {
this.model.setmod.setfeg.setfel.shift();
},
detail1(index, row) {
this.executeDefault("setfel.det").then(res => {
this.dialogVisible = true;
......
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