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

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/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 () {