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 204 additions and 191 deletions
src/business/brtset/event/buildCommons.js
...@@ -73,6 +73,7 @@ export default { ...@@ -73,6 +73,7 @@ export default {
cbsMap: { cbsMap: {
MAX: model.brdgrp.cbs.max, MAX: model.brdgrp.cbs.max,
OPN1: model.brdgrp.cbs.opn1, OPN1: model.brdgrp.cbs.opn1,
OPN2: model.brdgrp.cbs.opn2,
MAC: model.brdgrp.cbs.mac, MAC: model.brdgrp.cbs.mac,
MAC2: model.brdgrp.cbs.mac2, MAC2: model.brdgrp.cbs.mac2,
OPC2: model.brdgrp.cbs.opc2, OPC2: model.brdgrp.cbs.opc2,
......
src/business/litcan/event/buildCommons.js
...@@ -31,6 +31,7 @@ export default { ...@@ -31,6 +31,7 @@ export default {
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'LID', objtyp: 'LID',
objinr: model.lidgrp.rec.inr,
ownref: model.lidgrp.rec.ownref, ownref: model.lidgrp.rec.ownref,
opndat: model.lidgrp.rec.opndat, opndat: model.lidgrp.rec.opndat,
expdat: model.lidgrp.rec.expdat, expdat: model.lidgrp.rec.expdat,
...@@ -47,10 +48,12 @@ export default { ...@@ -47,10 +48,12 @@ export default {
purpos: model.lidgrp.rec.purpos, purpos: model.lidgrp.rec.purpos,
revflg: model.lidgrp.rec.revflg, revflg: model.lidgrp.rec.revflg,
cnfsta: model.lidgrp.rec.cnfsta, cnfsta: model.lidgrp.rec.cnfsta,
rmbclg: model.lidgrp.rec.rmbclg,
}, },
cbsMap: { cbsMap: {
MAX: model.lidgrp.cbs.max, MAX: model.lidgrp.cbs.max,
OPN1: model.lidgrp.cbs.opn1, OPN1: model.lidgrp.cbs.opn1,
NOM1: model.lidgrp.cbs.nom1,
MAC: model.lidgrp.cbs.mac, MAC: model.lidgrp.cbs.mac,
MAC2: model.lidgrp.cbs.mac2, MAC2: model.lidgrp.cbs.mac2,
OPC2: model.lidgrp.cbs.opc2, OPC2: model.lidgrp.cbs.opc2,
......
src/business/litrog/event/index.js
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
let params = { let params = {
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
ptytyp: ptytyp, 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); let res = await Api.post('/service/ptspta/list', params);
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
}; };
let res = await Api.post('/service/ptspta/fetch', params); let res = await Api.post('/service/ptspta/fetch', params);
if (res.respCode == SUCCESS) { 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,44 +371,63 @@ ...@@ -371,44 +371,63 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <!-- <c-col :span="24">-->
<el-form-item label="地址编码" prop="brdgrp.prb.pts.extkey"> <!-- <el-form-item label="地址编码" prop="brdgrp.prb.pts.extkey">-->
<c-fullbox> <!-- <c-fullbox>-->
<c-input <!-- <c-input-->
v-model="model.brdgrp.prb.pts.extkey" <!-- v-model="model.brdgrp.prb.pts.extkey"-->
maxlength="16" <!-- maxlength="16"-->
placeholder="请输入地址编码" <!-- placeholder="请输入地址编码"-->
></c-input> <!-- ></c-input>-->
<template slot="footer"> <!-- <template slot="footer">-->
<c-button <!-- <c-button-->
style="margin: 0 5px 0 10px; padding: 0 12px" <!-- style="margin: 0 5px 0 10px; padding: 0 12px"-->
size="small" <!-- size="small"-->
type="primary" <!-- type="primary"-->
icon="el-icon-info" <!-- icon="el-icon-info"-->
> <!-- >-->
</c-button> <!-- </c-button>-->
<c-button style="margin: 0 0" size="small" type="primary"> <!-- <c-button style="margin: 0 0" size="small" type="primary">-->
详情 <!-- 详情-->
</c-button> <!-- </c-button>-->
</template> <!-- </template>-->
</c-fullbox> <!-- </c-fullbox>-->
</el-form-item> <!-- </el-form-item>-->
</c-col> <!-- </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"> <c-col :span="24">
<el-form-item label="地址信息" prop="brdgrp.prb.pts.adrblk"> <c-ptap
<c-input :model="model"
:rows="5" :argadr="{
type="textarea" title: '地址编码',
v-model="model.brdgrp.prb.pts.adrblk" grp: 'brdgrp',
maxlength="200" rol: 'prb',
show-word-limit }"
placeholder="请输入地址信息" @keyup.enter.native="
></c-input> queryGridEtyPromptDialogData('PRB', 'C')
</el-form-item> "
:noRef="true"
:disabled="true"
:isAdrblk="true"
>
</c-ptap>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="发票类型" prop="brdgrp.rec.invtyp"> <el-form-item label="发票类型" prop="brdgrp.rec.invtyp">
<c-select <c-select
...@@ -425,8 +444,10 @@ ...@@ -425,8 +444,10 @@
</template> </template>
<script> <script>
import event from '../event'; import event from '../event';
import Ptap from "~/views/Public/Ptap";
export default { export default {
components: {"c-ptap": Ptap },
inject: ['root'], inject: ['root'],
props: ['model', 'codes'], props: ['model', 'codes'],
mixins: [event], mixins: [event],
......
src/business/litrog/views/Shpdet.vue
<template> <template>
<div class="eibs"> <div class="eibs">
<!--==========================left====================== --> <!--==========================left====================== -->
<el-col :span="12" style="padding-right: 20px;"> <el-col :span="12" style="padding-right: 20px;">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="提货担保申请人" prop="brdgrp.rec.relgodflg"> <el-form-item label="提货担保申请人" prop="brdgrp.rec.relgodflg">
<c-select <c-select
v-model="model.brdgrp.rec.relgodflg" v-model="model.brdgrp.rec.relgodflg"
style="width:100%" style="width:100%"
placeholder="请选择提货担保申请人" placeholder="请选择提货担保申请人"
:code="codes.relgod" :code="codes.relgod"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="放货类型" prop="brdgrp.rec.reltyp"> <el-form-item label="放货类型" prop="brdgrp.rec.reltyp">
<c-select <c-select
v-model="model.brdgrp.rec.reltyp" v-model="model.brdgrp.rec.reltyp"
style="width:100%" style="width:100%"
placeholder="请选择放货类型" placeholder="请选择放货类型"
:code="codes.reltyp1" :code="codes.reltyp1"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="放货日期" prop="brdgrp.rec.relgoddat"> <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> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="到期日" prop="brdgrp.rec.expdat"> <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> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="货物单据类型" prop="brdgrp.rec.trpdoctyp"> <el-form-item label="货物单据类型" prop="brdgrp.rec.trpdoctyp">
<c-select v-model="model.brdgrp.rec.trpdoctyp" style="width:100%" placeholder="请选择货物单据类型"> <c-select v-model="model.brdgrp.rec.trpdoctyp" style="width:100%" placeholder="请选择货物单据类型">
<el-option v-for="item in codes.trpdoctyp" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codes.trpdoctyp" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="运输单据编号" prop="brdgrp.rec.trpdocnum"> <el-form-item label="运输单据编号" prop="brdgrp.rec.trpdocnum">
<c-input v-model="model.brdgrp.rec.trpdocnum" maxlength="40" placeholder="请输入运输单据编号"></c-input> <c-input v-model="model.brdgrp.rec.trpdocnum" maxlength="40" placeholder="请输入运输单据编号"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="提单装船期" prop="brdgrp.rec.tradat"> <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> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="运输模式" prop="brdgrp.rec.tramod"> <el-form-item label="运输模式" prop="brdgrp.rec.tramod">
<c-select v-model="model.brdgrp.rec.tramod" style="width:100%" placeholder="请选择运输模式"> <c-select v-model="model.brdgrp.rec.tramod" style="width:100%" placeholder="请选择运输模式">
<el-option v-for="item in codes.tramod" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codes.tramod" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="运输工具" prop="brdgrp.blk.vesnam"> <el-form-item label="运输工具" prop="brdgrp.blk.vesnam">
<c-input v-model="model.brdgrp.blk.vesnam" maxlength="40" placeholder="请输入运输工具"></c-input> <c-input v-model="model.brdgrp.blk.vesnam" maxlength="40" placeholder="请输入运输工具"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="卸货口岸" prop="brdgrp.blk.pordis"> <el-form-item label="卸货口岸" prop="brdgrp.blk.pordis">
<c-input v-model="model.brdgrp.blk.pordis" maxlength="40" placeholder="请输入卸货口岸"></c-input> <c-input v-model="model.brdgrp.blk.pordis" maxlength="40" placeholder="请输入卸货口岸"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="移交地点" prop="brdgrp.blk.delplc"> <el-form-item label="移交地点" prop="brdgrp.blk.delplc">
<c-input v-model="model.brdgrp.blk.delplc" maxlength="40" placeholder="请输入移交地点"></c-input> <c-input v-model="model.brdgrp.blk.delplc" maxlength="40" placeholder="请输入移交地点"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="货物描述" prop="brdgrp.blk.roggod"> <el-form-item label="货物描述" prop="brdgrp.blk.roggod">
<c-input <c-input
:rows="6" :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> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="起运口岸" prop="brdgrp.blk.porlod"> <el-form-item label="起运口岸" prop="brdgrp.blk.porlod">
<c-input v-model="model.brdgrp.blk.porlod" maxlength="40" placeholder="请输入起运口岸"></c-input> <c-input v-model="model.brdgrp.blk.porlod" maxlength="40" placeholder="请输入起运口岸"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="航号" prop="brdgrp.blk.voynum"> <el-form-item label="航号" prop="brdgrp.blk.voynum">
<c-input v-model="model.brdgrp.blk.voynum" maxlength="30" placeholder="请输入航号"></c-input> <c-input v-model="model.brdgrp.blk.voynum" maxlength="30" placeholder="请输入航号"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</el-col> </el-col>
<!-- =========================right====================== --> <!-- =========================right====================== -->
<el-col :span="12" style="padding-left: 20px;"> <el-col :span="12" style="padding-left: 20px;">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="合同编号" prop="brtp.connum"> <el-form-item label="合同编号" prop="brtp.connum">
<c-input v-model="model.brtp.connum" maxlength="35" placeholder="请输入合同编号"></c-input> <c-input v-model="model.brtp.connum" maxlength="35" placeholder="请输入合同编号"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="承运人" prop="brdgrp.blk.carnam"> <el-form-item label="承运人" prop="brdgrp.blk.carnam">
<c-input v-model="model.brdgrp.blk.carnam" maxlength="35" placeholder="请输入承运人"></c-input> <c-input v-model="model.brdgrp.blk.carnam" maxlength="35" placeholder="请输入承运人"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="海运/远洋提单编号" prop="brdgrp.rec.blnum"> <el-form-item label="海运/远洋提单编号" prop="brdgrp.rec.blnum">
<c-input v-model="model.brdgrp.rec.blnum" maxlength="20" placeholder="请输入海运/远洋提单编号"></c-input> <c-input v-model="model.brdgrp.rec.blnum" maxlength="20" placeholder="请输入海运/远洋提单编号"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <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-col> </c-checkbox>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="收货人名称及地址" prop="brdgrp.blk.relstoadr"> <el-form-item label="收货人名称及地址" prop="brdgrp.blk.relstoadr">
<c-input <c-input
:rows="4" :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
</el-form-item> placeholder="请输入收货人名称及地址"></c-input>
</c-col> </el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="船务公司" prop="brdgrp.shp.pts.extkey"> <c-col :span="24">
<c-fullbox> <c-ptap
<c-input v-model="model.brdgrp.shp.pts.extkey" maxlength="16" placeholder="请输入地址编码" :model="model"
></c-input> :argadr="{
<template slot="footer"> title: '船务公司',
<c-button grp: 'brdgrp',
style="margin: 0 5px 0 10px; padding: 0 12px" rol: 'shp',
size="small" }"
type="primary" @keyup.enter.native="
icon="el-icon-info" queryGridEtyPromptDialogData('SHP', 'C')
> "
:noRef="true"
</c-button> :disabled="false"
<c-button :isAdrblk="true"
style="margin: 0 0" >
size="small" </c-ptap>
type="primary" </c-col>
>
详情 <c-col :span="24">
</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-col>
<c-col :span="24">
<el-form-item label="被通知人" prop="brdgrp.blk.notpty"> <el-form-item label="被通知人" prop="brdgrp.blk.notpty">
<c-input <c-input
:rows="4" :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> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="货物类型" prop="brdgrp.rec.ngrcod"> <el-form-item label="货物类型" prop="brdgrp.rec.ngrcod">
<c-select <c-select
v-model="model.brdgrp.rec.ngrcod" v-model="model.brdgrp.rec.ngrcod"
style="width:100%" style="width:100%"
placeholder="请选择货物类型" placeholder="请选择货物类型"
:code="codes.bnrsec" :code="codes.bnrsec"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</el-col> </el-col>
</div> </div>
</template> </template>
<script> <script>
import event from '../event' import event from '../event'
import Ptap from "~/views/Public/Ptap";
export default { export default {
inject: ['root'], components: {"c-ptap": Ptap},
props:['model','codes'], inject: ['root'],
mixins: [event], props: ['model', 'codes'],
data(){ mixins: [event],
return { data() {
return {}
} },
}, methods: {},
methods:{}, created: function () {
created:function(){
}
}
} }
</script> </script>
<style> <style>
......
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