Skip to content

V
vue-gjjs
Commit 59186260 by 闫泽浩
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents 1350a03b ba989b95
Showing with 101 additions and 88 deletions
src/business/brtset/event/buildCommons.js
......@@ -73,6 +73,7 @@ export default {
cbsMap: {
MAX: model.brdgrp.cbs.max,
OPN1: model.brdgrp.cbs.opn1,
OPN2: model.brdgrp.cbs.opn2,
MAC: model.brdgrp.cbs.mac,
MAC2: model.brdgrp.cbs.mac2,
OPC2: model.brdgrp.cbs.opc2,
......
src/business/litcan/event/buildCommons.js
......@@ -31,6 +31,7 @@ export default {
let dataObj = {
rec: {
objtyp: 'LID',
objinr: model.lidgrp.rec.inr,
ownref: model.lidgrp.rec.ownref,
opndat: model.lidgrp.rec.opndat,
expdat: model.lidgrp.rec.expdat,
......@@ -47,10 +48,12 @@ export default {
purpos: model.lidgrp.rec.purpos,
revflg: model.lidgrp.rec.revflg,
cnfsta: model.lidgrp.rec.cnfsta,
rmbclg: model.lidgrp.rec.rmbclg,
},
cbsMap: {
MAX: model.lidgrp.cbs.max,
OPN1: model.lidgrp.cbs.opn1,
NOM1: model.lidgrp.cbs.nom1,
MAC: model.lidgrp.cbs.mac,
MAC2: model.lidgrp.cbs.mac2,
OPC2: model.lidgrp.cbs.opc2,
......
src/business/litrog/event/index.js
......@@ -140,7 +140,7 @@ export default {
let params = {
userId: window.sessionStorage.userId || 'ZL',
ptytyp: ptytyp,
extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
extkey: this.model.brdgrp[type.toLowerCase()].pts.extkey,
};
let res = await Api.post('/service/ptspta/list', params);
if (res.respCode == SUCCESS) {
......@@ -156,7 +156,7 @@ export default {
};
let res = await Api.post('/service/ptspta/fetch', params);
if (res.respCode == SUCCESS) {
this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
this.$set(this.model.brdgrp, row.role.toLowerCase(), res.data);
}
},
// 业务信息=》基本信息=》支出目的
......
src/business/litrog/views/Rog.vue
......@@ -371,43 +371,62 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址编码" prop="brdgrp.prb.pts.extkey">
<c-fullbox>
<c-input
v-model="model.brdgrp.prb.pts.extkey"
maxlength="16"
placeholder="请输入地址编码"
></c-input>
<!-- <c-col :span="24">-->
<!-- <el-form-item label="地址编码" prop="brdgrp.prb.pts.extkey">-->
<!-- <c-fullbox>-->
<!-- <c-input-->
<!-- v-model="model.brdgrp.prb.pts.extkey"-->
<!-- maxlength="16"-->
<!-- placeholder="请输入地址编码"-->
<!-- ></c-input>-->
<!-- <template slot="footer">-->
<!-- <c-button-->
<!-- style="margin: 0 5px 0 10px; padding: 0 12px"-->
<!-- size="small"-->
<!-- type="primary"-->
<!-- icon="el-icon-info"-->
<!-- >-->
<!-- </c-button>-->
<!-- <c-button style="margin: 0 0" size="small" type="primary">-->
<!-- 详情-->
<!-- </c-button>-->
<!-- </template>-->
<!-- </c-fullbox>-->
<!-- </el-form-item>-->
<!-- </c-col>-->
<!-- <c-col :span="24">-->
<!-- <el-form-item label="地址信息" prop="brdgrp.prb.pts.adrblk">-->
<!-- <c-input-->
<!-- :rows="5"-->
<!-- type="textarea"-->
<!-- v-model="model.brdgrp.prb.pts.adrblk"-->
<!-- maxlength="200"-->
<!-- show-word-limit-->
<!-- placeholder="请输入地址信息"-->
<!-- ></c-input>-->
<!-- </el-form-item>-->
<!-- </c-col>-->
<template slot="footer">
<c-button
style="margin: 0 5px 0 10px; padding: 0 12px"
size="small"
type="primary"
icon="el-icon-info"
<c-col :span="24">
<c-ptap
:model="model"
:argadr="{
title: '地址编码',
grp: 'brdgrp',
rol: 'prb',
}"
@keyup.enter.native="
queryGridEtyPromptDialogData('PRB', 'C')
"
:noRef="true"
:disabled="true"
:isAdrblk="true"
>
</c-button>
<c-button style="margin: 0 0" size="small" type="primary">
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-ptap>
</c-col>
<c-col :span="24">
<el-form-item label="地址信息" prop="brdgrp.prb.pts.adrblk">
<c-input
:rows="5"
type="textarea"
v-model="model.brdgrp.prb.pts.adrblk"
maxlength="200"
show-word-limit
placeholder="请输入地址信息"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="发票类型" prop="brdgrp.rec.invtyp">
......@@ -425,8 +444,10 @@
</template>
<script>
import event from '../event';
import Ptap from "~/views/Public/Ptap";
export default {
components: {"c-ptap": Ptap },
inject: ['root'],
props: ['model', 'codes'],
mixins: [event],
......
src/business/litrog/views/Shpdet.vue
<template>
<div class="eibs">
<!--==========================left====================== -->
<el-col :span="12" style="padding-right: 20px;">
<!--==========================left====================== -->
<el-col :span="12" style="padding-right: 20px;">
<c-col :span="24">
<el-form-item label="提货担保申请人" prop="brdgrp.rec.relgodflg">
<c-select
......@@ -29,13 +29,15 @@
<c-col :span="12">
<el-form-item label="放货日期" prop="brdgrp.rec.relgoddat">
<c-date-picker type="date" v-model="model.brdgrp.rec.relgoddat" style="width:100%" placeholder="请选择放货日期"></c-date-picker>
<c-date-picker type="date" v-model="model.brdgrp.rec.relgoddat" style="width:100%"
placeholder="请选择放货日期"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="到期日" prop="brdgrp.rec.expdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.expdat" style="width:100%" placeholder="请选择到期日"></c-date-picker>
<c-date-picker type="date" v-model="model.brdgrp.rec.expdat" style="width:100%"
placeholder="请选择到期日"></c-date-picker>
</el-form-item>
</c-col>
......@@ -56,7 +58,8 @@
<c-col :span="24">
<el-form-item label="提单装船期" prop="brdgrp.rec.tradat">
<c-date-picker type="date" v-model="model.brdgrp.rec.tradat" style="width:100%" placeholder="请选择日期"></c-date-picker>
<c-date-picker type="date" v-model="model.brdgrp.rec.tradat" style="width:100%"
placeholder="请选择日期"></c-date-picker>
</el-form-item>
</c-col>
......@@ -91,7 +94,8 @@
<el-form-item label="货物描述" prop="brdgrp.blk.roggod">
<c-input
:rows="6"
type="textarea" v-model="model.brdgrp.blk.roggod" maxlength="40" show-word-limit placeholder="请输入货物描述" ></c-input>
type="textarea" v-model="model.brdgrp.blk.roggod" maxlength="40" show-word-limit
placeholder="请输入货物描述"></c-input>
</el-form-item>
</c-col>
......@@ -106,11 +110,11 @@
<c-input v-model="model.brdgrp.blk.voynum" maxlength="30" placeholder="请输入航号"></c-input>
</el-form-item>
</c-col>
</el-col>
</el-col>
<!-- =========================right====================== -->
<el-col :span="12" style="padding-left: 20px;">
<!-- =========================right====================== -->
<el-col :span="12" style="padding-left: 20px;">
<c-col :span="24">
<el-form-item label="合同编号" prop="brtp.connum">
<c-input v-model="model.brtp.connum" maxlength="35" placeholder="请输入合同编号"></c-input>
......@@ -130,58 +134,43 @@
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.brdgrp.rec.rtoaplflg" style="margin-left:140px;padding: 0 10px;">发申请人</c-checkbox>
<c-checkbox v-model="model.brdgrp.rec.rtoaplflg" style="margin-left:140px;padding: 0 10px;">发申请人
</c-checkbox>
</c-col>
<c-col :span="24">
<el-form-item label="收货人名称及地址" prop="brdgrp.blk.relstoadr">
<c-input
:rows="4"
type="textarea" v-model="model.brdgrp.blk.relstoadr" maxlength="180" show-word-limit placeholder="请输入收货人名称及地址" ></c-input>
type="textarea" v-model="model.brdgrp.blk.relstoadr" maxlength="180" show-word-limit
placeholder="请输入收货人名称及地址"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="船务公司" prop="brdgrp.shp.pts.extkey">
<c-fullbox>
<c-input v-model="model.brdgrp.shp.pts.extkey" maxlength="16" placeholder="请输入地址编码"
></c-input>
<template slot="footer">
<c-button
style="margin: 0 5px 0 10px; padding: 0 12px"
size="small"
type="primary"
icon="el-icon-info"
<c-ptap
:model="model"
:argadr="{
title: '船务公司',
grp: 'brdgrp',
rol: 'shp',
}"
@keyup.enter.native="
queryGridEtyPromptDialogData('SHP', 'C')
"
:noRef="true"
:disabled="false"
:isAdrblk="true"
>
</c-button>
<c-button
style="margin: 0 0"
size="small"
type="primary"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址信息" prop="brdgrp.shp.pts.adrblk">
<c-input
:rows="4"
type="textarea" v-model="model.brdgrp.shp.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入地址信息" ></c-input>
</el-form-item>
</c-ptap>
</c-col>
<c-col :span="24">
<el-form-item label="被通知人" prop="brdgrp.blk.notpty">
<c-input
:rows="4"
type="textarea" v-model="model.brdgrp.blk.notpty" maxlength="35" show-word-limit placeholder="请输入被通知人" ></c-input>
type="textarea" v-model="model.brdgrp.blk.notpty" maxlength="35" show-word-limit
placeholder="请输入被通知人"></c-input>
</el-form-item>
</c-col>
......@@ -196,26 +185,25 @@
</c-select>
</el-form-item>
</c-col>
</el-col>
</el-col>
</div>
</template>
<script>
import event from '../event'
import Ptap from "~/views/Public/Ptap";
export default {
components: {"c-ptap": Ptap},
inject: ['root'],
props:['model','codes'],
props: ['model', 'codes'],
mixins: [event],
data(){
return {
}
data() {
return {}
},
methods:{},
created:function(){
methods: {},
created: function () {
}
}
......
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