Commit bcd122a0 by SunJie

Merge remote-tracking branch 'origin/master'

parents b6a5c721 c051c401
......@@ -300,7 +300,7 @@ export default {
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
this.stmData.data = rtnmsg.data.stgStm.rows;
this.stmData.data = rtnmsg.data.liaall_liaccv_stgstm.rows;
this.dialogTableVisible = true;
......@@ -427,9 +427,10 @@ export default {
},
async pickDepItem(row){
debugger;
var params = {'selsptinr':row[0]};
//{params:{'selsptinr':row[0]}}
let rtnmsg = await Api.post("ditopn/executeRule/liaall.liaccv.add",{...Utils.getRequestDataFn.call(this),params})
let rtnmsg = await Api.post("ditopn/executeRule/liaall.liaccv.add",{...Utils.flatObject(this.model),params})
if (rtnmsg.respCode == "AAAAAA") {
this.dialogTableVisible = false;
Utils.copyValueFromVO(this.model,rtnmsg.data);
......
......@@ -37,6 +37,7 @@
:disabled="model.litameadv != 2"
type="textarea"
v-model="model.ameadvrmk"
:autosize="{ minRows: 4, maxRows: 6 }"
maxlength="68"
style="width: 80%"
show-word-limit
......
......@@ -9,7 +9,7 @@
-->
<el-col :span="12">
<el-form-item label="合同金额" prop="liaall.liaccv.concur">
<el-row>
<el-row :gutter="20">
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
......@@ -29,7 +29,6 @@
</el-option>
</c-select>
</el-col>
<el-col :span="14">
<c-input
:readonly="true"
......@@ -73,7 +72,7 @@
-->
<el-col :span="12">
<el-form-item label="Reserved Amount" prop="liaall.liaccv.newresamt">
<el-row>
<el-row :gutter="20">
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
......@@ -140,7 +139,7 @@
<el-col :span="12">
<el-form-item label="应付保证金金额" prop="liaall.liaccv.concur">
<el-row>
<el-row :gutter="20">
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
......
......@@ -11,6 +11,7 @@
type="textarea"
v-model="model.mtabut.coninf.oitinf.oit.inftxt"
maxlength="60"
:autosize="{ minRows: 4, maxRows: 6 }"
show-word-limit
placeholder="请输入Infotext"
></c-input>
......@@ -50,6 +51,7 @@
type="textarea"
v-model="model.mtabut.coninf.oitset.oit.inftxt"
maxlength="60"
:autosize="{ minRows: 4, maxRows: 6 }"
show-word-limit
placeholder="请输入Infotext"
></c-input>
......
......@@ -55,15 +55,19 @@
</el-col>
<el-col :span="12">
<c-button size="small" type="primary" @click="onLiaallButmisamt">
Add to Current Line
</c-button>
<el-form-item label="">
<c-button size="small" type="primary" @click="onLiaallButmisamt">
Add to Current Line
</c-button>
</el-form-item>
</el-col>
<el-col :span="12">
<c-button size="small" type="primary" @click="onLiaallButmissig">
Add to Sight Amount
</c-button>
<el-form-item label="">
<c-button size="small" type="primary" @click="onLiaallButmissig">
Add to Sight Amount
</c-button>
</el-form-item>
</el-col>
<el-col :span="12">
......
......@@ -21,7 +21,7 @@
<el-col :span="15">
<el-form-item label="MT799(79)备注" prop="ditp.remark">
<c-input type="textarea" v-model="model.ditp.remark" maxlength="800" :rows="6" ></c-input>
<c-input type="textarea" v-model="model.ditp.remark" maxlength="800" :rows="10" ></c-input>
</el-form-item>
</el-col>
</div>
......
......@@ -365,17 +365,17 @@
</c-table>
</el-col>
<el-col :span="12">
<el-col :span="12" style="margin-bottom: 10px;">
<span v-text="model.setmod.retmsg" data-path=".setmod.retmsg">
</span>
</el-col>
<el-col :span="12">
<el-col :span="12" style="margin-bottom: 10px;">
<span v-text="model.setmod.zmqacclab" data-path=".setmod.zmqacclab">
</span>
</el-col>
<el-col :span="12">
<el-col :span="12" style="margin-bottom: 10px;">
<span
v-text="model.setmod.setglg.labdspflg"
data-path=".setmod.setglg.labdspflg"
......
......@@ -7,38 +7,26 @@
-->
<el-col :span="24">
<el-form-item label="货物描述" prop="didgrp.blk.lcrgod">
<c-input type="textarea" v-model="model.didgrp.blk.lcrgod" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
<c-button size="small" type="primary" icon="el-icon-search" @click="onLcrgodButtxmsel">
...
</c-button>
</el-form-item>
<c-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" v-model="model.didgrp.blk.lcrgod" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="单据要求" prop="didgrp.blk.lcrdoc">
<c-input type="textarea" v-model="model.didgrp.blk.lcrdoc" maxlength="1950" style="width:70%;margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
<c-button size="small" type="primary" icon="el-icon-search" @click="onLcrdocButtxmsel">
...
</c-button>
</el-form-item>
<c-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" v-model="model.didgrp.blk.lcrdoc" maxlength="1950" style="width:70%;margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附加条款" prop="didgrp.blk.adlcnd">
<c-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入附加条款" ></c-input>
<c-button size="small" type="primary" icon="el-icon-search" @click="onAdlcndButtxmsel">
...
</c-button>
</el-form-item>
<c-input type="textarea" :autosize="{ minRows: 8, maxRows: 12}" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入附加条款" ></c-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="给付款丶承兑丶议付行的指示" prop="didgrp.blk.insbnk">
<c-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="325" show-word-limit placeholder="请输入付行的指示" ></c-input>
<c-button size="small" type="primary" icon="el-icon-search" @click="onInsbnkButtxmsel">
...
</c-button>
</el-form-item>
<c-input type="textarea" :autosize="{ minRows: 8, maxRows: 12}" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="325" show-word-limit placeholder="请输入付行的指示" ></c-input>
</el-form-item>
</el-col>
<!-- <el-col :span="24">-->
......
<template>
<div class="eibs-tab">
<el-col :span="3" style="text-align:center;margin-bottom: 16px;">
<el-col :span="2" style="text-align:center;margin-bottom: 16px;">
<el-form-item label="" prop="chkinc">
<c-checkbox v-model="model.chkinc">Incoming</c-checkbox>
</el-form-item>
</el-col>
<el-col :span="3" style="text-align:center;margin-bottom: 16px;">
<el-col :span="2" style="text-align:center;margin-bottom: 16px;">
<el-form-item label="" prop="chkdzt">
<c-checkbox v-model="model.chkdzt">E-Trade</c-checkbox>
</el-form-item>
</el-col>
<el-col :span="3" style="text-align:center;margin-bottom: 16px;">
<el-col :span="2" style="text-align:center;margin-bottom: 16px;">
<el-form-item label="" prop="chkpen">
<c-checkbox v-model="model.chkpen">Break</c-checkbox>
</el-form-item>
</el-col>
<el-col :span="3" style="text-align:center;margin-bottom: 16px;">
<el-col :span="2" style="text-align:center;margin-bottom: 16px;">
<el-form-item label="" prop="chkcor">
<c-checkbox v-model="model.chkcor">Correction</c-checkbox>
</el-form-item>
</el-col>
<el-col :span="3" style="text-align:center;margin-bottom: 16px;">
<el-col :span="2" style="text-align:center;margin-bottom: 16px;">
<el-form-item label="" prop="chkaut">
<c-checkbox v-model="model.chkaut">Automatic</c-checkbox>
</el-form-item>
</el-col>
<el-col :span="3" style="text-align:center;margin-bottom: 16px;">
<el-col :span="2" style="text-align:center;margin-bottom: 16px;">
<el-form-item label="" prop="chkdel">
<c-checkbox v-model="model.chkdel">Reject</c-checkbox>
</el-form-item>
</el-col>
<el-col :span="3" style="text-align:center;margin-bottom: 16px;">
<el-col :span="2" style="text-align:center;margin-bottom: 16px;">
<el-form-item label="" prop="chktco">
<c-checkbox v-model="model.chktco">网银</c-checkbox>
</el-form-item>
</el-col>
<el-col :span="3" style="text-align:center;margin-bottom: 16px;">
<el-col :span="2" style="text-align:center;margin-bottom: 16px;">
<el-form-item label="" prop="chkcan">
<c-checkbox v-model="model.chkcan">归档</c-checkbox>
</el-form-item>
......
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