Skip to content
GitLab
Commit 9750d47c authored by 季圣华's avatar 季圣华
Browse files

修改单据展示的排版

parent 8bf51633
Show whitespace changes
Inline Side-by-side
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @ 9750d47c
...@@ -28,10 +28,16 @@ ...@@ -28,10 +28,16 @@
<a-button key="back" @click="handleCancel">取消</a-button> <a-button key="back" @click="handleCancel">取消</a-button>
</template> </template>
<a-form :form="form"> <a-form :form="form">
<!--调拨出库--> <!--零售出库-->
<template v-if="billType === '调拨出库'"> <template v-if="billType === '零售出库'">
<section ref="print" id="allocationOutPrint"> <section ref="print" id="retailOutPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
<a-input v-decorator="['id']" hidden/>
{{model.organName}}
</a-form-item>
</a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.operTimeStr}} {{model.operTimeStr}}
...@@ -42,10 +48,15 @@ ...@@ -42,10 +48,15 @@
{{model.number}} {{model.number}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"></a-col> <a-col :span="6">
<a-col :span="6"></a-col> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款类型">
{{model.payType}}
</a-form-item>
</a-col>
</a-row> </a-row>
<div :style="tableWidth"> <a-row class="form-row" :gutter="24">
<a-col :lg="18" :md="12" :sm="24">
<div :style="tableWidthRetail">
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
...@@ -56,80 +67,32 @@ ...@@ -56,80 +67,32 @@
:dataSource="dataSource"> :dataSource="dataSource">
</a-table> </a-table>
</div> </div>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item>
</a-col> </a-col>
</a-row>
</section>
</template>
<!--组装单-->
<template v-else-if="billType === '组装单'">
<section ref="print" id="assemblePrint">
<a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期"> <a-row class="form-row" :gutter="24">
{{model.operTimeStr}} <a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实收金额">
{{model.changeAmount}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
{{model.number}} {{model.changeAmount}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"></a-col> <a-col :lg="24" :md="6" :sm="6">
<a-col :span="6"></a-col> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
</a-row> 0
<div :style="tableWidth">
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="columns"
:dataSource="dataSource">
</a-table>
</div>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> <a-col :lg="24" :md="6" :sm="6">
</section> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
</template> {{model.accountName}}
<!--拆卸单-->
<template v-else-if="billType === '拆卸单'">
<section ref="print" id="disassemblePrint">
<a-row class="form-row" :gutter="24">
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.operTimeStr}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> </a-row>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.number}}
</a-form-item>
</a-col> </a-col>
<a-col :span="6"></a-col>
<a-col :span="6"></a-col>
</a-row> </a-row>
<div :style="tableWidth">
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="columns"
:dataSource="dataSource">
</a-table>
</div>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24"> <a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;"> <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
...@@ -139,12 +102,12 @@ ...@@ -139,12 +102,12 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<!--其它入库--> <!--零售退货-->
<template v-else-if="billType === '其它入库'"> <template v-else-if="billType === '零售退货入库'">
<section ref="print" id="otherInPrint"> <section ref="print" id="retailBackPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
<a-input v-decorator="['id']" hidden/> <a-input v-decorator="['id']" hidden/>
{{model.organName}} {{model.organName}}
</a-form-item> </a-form-item>
...@@ -160,12 +123,14 @@ ...@@ -160,12 +123,14 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单号"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
{{model.linkNumber}} {{model.billType}} <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<div :style="tableWidth"> <a-row class="form-row" :gutter="24">
<a-col :lg="18" :md="12" :sm="24">
<div :style="tableWidthRetail">
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
...@@ -176,6 +141,32 @@ ...@@ -176,6 +141,32 @@
:dataSource="dataSource"> :dataSource="dataSource">
</a-table> </a-table>
</div> </div>
</a-col>
<a-col :span="6">
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
0
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
{{model.accountName}}
</a-form-item>
</a-col>
</a-row>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24"> <a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;"> <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
...@@ -185,12 +176,12 @@ ...@@ -185,12 +176,12 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<!--其它出库--> <!--采购订单-->
<template v-else-if="billType === '其它出库'"> <template v-else-if="billType === '采购订单'">
<section ref="print" id="otherOutPrint"> <section ref="print" id="purchaseOrderPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
<a-input v-decorator="['id']" hidden/> <a-input v-decorator="['id']" hidden/>
{{model.organName}} {{model.organName}}
</a-form-item> </a-form-item>
...@@ -205,11 +196,7 @@ ...@@ -205,11 +196,7 @@
{{model.number}} {{model.number}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6"></a-col>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单号">
{{model.linkNumber}} {{model.billType}}
</a-form-item>
</a-col>
</a-row> </a-row>
<div :style="tableWidth"> <div :style="tableWidth">
<a-table <a-table
...@@ -231,9 +218,9 @@ ...@@ -231,9 +218,9 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<!--采购退货--> <!--采购入库-->
<template v-else-if="billType === '采购退货出库'"> <template v-else-if="billType === '采购入库'">
<section ref="print" id="purchaseBackPrint"> <section ref="print" id="purchaseInPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
...@@ -252,7 +239,7 @@ ...@@ -252,7 +239,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
<a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a> <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -282,7 +269,7 @@ ...@@ -282,7 +269,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
{{model.discountMoney}} {{model.discountMoney}}
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -304,7 +291,7 @@ ...@@ -304,7 +291,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
{{model.changeAmount}} {{model.changeAmount}}
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -318,9 +305,9 @@ ...@@ -318,9 +305,9 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<!--采购入库--> <!--采购退货-->
<template v-else-if="billType === '采购入库'"> <template v-else-if="billType === '采购退货出库'">
<section ref="print" id="purchaseInPrint"> <section ref="print" id="purchaseBackPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
...@@ -339,7 +326,7 @@ ...@@ -339,7 +326,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
<a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a> <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -369,7 +356,7 @@ ...@@ -369,7 +356,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
{{model.discountMoney}} {{model.discountMoney}}
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -391,7 +378,7 @@ ...@@ -391,7 +378,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
{{model.changeAmount}} {{model.changeAmount}}
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -405,12 +392,12 @@ ...@@ -405,12 +392,12 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<!--采购订单--> <!--销售订单-->
<template v-else-if="billType === '采购订单'"> <template v-else-if="billType === '销售订单'">
<section ref="print" id="purchaseOrderPrint"> <section ref="print" id="saleOrderPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
<a-input v-decorator="['id']" hidden/> <a-input v-decorator="['id']" hidden/>
{{model.organName}} {{model.organName}}
</a-form-item> </a-form-item>
...@@ -425,7 +412,11 @@ ...@@ -425,7 +412,11 @@
{{model.number}} {{model.number}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"></a-col> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
{{model.salesManStr}}
</a-form-item>
</a-col>
</a-row> </a-row>
<div :style="tableWidth"> <div :style="tableWidth">
<a-table <a-table
...@@ -447,12 +438,12 @@ ...@@ -447,12 +438,12 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<!--零售退货--> <!--销售出库-->
<template v-else-if="billType === '零售退货入库'"> <template v-else-if="billType === '销售出库'">
<section ref="print" id="retailBackPrint"> <section ref="print" id="saleOutPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
<a-input v-decorator="['id']" hidden/> <a-input v-decorator="['id']" hidden/>
{{model.organName}} {{model.organName}}
</a-form-item> </a-form-item>
...@@ -468,14 +459,12 @@ ...@@ -468,14 +459,12 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
<a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a> <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <div :style="tableWidth">
<a-col :lg="18" :md="12" :sm="24">
<div :style="tableWidthRetail">
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
...@@ -486,32 +475,6 @@ ...@@ -486,32 +475,6 @@
:dataSource="dataSource"> :dataSource="dataSource">
</a-table> </a-table>
</div> </div>
</a-col>
<a-col :span="6">
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
0
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
{{model.accountName}}
</a-form-item>
</a-col>
</a-row>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24"> <a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;"> <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
...@@ -519,77 +482,47 @@ ...@@ -519,77 +482,47 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</section>
</template>
<!--零售出库-->
<template v-else-if="billType === '零售出库'">
<section ref="print" id="retailOutPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
<a-input v-decorator="['id']" hidden/> {{model.discount}}%
{{model.organName}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠">
{{model.operTimeStr}} {{model.discountMoney}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号"> <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
{{model.number}} {{model.discountLastMoney}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款类型"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
{{model.payType}} {{model.otherMoney}}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="18" :md="12" :sm="24">
<div :style="tableWidthRetail">
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="columns"
:dataSource="dataSource">
</a-table>
</div>
</a-col>
<a-col :span="6"> <a-col :span="6">
<a-row class="form-row" :gutter="24"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
<a-col :lg="24" :md="6" :sm="6"> {{model.accountName}}
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实收金额">
{{model.changeAmount}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="24" :md="6" :sm="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
{{model.changeAmount}} {{model.changeAmount}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="24" :md="6" :sm="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
0 {{model.debt}}
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
{{model.accountName}}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> <a-col :span="6">
</a-col> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
</a-row> {{model.salesManStr}}
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -685,12 +618,12 @@ ...@@ -685,12 +618,12 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<!--销售订单--> <!--其它入库-->
<template v-else-if="billType === '销售订单'"> <template v-else-if="billType === '其它入库'">
<section ref="print" id="saleOrderPrint"> <section ref="print" id="otherInPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
<a-input v-decorator="['id']" hidden/> <a-input v-decorator="['id']" hidden/>
{{model.organName}} {{model.organName}}
</a-form-item> </a-form-item>
...@@ -706,8 +639,8 @@ ...@@ -706,8 +639,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单号">
{{model.salesManStr}} {{model.linkNumber}} {{model.billType}}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -731,9 +664,9 @@ ...@@ -731,9 +664,9 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<!--销售出库--> <!--其它出库-->
<template v-else-if="billType === '销售出库'"> <template v-else-if="billType === '其它出库'">
<section ref="print" id="saleOutPrint"> <section ref="print" id="otherOutPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
...@@ -752,8 +685,8 @@ ...@@ -752,8 +685,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单号">
<a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a> {{model.linkNumber}} {{model.billType}}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -775,47 +708,114 @@ ...@@ -775,47 +708,114 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</section>
</template>
<!--调拨出库-->
<template v-else-if="billType === '调拨出库'">
<section ref="print" id="allocationOutPrint">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.discount}}% {{model.operTimeStr}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.discountMoney}} {{model.number}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"></a-col>
<a-col :span="6"></a-col>
</a-row>
<div :style="tableWidth">
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="columns"
:dataSource="dataSource">
</a-table>
</div>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item>
</a-col>
</a-row>
</section>
</template>
<!--组装单-->
<template v-else-if="billType === '组装单'">
<section ref="print" id="assemblePrint">
<a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.discountLastMoney}} {{model.operTimeStr}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.otherMoney}} {{model.number}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"></a-col>
<a-col :span="6"></a-col>
</a-row> </a-row>
<div :style="tableWidth">
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="columns"
:dataSource="dataSource">
</a-table>
</div>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户"> <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.accountName}} {{model.remark}}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row>
</section>
</template>
<!--拆卸单-->
<template v-else-if="billType === '拆卸单'">
<section ref="print" id="disassemblePrint">
<a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
{{model.changeAmount}} {{model.operTimeStr}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
{{model.debt}} {{model.number}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6"></a-col>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员"> <a-col :span="6"></a-col>
{{model.salesManStr}} </a-row>
<div :style="tableWidth">
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="columns"
:dataSource="dataSource">
</a-table>
</div>
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
{{model.remark}}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -883,7 +883,7 @@ ...@@ -883,7 +883,7 @@
columns:[], columns:[],
//列定义 //列定义
defColumns: [], defColumns: [],
allocationOutColumns: [ retailOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -891,7 +891,6 @@ ...@@ -891,7 +891,6 @@
{ title: '型号', dataIndex: 'model', width: '5%'}, { title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'}, { title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'}, { title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '调入仓库', dataIndex: 'anotherDepotName', width: '8%'},
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
...@@ -899,8 +898,7 @@ ...@@ -899,8 +898,7 @@
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
assembleColumns: [ retailBackColumns: [
{ title: '商品类型', dataIndex: 'mType',width:'7%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -915,9 +913,7 @@ ...@@ -915,9 +913,7 @@
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
disassembleColumns: [ purchaseOrderColumns: [
{ title: '商品类型', dataIndex: 'mType',width:'7%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'}, { title: '规格', dataIndex: 'standard', width: '5%'},
...@@ -927,11 +923,12 @@ ...@@ -927,11 +923,12 @@
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '已入库', dataIndex: 'finishNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
otherInColumns: [ purchaseInColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -940,13 +937,20 @@ ...@@ -940,13 +937,20 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'}, { title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'}, { title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
otherOutColumns: [ purchaseBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -955,14 +959,20 @@ ...@@ -955,14 +959,20 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'}, { title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'}, { title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
purchaseBackColumns: [ saleOrderColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'}, { title: '规格', dataIndex: 'standard', width: '5%'},
...@@ -970,20 +980,14 @@ ...@@ -970,20 +980,14 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'}, { title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'}, { title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '已入库', dataIndex: 'finishNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
purchaseInColumns: [ saleOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -1005,7 +1009,8 @@ ...@@ -1005,7 +1009,8 @@
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'}, { title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
purchaseOrderColumns: [ saleBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'}, { title: '规格', dataIndex: 'standard', width: '5%'},
...@@ -1013,14 +1018,20 @@ ...@@ -1013,14 +1018,20 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'}, { title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'}, { title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '已入库', dataIndex: 'finishNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
retailBackColumns: [ otherInColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -1035,7 +1046,7 @@ ...@@ -1035,7 +1046,7 @@
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
retailOutColumns: [ otherOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -1050,7 +1061,7 @@ ...@@ -1050,7 +1061,7 @@
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
saleBackColumns: [ allocationOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -1058,21 +1069,17 @@ ...@@ -1058,21 +1069,17 @@
{ title: '型号', dataIndex: 'model', width: '5%'}, { title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'}, { title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'}, { title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '调入仓库', dataIndex: 'anotherDepotName', width: '8%'},
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
saleOrderColumns: [ assembleColumns: [
{ title: '商品类型', dataIndex: 'mType',width:'7%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'}, { title: '规格', dataIndex: 'standard', width: '5%'},
...@@ -1082,12 +1089,12 @@ ...@@ -1082,12 +1089,12 @@
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '已入库', dataIndex: 'finishNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
saleOutColumns: [ disassembleColumns: [
{ title: '商品类型', dataIndex: 'mType',width:'7%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'}, { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'}, { title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
...@@ -1096,17 +1103,10 @@ ...@@ -1096,17 +1103,10 @@
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'}, { title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'}, { title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'}, { title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
] ]
} }
......
Supports Markdown
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