给单据增加查看详细的页面

jshERP-web/src/mixins/JeecgListMixin.js

@@ -253,8 +253,8 @@ export const JeecgListMixin = {
       // 新增/修改 成功时，重载列表
       this.loadData();
     },
-    handleDetail:function(record){
-      this.$refs.modalDetail.show(record);
+    handleDetail:function(record, type){
+      this.$refs.modalDetail.show(record, type);
       this.$refs.modalDetail.title="详情";
     },
     /* 导出 */

jshERP-web/src/views/bill/AllocationOutList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'allocationOut')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <allocation-out-modal ref="modalForm" @ok="modalFormOk"></allocation-out-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import AllocationOutModal from './modules/AllocationOutModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       AllocationOutModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/AssembleList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'assemble')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <assemble-modal ref="modalForm" @ok="modalFormOk"></assemble-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import AssembleModal from './modules/AssembleModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       AssembleModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/DisassembleList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'disassemble')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <disassemble-modal ref="modalForm" @ok="modalFormOk"></disassemble-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import DisassembleModal from './modules/DisassembleModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       DisassembleModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/OtherInList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'otherIn')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <other-in-modal ref="modalForm" @ok="modalFormOk"></other-in-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import OtherInModal from './modules/OtherInModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       OtherInModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/OtherOutList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'otherOut')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <other-out-modal ref="modalForm" @ok="modalFormOk"></other-out-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import OtherOutModal from './modules/OtherOutModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       OtherOutModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/PurchaseBackList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'purchaseBack')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <purchase-back-modal ref="modalForm" @ok="modalFormOk"></purchase-back-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import PurchaseBackModal from './modules/PurchaseBackModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       PurchaseBackModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/PurchaseInList.vue

@@ -62,7 +62,7 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="myHandleDetail(record)">查看</a>
+          <a @click="myHandleDetail(record, 'purchaseIn')">查看</a>
           <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -64,6 +64,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'purchaseOrder')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -80,10 +82,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <purchase-order-modal ref="modalForm" @ok="modalFormOk"></purchase-order-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import PurchaseOrderModal from './modules/PurchaseOrderModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -92,6 +96,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       PurchaseOrderModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/RetailBackList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'retailBack')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <retail-back-modal ref="modalForm" @ok="modalFormOk"></retail-back-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import RetailBackModal from './modules/RetailBackModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       RetailBackModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/RetailOutList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'retailOut')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <retail-out-modal ref="modalForm" @ok="modalFormOk"></retail-out-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import RetailOutModal from './modules/RetailOutModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       RetailOutModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/SaleBackList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'saleBack')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <sale-back-modal ref="modalForm" @ok="modalFormOk"></sale-back-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import SaleBackModal from './modules/SaleBackModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       SaleBackModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -64,6 +64,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'saleOrder')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -80,10 +82,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <sale-order-modal ref="modalForm" @ok="modalFormOk"></sale-order-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import SaleOrderModal from './modules/SaleOrderModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -92,6 +96,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       SaleOrderModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/SaleOutList.vue

