diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 3d325941..71f0d81e 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1,841 +1,839 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <template slot="footer">
-        <a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button>
-        <!--此处为解决缓存问题-->
-        <a-button v-if="billType === '调拨出库'" v-print="'#allocationOutPrint'">普通打印</a-button>
-        <a-button v-if="billType === '组装单'" v-print="'#assemblePrint'">普通打印</a-button>
-        <a-button v-if="billType === '拆卸单'" v-print="'#disassemblePrint'">普通打印</a-button>
-        <a-button v-if="billType === '其它入库'" v-print="'#otherInPrint'">普通打印</a-button>
-        <a-button v-if="billType === '其它出库'" v-print="'#otherOutPrint'">普通打印</a-button>
-        <a-button v-if="billType === '采购退货出库'" v-print="'#purchaseBackPrint'">普通打印</a-button>
-        <a-button v-if="billType === '采购入库'" v-print="'#purchaseInPrint'">普通打印</a-button>
-        <a-button v-if="billType === '采购订单'" v-print="'#purchaseOrderPrint'">普通打印</a-button>
-        <a-button v-if="billType === '零售退货入库'" v-print="'#retailBackPrint'">普通打印</a-button>
-        <a-button v-if="billType === '零售出库'" v-print="'#retailOutPrint'">普通打印</a-button>
-        <a-button v-if="billType === '销售退货入库'" v-print="'#saleBackPrint'">普通打印</a-button>
-        <a-button v-if="billType === '销售订单'" v-print="'#saleOrderPrint'">普通打印</a-button>
-        <a-button v-if="billType === '销售出库'" v-print="'#saleOutPrint'">普通打印</a-button>
-        <a-button key="back" @click="handleCancel">取消</a-button>
-      </template>
-      <a-form :form="form">
-          <!--调拨出库-->
-          <template v-if="billType === '调拨出库'">
-            <section ref="print" id="allocationOutPrint">
-              <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-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </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="allocationOutColumns"
-                  :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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </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="assembleColumns"
-                  :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="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-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </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="disassembleColumns"
-                  :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="otherInPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单号">
-                    {{model.linkNumber}} {{model.billType}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <div :style="tableWidth">
-                <a-table
-                  ref="table"
-                  size="middle"
-                  bordered
-                  rowKey="id"
-                  :pagination="false"
-                  :columns="otherInColumns"
-                  :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="otherOutPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单号">
-                    {{model.linkNumber}} {{model.billType}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <div :style="tableWidth">
-                <a-table
-                  ref="table"
-                  size="middle"
-                  bordered
-                  rowKey="id"
-                  :pagination="false"
-                  :columns="otherOutColumns"
-                  :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="purchaseBackPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <div :style="tableWidth">
-                <a-table
-                  ref="table"
-                  size="middle"
-                  bordered
-                  rowKey="id"
-                  :pagination="false"
-                  :columns="purchaseBackColumns"
-                  :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>
-              <a-row class="form-row" :gutter="24">
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                    {{model.discount}}%
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
-                    {{model.discountMoney}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
-                    {{model.discountLastMoney}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                    {{model.otherMoney}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <a-row class="form-row" :gutter="24">
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
-                    {{model.accountName}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
-                    {{model.changeAmount}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
-                    {{model.debt}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                </a-col>
-              </a-row>
-            </section>
-          </template>
-          <!--采购入库-->
-          <template v-else-if="billType === '采购入库'">
-            <section ref="print" id="purchaseInPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
-                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <div :style="tableWidth">
-                <a-table
-                  ref="table"
-                  size="middle"
-                  bordered
-                  rowKey="id"
-                  :pagination="false"
-                  :columns="purchaseInColumns"
-                  :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>
-              <a-row class="form-row" :gutter="24">
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                    {{model.discount}}%
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
-                    {{model.discountMoney}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
-                    {{model.discountLastMoney}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                    {{model.otherMoney}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <a-row class="form-row" :gutter="24">
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
-                    {{model.accountName}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
-                    {{model.changeAmount}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
-                    {{model.debt}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                </a-col>
-              </a-row>
-            </section>
-          </template>
-          <!--采购订单-->
-          <template v-else-if="billType === '采购订单'">
-            <section ref="print" id="purchaseOrderPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </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="purchaseOrderColumns"
-                  :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="retailBackPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <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="retailBackColumns"
-                      :dataSource="dataSource">
-                    </a-table>
-                  </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-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="retailOutPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款类型">
-                    {{model.payType}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <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="retailOutColumns"
-                      :dataSource="dataSource">
-                    </a-table>
-                  </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-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="saleBackPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <div :style="tableWidth">
-                <a-table
-                  ref="table"
-                  size="middle"
-                  bordered
-                  rowKey="id"
-                  :pagination="false"
-                  :columns="saleBackColumns"
-                  :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>
-              <a-row class="form-row" :gutter="24">
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                    {{model.discount}}%
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
-                    {{model.discountMoney}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
-                    {{model.discountLastMoney}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                    {{model.otherMoney}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <a-row class="form-row" :gutter="24">
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
-                    {{model.accountName}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
-                    {{model.changeAmount}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
-                    {{model.debt}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
-                    {{model.salesManStr}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </section>
-          </template>
-          <!--销售订单-->
-          <template v-else-if="billType === '销售订单'">
-            <section ref="print" id="saleOrderPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
-                    {{model.salesManStr}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <div :style="tableWidth">
-                <a-table
-                  ref="table"
-                  size="middle"
-                  bordered
-                  rowKey="id"
-                  :pagination="false"
-                  :columns="saleOrderColumns"
-                  :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="saleOutPrint">
-              <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                    {{model.operTimeStr}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                    {{model.number}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
-                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <div :style="tableWidth">
-                <a-table
-                  ref="table"
-                  size="middle"
-                  bordered
-                  rowKey="id"
-                  :pagination="false"
-                  :columns="saleOutColumns"
-                  :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>
-              <a-row class="form-row" :gutter="24">
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                    {{model.discount}}%
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠">
-                    {{model.discountMoney}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
-                    {{model.discountLastMoney}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                    {{model.otherMoney}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <a-row class="form-row" :gutter="24">
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
-                    {{model.accountName}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
-                    {{model.changeAmount}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
-                    {{model.debt}}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
-                    {{model.salesManStr}}
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </section>
-          </template>
-          <template v-if="fileList && fileList.length>0">
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button>
+      <!--此处为解决缓存问题-->
+      <a-button v-if="billType === '调拨出库'" v-print="'#allocationOutPrint'">普通打印</a-button>
+      <a-button v-if="billType === '组装单'" v-print="'#assemblePrint'">普通打印</a-button>
+      <a-button v-if="billType === '拆卸单'" v-print="'#disassemblePrint'">普通打印</a-button>
+      <a-button v-if="billType === '其它入库'" v-print="'#otherInPrint'">普通打印</a-button>
+      <a-button v-if="billType === '其它出库'" v-print="'#otherOutPrint'">普通打印</a-button>
+      <a-button v-if="billType === '采购退货出库'" v-print="'#purchaseBackPrint'">普通打印</a-button>
+      <a-button v-if="billType === '采购入库'" v-print="'#purchaseInPrint'">普通打印</a-button>
+      <a-button v-if="billType === '采购订单'" v-print="'#purchaseOrderPrint'">普通打印</a-button>
+      <a-button v-if="billType === '零售退货入库'" v-print="'#retailBackPrint'">普通打印</a-button>
+      <a-button v-if="billType === '零售出库'" v-print="'#retailOutPrint'">普通打印</a-button>
+      <a-button v-if="billType === '销售退货入库'" v-print="'#saleBackPrint'">普通打印</a-button>
+      <a-button v-if="billType === '销售订单'" v-print="'#saleOrderPrint'">普通打印</a-button>
+      <a-button v-if="billType === '销售出库'" v-print="'#saleOutPrint'">普通打印</a-button>
+      <a-button key="back" @click="handleCancel">取消</a-button>
+    </template>
+    <a-form :form="form">
+        <!--调拨出库-->
+        <template v-if="billType === '调拨出库'">
+          <section ref="print" id="allocationOutPrint">
             <a-row class="form-row" :gutter="24">
-              <a-col :span="10">
-                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 3 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 21 }}" label="附件">
-                  <j-upload v-model="fileList" bizPath="bill" :disabled="true" :buttonVisible="false"></j-upload>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
                 </a-form-item>
               </a-col>
-              <a-col :span="14"></a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6"></a-col>
+              <a-col :span="6"></a-col>
             </a-row>
-          </template>
-      </a-form>
-    </j-modal>
+            <div :style="tableWidth">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="allocationOutColumns"
+                :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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </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="assembleColumns"
+                :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="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-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </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="disassembleColumns"
+                :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="otherInPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单号">
+                  {{model.linkNumber}} {{model.billType}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <div :style="tableWidth">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="otherInColumns"
+                :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="otherOutPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单号">
+                  {{model.linkNumber}} {{model.billType}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <div :style="tableWidth">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="otherOutColumns"
+                :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="purchaseBackPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                  <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <div :style="tableWidth">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="purchaseBackColumns"
+                :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>
+            <a-row class="form-row" :gutter="24">
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+                  {{model.discount}}%
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
+                  {{model.discountMoney}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
+                  {{model.discountLastMoney}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
+                  {{model.otherMoney}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row class="form-row" :gutter="24">
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+                  {{model.accountName}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
+                  {{model.changeAmount}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+                  {{model.debt}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+              </a-col>
+            </a-row>
+          </section>
+        </template>
+        <!--采购入库-->
+        <template v-else-if="billType === '采购入库'">
+          <section ref="print" id="purchaseInPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
+                  <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <div :style="tableWidth">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="purchaseInColumns"
+                :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>
+            <a-row class="form-row" :gutter="24">
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+                  {{model.discount}}%
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
+                  {{model.discountMoney}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
+                  {{model.discountLastMoney}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
+                  {{model.otherMoney}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row class="form-row" :gutter="24">
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+                  {{model.accountName}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
+                  {{model.changeAmount}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+                  {{model.debt}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+              </a-col>
+            </a-row>
+          </section>
+        </template>
+        <!--采购订单-->
+        <template v-else-if="billType === '采购订单'">
+          <section ref="print" id="purchaseOrderPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </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="purchaseOrderColumns"
+                :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="retailBackPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                  <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <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="retailBackColumns"
+                    :dataSource="dataSource">
+                  </a-table>
+                </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-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="retailOutPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款类型">
+                  {{model.payType}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <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="retailOutColumns"
+                    :dataSource="dataSource">
+                  </a-table>
+                </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-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="saleBackPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                  <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <div :style="tableWidth">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="saleBackColumns"
+                :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>
+            <a-row class="form-row" :gutter="24">
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+                  {{model.discount}}%
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
+                  {{model.discountMoney}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
+                  {{model.discountLastMoney}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
+                  {{model.otherMoney}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row class="form-row" :gutter="24">
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+                  {{model.accountName}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
+                  {{model.changeAmount}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+                  {{model.debt}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+                  {{model.salesManStr}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </section>
+        </template>
+        <!--销售订单-->
+        <template v-else-if="billType === '销售订单'">
+          <section ref="print" id="saleOrderPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+                  {{model.salesManStr}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <div :style="tableWidth">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="saleOrderColumns"
+                :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="saleOutPrint">
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                  {{model.operTimeStr}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                  {{model.number}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
+                  <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <div :style="tableWidth">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="saleOutColumns"
+                :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>
+            <a-row class="form-row" :gutter="24">
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+                  {{model.discount}}%
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠">
+                  {{model.discountMoney}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
+                  {{model.discountLastMoney}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
+                  {{model.otherMoney}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row class="form-row" :gutter="24">
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+                  {{model.accountName}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
+                  {{model.changeAmount}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+                  {{model.debt}}
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+                  {{model.salesManStr}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </section>
+        </template>
+        <template v-if="fileList && fileList.length>0">
+          <a-row class="form-row" :gutter="24">
+            <a-col :span="10">
+              <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 3 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 21 }}" label="附件">
+                <j-upload v-model="fileList" bizPath="bill" :disabled="true" :buttonVisible="false"></j-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="14"></a-col>
+          </a-row>
+        </template>
+    </a-form>
     <bill-print-iframe ref="modalDetail"></bill-print-iframe>
-  </a-card>
+  </j-modal>
 </template>
 
 <script>
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index c125f79c..a0f995ba 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -1,128 +1,126 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <a-spin :spinning="confirmLoading">
-        <a-form :form="form">
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
-                <a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
-                    {{ item.supplier }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <j-editable-table
-            :ref="refKeys[0]"
-            :loading="materialTable.loading"
-            :columns="materialTable.columns"
-            :dataSource="materialTable.dataSource"
-            :maxHeight="300"
-            :rowNumber="false"
-            :rowSelection="true"
-            :actionButton="true"
-            @valueChange="onValueChange"
-            @added="onAdded"
-            @deleted="onDeleted" />
-          <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="">
-                <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
-                <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
-                <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
-                <a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
-                          :dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
-                  <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-                <a-tooltip title="多账户明细">
-                  <a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
-                </a-tooltip>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
-                <a-input placeholder="请输入本次退款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
-                <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
-                <j-upload v-model="fileList" bizPath="bill"></j-upload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-spin>
-    </j-modal>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
+              <a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
+                  {{ item.supplier }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+              <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <j-editable-table
+          :ref="refKeys[0]"
+          :loading="materialTable.loading"
+          :columns="materialTable.columns"
+          :dataSource="materialTable.dataSource"
+          :maxHeight="300"
+          :rowNumber="false"
+          :rowSelection="true"
+          :actionButton="true"
+          @valueChange="onValueChange"
+          @added="onAdded"
+          @deleted="onDeleted" />
+        <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="">
+              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+              <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
+              <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
+              <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
+              <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+              <a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
+                        :dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
+                <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+              <a-tooltip title="多账户明细">
+                <a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
+              </a-tooltip>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
+              <a-input placeholder="请输入本次退款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+              <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
+              <j-upload v-model="fileList" bizPath="bill"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
-  </a-card>
+  </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 0f7e0849..09e7a2b2 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -1,128 +1,126 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <a-spin :spinning="confirmLoading">
-        <a-form :form="form">
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
-                <a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
-                    {{ item.supplier }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
-                <a-input-search placeholder="请选择关联订单" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <j-editable-table
-            :ref="refKeys[0]"
-            :loading="materialTable.loading"
-            :columns="materialTable.columns"
-            :dataSource="materialTable.dataSource"
-            :maxHeight="300"
-            :rowNumber="false"
-            :rowSelection="true"
-            :actionButton="true"
-            @valueChange="onValueChange"
-            @added="onAdded"
-            @deleted="onDeleted" />
-          <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="">
-                <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
-                <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
-                <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
-                <a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
-                          :dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
-                  <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-                <a-tooltip title="多账户明细">
-                  <a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
-                </a-tooltip>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
-                <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
-                <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
-                <j-upload v-model="fileList" bizPath="bill"></j-upload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-spin>
-    </j-modal>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
+              <a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
+                  {{ item.supplier }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
+              <a-input-search placeholder="请选择关联订单" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <j-editable-table
+          :ref="refKeys[0]"
+          :loading="materialTable.loading"
+          :columns="materialTable.columns"
+          :dataSource="materialTable.dataSource"
+          :maxHeight="300"
+          :rowNumber="false"
+          :rowSelection="true"
+          :actionButton="true"
+          @valueChange="onValueChange"
+          @added="onAdded"
+          @deleted="onDeleted" />
+        <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="">
+              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+              <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
+              <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
+              <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
+              <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+              <a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
+                        :dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
+                <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+              <a-tooltip title="多账户明细">
+                <a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
+              </a-tooltip>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
+              <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+              <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
+              <j-upload v-model="fileList" bizPath="bill"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
-  </a-card>
+  </j-modal>
 </template>
 
 <script>
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 14a20342..3a50684d 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -1,112 +1,110 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <a-spin :spinning="confirmLoading">
-        <a-form :form="form">
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
-                <a-select placeholder="选择会员卡号" v-decorator="[ 'organId' ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in retailList" :key="index" :value="item.id">
-                    {{ item.supplier }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="18" :md="12" :sm="24">
-              <j-editable-table
-                :ref="refKeys[0]"
-                :loading="materialTable.loading"
-                :columns="materialTable.columns"
-                :dataSource="materialTable.dataSource"
-                :minWidth="1100"
-                :maxHeight="300"
-                :rowNumber="false"
-                :rowSelection="true"
-                :actionButton="true"
-                @valueChange="onValueChange"
-                @added="onAdded"
-                @deleted="onDeleted" />
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-row class="form-row" :gutter="24">
-                <a-col :lg="24" :md="6" :sm="6"><br/><br/></a-col>
-                <a-col :lg="24" :md="6" :sm="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
-                    <a-input v-decorator.trim="[ 'changeAmount' ]" :style="{color:'purple'}" :readOnly="true"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :lg="24" :md="6" :sm="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
-                    <a-input v-decorator.trim="[ 'getAmount' ]" :style="{color:'red'}" defaultValue="0" @keyup="onKeyUpGetAmount"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :lg="24" :md="6" :sm="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
-                    <a-input v-decorator.trim="[ 'backAmount' ]" :style="{color:'green'}" :readOnly="true" defaultValue="0"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :lg="24" :md="6" :sm="6">
-                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
-                    <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
-                      <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
-                        {{ item.name }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </a-col>
-          </a-row>
-          <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="">
-                <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
-                <j-upload v-model="fileList" bizPath="bill"></j-upload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-spin>
-    </j-modal>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
+              <a-select placeholder="选择会员卡号" v-decorator="[ 'organId' ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in retailList" :key="index" :value="item.id">
+                  {{ item.supplier }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+              <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="18" :md="12" :sm="24">
+            <j-editable-table
+              :ref="refKeys[0]"
+              :loading="materialTable.loading"
+              :columns="materialTable.columns"
+              :dataSource="materialTable.dataSource"
+              :minWidth="1100"
+              :maxHeight="300"
+              :rowNumber="false"
+              :rowSelection="true"
+              :actionButton="true"
+              @valueChange="onValueChange"
+              @added="onAdded"
+              @deleted="onDeleted" />
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-row class="form-row" :gutter="24">
+              <a-col :lg="24" :md="6" :sm="6"><br/><br/></a-col>
+              <a-col :lg="24" :md="6" :sm="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
+                  <a-input v-decorator.trim="[ 'changeAmount' ]" :style="{color:'purple'}" :readOnly="true"/>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="6" :sm="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
+                  <a-input v-decorator.trim="[ 'getAmount' ]" :style="{color:'red'}" defaultValue="0" @keyup="onKeyUpGetAmount"/>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="6" :sm="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
+                  <a-input v-decorator.trim="[ 'backAmount' ]" :style="{color:'green'}" :readOnly="true" defaultValue="0"/>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="6" :sm="6">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
+                  <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
+                    <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                      {{ item.name }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </a-col>
+        </a-row>
+        <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="">
+              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
+              <j-upload v-model="fileList" bizPath="bill"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
-  </a-card>
+  </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 4048e085..1ac58269 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -1,131 +1,129 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <a-spin :spinning="confirmLoading">
-        <a-form :form="form">
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
-                <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
-                    {{ item.supplier }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <j-editable-table
-            :ref="refKeys[0]"
-            :loading="materialTable.loading"
-            :columns="materialTable.columns"
-            :dataSource="materialTable.dataSource"
-            :maxHeight="300"
-            :rowNumber="false"
-            :rowSelection="true"
-            :actionButton="true"
-            @valueChange="onValueChange"
-            @added="onAdded"
-            @deleted="onDeleted" />
-          <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="">
-                <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
-                <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
-                <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
-                <a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
-                          :dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
-                  <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-                <a-tooltip title="多账户明细">
-                  <a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
-                </a-tooltip>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
-                <a-input placeholder="请输入本次退款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
-                <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
-                <j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
-                <j-upload v-model="fileList" bizPath="bill"></j-upload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-spin>
-    </j-modal>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
+              <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
+                  {{ item.supplier }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+              <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <j-editable-table
+          :ref="refKeys[0]"
+          :loading="materialTable.loading"
+          :columns="materialTable.columns"
+          :dataSource="materialTable.dataSource"
+          :maxHeight="300"
+          :rowNumber="false"
+          :rowSelection="true"
+          :actionButton="true"
+          @valueChange="onValueChange"
+          @added="onAdded"
+          @deleted="onDeleted" />
+        <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="">
+              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+              <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
+              <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
+              <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
+              <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+              <a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
+                        :dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
+                <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+              <a-tooltip title="多账户明细">
+                <a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
+              </a-tooltip>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
+              <a-input placeholder="请输入本次退款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+              <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+              <j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
+              <j-upload v-model="fileList" bizPath="bill"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
-  </a-card>
+  </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 6d6bd2c4..2dc0e996 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -1,131 +1,129 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <a-spin :spinning="confirmLoading">
-        <a-form :form="form">
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
-                <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
-                    {{ item.supplier }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
-                <a-input-search placeholder="请选择关联订单" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <j-editable-table
-            :ref="refKeys[0]"
-            :loading="materialTable.loading"
-            :columns="materialTable.columns"
-            :dataSource="materialTable.dataSource"
-            :maxHeight="300"
-            :rowNumber="false"
-            :rowSelection="true"
-            :actionButton="true"
-            @valueChange="onValueChange"
-            @added="onAdded"
-            @deleted="onDeleted" />
-          <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="">
-                <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠">
-                <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
-                <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
-                <a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
-                          :dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
-                  <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-                <a-tooltip title="多账户明细">
-                  <a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
-                </a-tooltip>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
-                <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
-                <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
-                <j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
-                <j-upload v-model="fileList" bizPath="bill"></j-upload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-spin>
-    </j-modal>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
+              <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
+                  {{ item.supplier }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
+              <a-input-search placeholder="请选择关联订单" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <j-editable-table
+          :ref="refKeys[0]"
+          :loading="materialTable.loading"
+          :columns="materialTable.columns"
+          :dataSource="materialTable.dataSource"
+          :maxHeight="300"
+          :rowNumber="false"
+          :rowSelection="true"
+          :actionButton="true"
+          @valueChange="onValueChange"
+          @added="onAdded"
+          @deleted="onDeleted" />
+        <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="">
+              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+              <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠">
+              <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
+              <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
+              <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+              <a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
+                        :dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
+                <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+              <a-tooltip title="多账户明细">
+                <a-button type="default" icon="folder" style="margin-left: 8px;" size="small" v-show="manyAccountBtnStatus" @click="handleManyAccount"/>
+              </a-tooltip>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
+              <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+              <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+              <j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
+              <j-upload v-model="fileList" bizPath="bill"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
-  </a-card>
+  </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index b308d813..8d5c5456 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -1,405 +1,403 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <template slot="footer">
-        <!--此处为解决缓存问题-->
-        <a-button v-if="financialType === '收预付款'" v-print="'#advanceInPrint'" ghost type="primary">打印</a-button>
-        <a-button v-if="financialType === '转账'" v-print="'#giroPrint'" ghost type="primary">打印</a-button>
-        <a-button v-if="financialType === '收入'" v-print="'#itemInPrint'" ghost type="primary">打印</a-button>
-        <a-button v-if="financialType === '支出'" v-print="'#itemOutPrint'" ghost type="primary">打印</a-button>
-        <a-button v-if="financialType === '收款'" v-print="'#moneyInPrint'" ghost type="primary">打印</a-button>
-        <a-button v-if="financialType === '付款'" v-print="'#moneyOutPrint'" ghost type="primary">打印</a-button>
-        <a-button key="back" @click="handleCancel">取消</a-button>
-      </template>
-      <a-form :form="form">
-        <!--收预付款-->
-        <template v-if="financialType === '收预付款'">
-          <section ref="print" id="advanceInPrint">
-            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                  {{model.handsPersonName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                  {{model.billTimeStr}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                  {{model.billNo}}
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-table
-              ref="table"
-              size="middle"
-              bordered
-              rowKey="id"
-              :pagination="false"
-              :columns="advanceInColumns"
-              :dataSource="dataSource">
-            </a-table>
-            <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>
-            <a-row class="form-row" :gutter="24">
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计金额">
-                  {{model.totalPrice}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
-                  {{model.changeAmount}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6"></a-col>
-              <a-col :span="6"></a-col>
-              <a-col :span="6"></a-col>
-            </a-row>
-          </section>
-        </template>
-        <!--转账-->
-        <template v-if="financialType === '转账'">
-          <section ref="print" id="giroPrint">
-            <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.handsPersonName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                  {{model.billTimeStr}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                  {{model.billNo}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6"></a-col>
-            </a-row>
-            <a-table
-              ref="table"
-              size="middle"
-              bordered
-              rowKey="id"
-              :pagination="false"
-              :columns="giroColumns"
-              :dataSource="dataSource">
-            </a-table>
-            <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>
-            <a-row class="form-row" :gutter="24">
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
-                  {{model.accountName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
-                  {{model.changeAmount}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6"></a-col>
-              <a-col :span="6"></a-col>
-            </a-row>
-          </section>
-        </template>
-        <!--收入-->
-        <template v-if="financialType === '收入'">
-          <section ref="print" id="itemInPrint">
-            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                  {{model.handsPersonName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                  {{model.billTimeStr}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                  {{model.billNo}}
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-table
-              ref="table"
-              size="middle"
-              bordered
-              rowKey="id"
-              :pagination="false"
-              :columns="itemInColumns"
-              :dataSource="dataSource">
-            </a-table>
-            <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>
-            <a-row class="form-row" :gutter="24">
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
-                  {{model.accountName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入金额">
-                  {{model.changeAmount}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6"></a-col>
-              <a-col :span="6"></a-col>
-            </a-row>
-          </section>
-        </template>
-        <!--支出-->
-        <template v-if="financialType === '支出'">
-          <section ref="print" id="itemOutPrint">
-            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                  {{model.handsPersonName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                  {{model.billTimeStr}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                  {{model.billNo}}
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-table
-              ref="table"
-              size="middle"
-              bordered
-              rowKey="id"
-              :pagination="false"
-              :columns="itemOutColumns"
-              :dataSource="dataSource">
-            </a-table>
-            <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>
-            <a-row class="form-row" :gutter="24">
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出账户">
-                  {{model.accountName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出金额">
-                  {{model.changeAmount}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6"></a-col>
-              <a-col :span="6"></a-col>
-            </a-row>
-          </section>
-        </template>
-        <!--收款-->
-        <template v-if="financialType === '收款'">
-          <section ref="print" id="moneyInPrint">
-            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                  {{model.handsPersonName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                  {{model.billTimeStr}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                  {{model.billNo}}
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-table
-              ref="table"
-              size="middle"
-              bordered
-              rowKey="id"
-              :pagination="false"
-              :columns="moneyInColumns"
-              :dataSource="dataSource">
-              <span slot="numberCustomRender" slot-scope="text, record">
-                <a @click="myHandleDetail(record)">{{record.billNumber}}</a>
-              </span>
-            </a-table>
-            <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>
-            <a-row class="form-row" :gutter="24">
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
-                  {{model.accountName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计收款">
-                  {{model.totalPrice}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
-                  {{model.discountMoney}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实际收款">
-                  {{model.changeAmount}}
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </section>
-        </template>
-        <!--付款-->
-        <template v-if="financialType === '付款'">
-          <section ref="print" id="moneyOutPrint">
-            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                  {{model.handsPersonName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                  {{model.billTimeStr}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                  {{model.billNo}}
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-table
-              ref="table"
-              size="middle"
-              bordered
-              rowKey="id"
-              :pagination="false"
-              :columns="moneyOutColumns"
-              :dataSource="dataSource">
-            </a-table>
-            <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>
-            <a-row class="form-row" :gutter="24">
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
-                  {{model.accountName}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计付款">
-                  {{model.totalPrice}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
-                  {{model.discountMoney}}
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实际付款">
-                  {{model.changeAmount}}
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </section>
-        </template>
-        <template v-if="fileList && fileList.length>0">
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <!--此处为解决缓存问题-->
+      <a-button v-if="financialType === '收预付款'" v-print="'#advanceInPrint'" ghost type="primary">打印</a-button>
+      <a-button v-if="financialType === '转账'" v-print="'#giroPrint'" ghost type="primary">打印</a-button>
+      <a-button v-if="financialType === '收入'" v-print="'#itemInPrint'" ghost type="primary">打印</a-button>
+      <a-button v-if="financialType === '支出'" v-print="'#itemOutPrint'" ghost type="primary">打印</a-button>
+      <a-button v-if="financialType === '收款'" v-print="'#moneyInPrint'" ghost type="primary">打印</a-button>
+      <a-button v-if="financialType === '付款'" v-print="'#moneyOutPrint'" ghost type="primary">打印</a-button>
+      <a-button key="back" @click="handleCancel">取消</a-button>
+    </template>
+    <a-form :form="form">
+      <!--收预付款-->
+      <template v-if="financialType === '收预付款'">
+        <section ref="print" id="advanceInPrint">
           <a-row class="form-row" :gutter="24">
-            <a-col :span="12">
-              <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 3 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 21 }}" label="附件">
-                <j-upload v-model="fileList" bizPath="bill" :disabled="true" :buttonVisible="false"></j-upload>
+            <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
+                {{model.handsPersonName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.billTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.billNo}}
               </a-form-item>
             </a-col>
-            <a-col :span="12"></a-col>
           </a-row>
-        </template>
-      </a-form>
-    </j-modal>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="advanceInColumns"
+            :dataSource="dataSource">
+          </a-table>
+          <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>
+          <a-row class="form-row" :gutter="24">
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计金额">
+                {{model.totalPrice}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6"></a-col>
+            <a-col :span="6"></a-col>
+            <a-col :span="6"></a-col>
+          </a-row>
+        </section>
+      </template>
+      <!--转账-->
+      <template v-if="financialType === '转账'">
+        <section ref="print" id="giroPrint">
+          <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.handsPersonName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.billTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.billNo}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="giroColumns"
+            :dataSource="dataSource">
+          </a-table>
+          <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>
+          <a-row class="form-row" :gutter="24">
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
+                {{model.accountName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6"></a-col>
+            <a-col :span="6"></a-col>
+          </a-row>
+        </section>
+      </template>
+      <!--收入-->
+      <template v-if="financialType === '收入'">
+        <section ref="print" id="itemInPrint">
+          <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
+                {{model.handsPersonName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.billTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.billNo}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="itemInColumns"
+            :dataSource="dataSource">
+          </a-table>
+          <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>
+          <a-row class="form-row" :gutter="24">
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
+                {{model.accountName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入金额">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6"></a-col>
+            <a-col :span="6"></a-col>
+          </a-row>
+        </section>
+      </template>
+      <!--支出-->
+      <template v-if="financialType === '支出'">
+        <section ref="print" id="itemOutPrint">
+          <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
+                {{model.handsPersonName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.billTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.billNo}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="itemOutColumns"
+            :dataSource="dataSource">
+          </a-table>
+          <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>
+          <a-row class="form-row" :gutter="24">
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出账户">
+                {{model.accountName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出金额">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6"></a-col>
+            <a-col :span="6"></a-col>
+          </a-row>
+        </section>
+      </template>
+      <!--收款-->
+      <template v-if="financialType === '收款'">
+        <section ref="print" id="moneyInPrint">
+          <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
+                {{model.handsPersonName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.billTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.billNo}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="moneyInColumns"
+            :dataSource="dataSource">
+            <span slot="numberCustomRender" slot-scope="text, record">
+              <a @click="myHandleDetail(record)">{{record.billNumber}}</a>
+            </span>
+          </a-table>
+          <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>
+          <a-row class="form-row" :gutter="24">
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
+                {{model.accountName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计收款">
+                {{model.totalPrice}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
+                {{model.discountMoney}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实际收款">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </section>
+      </template>
+      <!--付款-->
+      <template v-if="financialType === '付款'">
+        <section ref="print" id="moneyOutPrint">
+          <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
+                {{model.handsPersonName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.billTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.billNo}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="moneyOutColumns"
+            :dataSource="dataSource">
+          </a-table>
+          <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>
+          <a-row class="form-row" :gutter="24">
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
+                {{model.accountName}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计付款">
+                {{model.totalPrice}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
+                {{model.discountMoney}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实际付款">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </section>
+      </template>
+      <template v-if="fileList && fileList.length>0">
+        <a-row class="form-row" :gutter="24">
+          <a-col :span="12">
+            <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 3 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 21 }}" label="附件">
+              <j-upload v-model="fileList" bizPath="bill" :disabled="true" :buttonVisible="false"></j-upload>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12"></a-col>
+        </a-row>
+      </template>
+    </a-form>
     <!-- 表单区域 -->
     <bill-detail ref="modalDetail"></bill-detail>
-  </a-card>
+  </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index db068544..05597607 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -1,122 +1,120 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <a-spin :spinning="confirmLoading">
-        <a-form :form="form">
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
-                <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
-                    {{ item.supplier }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <!-- 操作按钮 -->
-              <div class="action-button">
-                <a-button type="primary" icon="plus" @click="handleClickAdd">新增</a-button>
-                <span class="gap"></span>
-                <a-button type="primary" icon="minus" @click="handleClear">清空</a-button>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :span="24">
-              <j-editable-table
-                :ref="refKeys[0]"
-                :loading="accountTable.loading"
-                :columns="accountTable.columns"
-                :dataSource="accountTable.dataSource"
-                :maxHeight="300"
-                :rowNumber="false"
-                :rowSelection="false"
-                :actionButton="false"
-                @valueChange="onValueChange" />
-            </a-col>
-          </a-row>
-          <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="">
-                <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
-                <a-select placeholder="选择收款账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计收款">
-                <a-input placeholder="请输入合计收款" v-decorator.trim="[ 'totalPrice' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
-                <a-input placeholder="请输入优惠金额" v-decorator.trim="[ 'discountMoney', validatorRules.discountMoney ]" @keyup="onKeyUpDiscountMoney" />
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实际收款">
-                <a-input placeholder="请输入实际收款" v-decorator.trim="[ 'changeAmount' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
-                <j-upload v-model="fileList" bizPath="financial"></j-upload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-spin>
-    </j-modal>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
+              <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
+                  {{ item.supplier }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <!-- 操作按钮 -->
+            <div class="action-button">
+              <a-button type="primary" icon="plus" @click="handleClickAdd">新增</a-button>
+              <span class="gap"></span>
+              <a-button type="primary" icon="minus" @click="handleClear">清空</a-button>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :span="24">
+            <j-editable-table
+              :ref="refKeys[0]"
+              :loading="accountTable.loading"
+              :columns="accountTable.columns"
+              :dataSource="accountTable.dataSource"
+              :maxHeight="300"
+              :rowNumber="false"
+              :rowSelection="false"
+              :actionButton="false"
+              @valueChange="onValueChange" />
+          </a-col>
+        </a-row>
+        <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="">
+              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
+              <a-select placeholder="选择收款账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计收款">
+              <a-input placeholder="请输入合计收款" v-decorator.trim="[ 'totalPrice' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
+              <a-input placeholder="请输入优惠金额" v-decorator.trim="[ 'discountMoney', validatorRules.discountMoney ]" @keyup="onKeyUpDiscountMoney" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实际收款">
+              <a-input placeholder="请输入实际收款" v-decorator.trim="[ 'changeAmount' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
+              <j-upload v-model="fileList" bizPath="financial"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
     <debt-bill-list ref="debtBillList" @ok="debtBillListOk"></debt-bill-list>
-  </a-card>
+  </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index 4f49b84a..1625a415 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -1,122 +1,120 @@
 <template>
-  <a-card :bordered="false">
-    <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      :maskClosable="false"
-      :keyboard="false"
-      :forceRender="true"
-      switchFullscreen
-      @ok="handleOk"
-      @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 100%;overflow-y: hidden">
-      <a-spin :spinning="confirmLoading">
-        <a-form :form="form">
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
-                <a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
-                    {{ item.supplier }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-                <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <!-- 操作按钮 -->
-              <div class="action-button">
-                <a-button type="primary" icon="plus" @click="handleClickAdd">新增</a-button>
-                <span class="gap"></span>
-                <a-button type="primary" icon="minus" @click="handleClear">清空</a-button>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :span="24">
-              <j-editable-table
-                :ref="refKeys[0]"
-                :loading="accountTable.loading"
-                :columns="accountTable.columns"
-                :dataSource="accountTable.dataSource"
-                :maxHeight="300"
-                :rowNumber="false"
-                :rowSelection="false"
-                :actionButton="false"
-                @valueChange="onValueChange" />
-            </a-col>
-          </a-row>
-          <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="">
-                <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
-                <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
-                  :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                  <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计付款">
-                <a-input placeholder="请输入合计付款" v-decorator.trim="[ 'totalPrice' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
-                <a-input placeholder="请输入优惠金额" v-decorator.trim="[ 'discountMoney', validatorRules.discountMoney ]" @keyup="onKeyUpDiscountMoney" />
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实际付款">
-                <a-input placeholder="请输入实际付款" v-decorator.trim="[ 'changeAmount' ]" :readOnly="true"/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row class="form-row" :gutter="24">
-            <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
-                <j-upload v-model="fileList" bizPath="financial"></j-upload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-spin>
-    </j-modal>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    :keyboard="false"
+    :forceRender="true"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
+              <a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
+                  {{ item.supplier }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <!-- 操作按钮 -->
+            <div class="action-button">
+              <a-button type="primary" icon="plus" @click="handleClickAdd">新增</a-button>
+              <span class="gap"></span>
+              <a-button type="primary" icon="minus" @click="handleClear">清空</a-button>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :span="24">
+            <j-editable-table
+              :ref="refKeys[0]"
+              :loading="accountTable.loading"
+              :columns="accountTable.columns"
+              :dataSource="accountTable.dataSource"
+              :maxHeight="300"
+              :rowNumber="false"
+              :rowSelection="false"
+              :actionButton="false"
+              @valueChange="onValueChange" />
+          </a-col>
+        </a-row>
+        <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="">
+              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
+              <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
+                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="合计付款">
+              <a-input placeholder="请输入合计付款" v-decorator.trim="[ 'totalPrice' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
+              <a-input placeholder="请输入优惠金额" v-decorator.trim="[ 'discountMoney', validatorRules.discountMoney ]" @keyup="onKeyUpDiscountMoney" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实际付款">
+              <a-input placeholder="请输入实际付款" v-decorator.trim="[ 'changeAmount' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
+              <j-upload v-model="fileList" bizPath="financial"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
     <debt-bill-list ref="debtBillList" @ok="debtBillListOk"></debt-bill-list>
-  </a-card>
+  </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'