Commit f94a57c7 by wangyanjiao

bdtdcr&bdtdck 数据持久化&新增字段

parent 3d06ebc6
...@@ -33464,5 +33464,15 @@ const CodeTable = { ...@@ -33464,5 +33464,15 @@ const CodeTable = {
{ label: "Shipment Advice", value: "Shipment Advice" }, { label: "Shipment Advice", value: "Shipment Advice" },
{ label: "Weight List", value: "Weight List" }, { label: "Weight List", value: "Weight List" },
], ],
bdtdck: [
{ label: "增值税发票", value: "1" },
{ label: "发票", value: "2" },
{ label: "装箱单", value: "3" },
{ label: "空运单", value: "4" },
{ label: "海运提单", value: "5" },
{ label: "铁路运单", value: "6" },
{ label: "货物收据", value: "7" },
{ label: "邮政收据", value: "8" },
],
} }
export default CodeTable; export default CodeTable;
\ No newline at end of file
...@@ -63,6 +63,7 @@ export default class Bdtdck{ ...@@ -63,6 +63,7 @@ export default class Bdtdck{
pts:new Pts().data, pts:new Pts().data,
}, },
blk:{ blk:{
prsdoc:"",
comcon:"", // Comments and Conclusions .bddgrp.blk.comcon comcon:"", // Comments and Conclusions .bddgrp.blk.comcon
docdis:"", // Discrepancies .bddgrp.blk.docdis docdis:"", // Discrepancies .bddgrp.blk.docdis
docdisflg:"", // discrepancies modified .bddgrp.blk.docdisflg docdisflg:"", // discrepancies modified .bddgrp.blk.docdisflg
......
...@@ -64,6 +64,7 @@ export default class Bdtdcr { ...@@ -64,6 +64,7 @@ export default class Bdtdcr {
pts: new Pts().data, pts: new Pts().data,
}, },
blk: { blk: {
prsdoc:"",
comcon: "", // Comments and Conclusions .bddgrp.blk.comcon comcon: "", // Comments and Conclusions .bddgrp.blk.comcon
docdis: "", // Discrepancies .bddgrp.blk.docdis docdis: "", // Discrepancies .bddgrp.blk.docdis
docdisflg: "", // discrepancies modified .bddgrp.blk.docdisflg docdisflg: "", // discrepancies modified .bddgrp.blk.docdisflg
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<span v-text="model.bdtp.docgrdm.docdsclab" data-path=".bdtp.docgrdm.docdsclab" > </span> <span v-text="model.bdtp.docgrdm.docdsclab" data-path=".bdtp.docgrdm.docdsclab" > </span>
</c-col> --> </c-col> -->
<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.bdtp.docgrdm.docdsclab" class="messageLabel"> <el-form-item :label="model.bdtp.docgrdm.docdsclab" class="messageLabel">
<c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button> <c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button>
</el-form-item> </el-form-item>
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
</el-table-column> </el-table-column>
<el-table-column label="Document" prop="docnam" width="auto"> <el-table-column label="Document" prop="docnam" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{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">
<el-option v-for="item in codeTable" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codeTable" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
...@@ -69,6 +68,16 @@ ...@@ -69,6 +68,16 @@
</template> </template>
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> -->
<c-col>
<c-docpre
:model="model"
:argadr="{
path: 'bddgrp.blk.prsdoc',
grp: 'bdtp',
code: 'bdtdck',
}"></c-docpre>
</c-col> </c-col>
</c-col> </c-col>
...@@ -213,8 +222,12 @@ import Api from "~/service/Api" ...@@ -213,8 +222,12 @@ import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bdtdck/Event" import Event from "~/model/Bdtdck/Event"
import Docpre from "~/views/Public/Docpre";
import Utils from "~/utils"; import Utils from "~/utils";
export default { export default {
components: {
"c-docpre": Docpre,
},
inject: ['root'], inject: ['root'],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</c-col> </c-col>
</c-form-item> </c-form-item>
</c-row> --> </c-row> -->
<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.bdtp.docgrdm.docdsclab" class="messageLabel"> <el-form-item :label="model.bdtp.docgrdm.docdsclab" class="messageLabel">
<c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button> <c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button>
</el-form-item> </el-form-item>
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
</el-table-column> </el-table-column>
<el-table-column label="Document" prop="docnam" width="auto"> <el-table-column label="Document" prop="docnam" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{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">
<el-option v-for="item in codeTable" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codeTable" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
...@@ -59,7 +58,17 @@ ...@@ -59,7 +58,17 @@
</template> </template>
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col> -->
<c-docpre
:model="model"
:argadr="{
path: 'bddgrp.blk.prsdoc',
grp: 'bdtp',
code: 'bdtdck',
}"></c-docpre>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
...@@ -80,8 +89,12 @@ import commonProcess from "~/mixin/commonProcess"; ...@@ -80,8 +89,12 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Utils from "~/utils"; import Utils from "~/utils";
import Event from "~/model/Bdtdcr/Event"; import Event from "~/model/Bdtdcr/Event";
import Docpre from "~/views/Public/Docpre";
export default { export default {
components: {
"c-docpre": Docpre,
},
inject: ["root"], inject: ["root"],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
......
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
:argadr="{ :argadr="{
path: 'bodgrp.blk.docpre', path: 'bodgrp.blk.docpre',
grp: 'botp', grp: 'botp',
code: 'docpre',
}" }"
:ifShowAdd="model.rejtypsel == 'R'" :ifShowAdd="model.rejtypsel == 'R'"
:ifShowDelete="model.rejtypsel == 'R'"></c-docpre> :ifShowDelete="model.rejtypsel == 'R'"></c-docpre>
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
</c-col> </c-col>
<c-col :span="4"> <c-col :span="4">
<c-button style="margin:0 10px 0 0;padding: 0 10px;" size="small" type="primary" icon="el-icon-search"></c-button> <c-button style="margin:0 10px 0 0;padding: 0 10px;" size="small" type="primary" icon="el-icon-search"></c-button>
</c-button>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
...@@ -146,7 +145,7 @@ ...@@ -146,7 +145,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<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.botp.docgrdm.docdsclab" class="messageLabel"> <el-form-item :label="model.botp.docgrdm.docdsclab" class="messageLabel">
<c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button> <c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button>
</el-form-item> </el-form-item>
...@@ -167,7 +166,6 @@ ...@@ -167,7 +166,6 @@
</el-table-column> </el-table-column>
<el-table-column label="Document" prop="docnam" width="auto"> <el-table-column label="Document" prop="docnam" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{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">
<el-option v-for="item in codeTable" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codeTable" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
...@@ -180,7 +178,15 @@ ...@@ -180,7 +178,15 @@
</template> </template>
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col> -->
<c-docpre
:model="model"
:argadr="{
path:'bodgrp.blk.docpre',
grp: 'botp',
code:'docpre'
}"></c-docpre>
</c-col> </c-col>
...@@ -196,9 +202,11 @@ import CodeTable from "~/config/CodeTable" ...@@ -196,9 +202,11 @@ import CodeTable from "~/config/CodeTable"
import Event from "~/model/Botdcr/Event" import Event from "~/model/Botdcr/Event"
import Utils from "~/utils"; import Utils from "~/utils";
import Ptap from "~/views/Public/Ptap"; import Ptap from "~/views/Public/Ptap";
import Docpre from "~/views/Public/Docpre";
export default { export default {
components: { "c-ptap": Ptap }, components: { "c-ptap": Ptap ,
"c-docpre": Docpre,},
inject: ['root'], inject: ['root'],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
......
<!-- 前后端字段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">
......
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