@@ -62,6 +62,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'saleOut')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -73,10 +75,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <sale-out-modal ref="modalForm" @ok="modalFormOk"></sale-out-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import SaleOutModal from './modules/SaleOutModal'
+  import BillDetail from './dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -85,6 +89,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       SaleOutModal,
+      BillDetail,
       JDate
     },
     data () {

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -11,6 +11,344 @@
       wrapClassName="ant-modal-cust-warp"
       style="top:5%;height: 100%;overflow-y: hidden">
       <a-form :form="form">
+        <!--调拨出库-->
+        <template v-if="billType === 'allocationOut'">
+          <a-row class="form-row" :gutter="24">
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="allocationOutColumns"
+            :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>
+        </template>
+        <!--组装单-->
+        <template v-else-if="billType === 'assemble'">
+          <a-row class="form-row" :gutter="24">
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="assembleColumns"
+            :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>
+        </template>
+        <!--拆卸单-->
+        <template v-else-if="billType === 'disassemble'">
+          <a-row class="form-row" :gutter="24">
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="disassembleColumns"
+            :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>
+        </template>
+        <!--其它入库-->
+        <template v-else-if="billType === 'otherIn'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="otherInColumns"
+            :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>
+        </template>
+        <!--其它出库-->
+        <template v-else-if="billType === 'otherOut'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="otherOutColumns"
+            :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>
+        </template>
+        <!--采购退货-->
+        <template v-else-if="billType === 'purchaseBack'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="purchaseBackColumns"
+            :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 :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+                {{model.discount}}%
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
+                {{model.discountMoney}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
+                {{model.discountLastMoney}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <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 :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+                {{model.accountName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+                {{model.debt}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+            </a-col>
+          </a-row>
+        </template>
+        <!--采购入库-->
+        <template v-else-if="billType === 'purchaseIn'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="purchaseInColumns"
+            :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 :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+                {{model.discount}}%
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
+                {{model.discountMoney}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
+                {{model.discountLastMoney}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <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 :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+                {{model.accountName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+                {{model.debt}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+            </a-col>
+          </a-row>
+        </template>
+        <!--采购订单-->
+        <template v-else-if="billType === 'purchaseOrder'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
@@ -36,7 +374,311 @@
             bordered
             rowKey="id"
             :pagination="false"
-          :columns="columns"
+            :columns="purchaseOrderColumns"
+            :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>
+        </template>
+        <!--零售退货-->
+        <template v-else-if="billType === 'retailBack'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </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="18" :md="12" :sm="24">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="retailBackColumns"
+                :dataSource="dataSource">
+              </a-table>
+            </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="实付金额">
+                    {{model.changeAmount}}
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
+                    {{model.getAmount}}
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
+                    {{model.backAmount}}
+                  </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>
+        </template>
+        <!--零售出库-->
+        <template v-else-if="billType === 'retailOut'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <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">
+              <a-table
+                ref="table"
+                size="middle"
+                bordered
+                rowKey="id"
+                :pagination="false"
+                :columns="retailOutColumns"
+                :dataSource="dataSource">
+              </a-table>
+            </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="实付金额">
+                    {{model.changeAmount}}
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
+                    {{model.getAmount}}
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
+                    {{model.backAmount}}
+                  </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>
+        </template>
+        <!--销售退货-->
+        <template v-else-if="billType === 'saleBack'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+                {{model.salesMan}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="saleBackColumns"
+            :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 :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
+                {{model.discount}}%
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退款优惠">
+                {{model.discountMoney}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 6 }}" :wrapperCol="wrapperCol" label="优惠后金额">
+                {{model.discountLastMoney}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <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 :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
+                {{model.accountName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
+                {{model.changeAmount}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
+                {{model.debt}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+                {{model.salesMan}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </template>
+        <!--销售订单-->
+        <template v-else-if="billType === 'saleOrder'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+                {{model.salesMan}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="saleOrderColumns"
+            :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>
+        </template>
+        <!--销售出库-->
+        <template v-else-if="billType === 'saleOut'">
+          <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 v-decorator="['id']" hidden/>
+                {{model.organName}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
+          </a-row>
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :pagination="false"
+            :columns="saleOutColumns"
             :dataSource="dataSource">
           </a-table>
           <a-row class="form-row" :gutter="24">
@@ -53,7 +695,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款优惠">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠">
                 {{model.discountMoney}}
               </a-form-item>
             </a-col>
@@ -75,7 +717,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
                 {{model.changeAmount}}
               </a-form-item>
             </a-col>
@@ -85,8 +727,12 @@
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+                {{model.salesMan}}
+              </a-form-item>
             </a-col>
           </a-row>
+        </template>
       </a-form>
     </j-modal>
   </a-card>
@@ -94,7 +740,7 @@
 
 <script>
   import pick from 'lodash.pick'
-  import { httpAction, getAction } from '@/api/manage'
+  import { getAction } from '@/api/manage'
   import { getMpListShort } from "@/utils/util"
   import Vue from 'vue'
   export default {
@@ -105,6 +751,7 @@
         width: '1450px',
         visible: false,
         model: {},
+        billType: '',
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -113,11 +760,86 @@
           xs: { span: 24 },
           sm: { span: 16 },
         },
-        confirmLoading: false,
         form: this.$form.createForm(this),
         loading: false,
         dataSource: [],
-        columns: [
+        url: {
+          detailList: '/depotItem/getDetailList'
+        },
+        allocationOutColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '调入仓库', dataIndex: 'anotherDepotName', width: '8%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        assembleColumns: [
+          { title: '商品类型', dataIndex: 'mType',width:'7%'},
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        disassembleColumns: [
+          { title: '商品类型', dataIndex: 'mType',width:'7%'},
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        otherInColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        otherOutColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        purchaseBackColumns: [
           { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
           { title: '条码', dataIndex: 'barCode', width: '10%'},
           { title: '名称', dataIndex: 'name', width: '8%'},
@@ -135,15 +857,123 @@
           { title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
-        url: {
-          detailList: '/depotItem/getDetailList'
-        }
+        purchaseInColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
+          { title: '税额', dataIndex: 'taxMoney', width: '5%'},
+          { title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        purchaseOrderColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        retailBackColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        retailOutColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        saleBackColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
+          { title: '税额', dataIndex: 'taxMoney', width: '5%'},
+          { title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        saleOrderColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ],
+        saleOutColumns: [
+          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
+          { title: '条码', dataIndex: 'barCode', width: '10%'},
+          { title: '名称', dataIndex: 'name', width: '8%'},
+          { title: '规格', dataIndex: 'standard', width: '5%'},
+          { title: '型号', dataIndex: 'model', width: '5%'},
+          { title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          { title: '库存', dataIndex: 'stock', width: '5%'},
+          { title: '单位', dataIndex: 'unit', width: '4%'},
+          { title: '数量', dataIndex: 'operNumber', width: '5%'},
+          { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+          { title: '含税单价', dataIndex: 'taxUnitPrice', width: '6%'},
+          { title: '金额', dataIndex: 'allPrice', width: '5%'},
+          { title: '税率(%)', dataIndex: 'taxRate', width: '6%'},
+          { title: '税额', dataIndex: 'taxMoney', width: '5%'},
+          { title: '价税合计', dataIndex: 'taxLastMoney', width: '6%'},
+          { title: '备注', dataIndex: 'remark', width: '5%'}
+        ]
       }
     },
     created () {
     },
     methods: {
-      show(record) {
+      show(record, type) {
+        this.billType = type
         this.visible = true;
         this.model = Object.assign({}, record);
         this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)

jshERP-web/src/views/bill/mixins/BillListMixin.js

@@ -23,8 +23,8 @@ export const BillListMixin = {
       this.$refs.modalForm.action = "edit";
       this.handleEdit(record);
     },
-    myHandleDetail(record) {
-      this.handleDetail(record);
+    myHandleDetail(record, type) {
+      this.handleDetail(record, type);
     },
     handleApprove(record) {
       this.$refs.modalForm.action = "approve";

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -34,7 +34,11 @@
               <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24"></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>
         <j-editable-table
           :ref="refKeys[0]"

jshERP-web/src/views/financial/AdvanceInList.vue

@@ -57,6 +57,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'advanceIn')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -68,10 +70,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <advance-in-modal ref="modalForm" @ok="modalFormOk"></advance-in-modal>
+    <financial-detail ref="modalDetail"></financial-detail>
   </a-card>
 </template>
 <script>
   import AdvanceInModal from './modules/AdvanceInModal'
+  import FinancialDetail from './dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -80,6 +84,7 @@
     mixins:[JeecgListMixin, FinancialListMixin],
     components: {
       AdvanceInModal,
+      FinancialDetail,
       JDate
     },
     data () {

jshERP-web/src/views/financial/GiroList.vue

@@ -57,6 +57,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'giro')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -68,10 +70,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <giro-modal ref="modalForm" @ok="modalFormOk"></giro-modal>
+    <financial-detail ref="modalDetail"></financial-detail>
   </a-card>
 </template>
 <script>
   import GiroModal from './modules/GiroModal'
+  import FinancialDetail from './dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -80,6 +84,7 @@
     mixins:[JeecgListMixin, FinancialListMixin],
     components: {
       GiroModal,
+      FinancialDetail,
       JDate
     },
     data () {

jshERP-web/src/views/financial/ItemInList.vue

@@ -57,6 +57,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
+          <a @click="myHandleDetail(record, 'itemIn')">查看</a>
+          <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -68,10 +70,12 @@
     <!-- table区域-end -->
     <!-- 表单区域 -->
     <item-in-modal ref="modalForm" @ok="modalFormOk"></item-in-modal>
+    <financial-detail ref="modalDetail"></financial-detail>
   </a-card>
 </template>
 <script>
   import ItemInModal from './modules/ItemInModal'
+  import FinancialDetail from './dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -80,6 +84,7 @@
     mixins:[JeecgListMixin, FinancialListMixin],
     components: {
       ItemInModal,
+      FinancialDetail,
       JDate
     },
     data () {