Ver Fonte

财务管理

chenrui há 4 anos atrás
pai
commit
27661b3766

+ 122 - 50
src/config/router.config.js

@@ -260,7 +260,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/salesManagement/quotation/list',
+                path: 'list',
                 name: 'quotationList',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/list.vue'),
                 meta: {
@@ -271,7 +271,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/salesManagement/quotation/add',
+                path: 'add',
                 name: 'quotationAdd',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/edit.vue'),
                 meta: {
@@ -282,7 +282,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/salesManagement/quotation/edit/:id',
+                path: 'edit/:id',
                 name: 'quotationEdit',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/edit.vue'),
                 meta: {
@@ -293,7 +293,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/salesManagement/quotation/detail/:id',
+                path: 'detail/:id',
                 name: 'quotationDetail',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/detail.vue'),
                 meta: {
@@ -318,7 +318,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/salesManagement/backorder/list',
+                path: 'list',
                 name: 'backorderList',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/backorder/list.vue'),
                 meta: {
@@ -329,7 +329,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/salesManagement/backorder/detail/:id',
+                path: 'detail/:id',
                 name: 'backorderDetail',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/backorder/detail.vue'),
                 meta: {
@@ -354,7 +354,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/salesManagement/giftRecord/list',
+                path: 'list',
                 name: 'giftRecordList',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/giftRecord/list.vue'),
                 meta: {
@@ -392,7 +392,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/inventoryManagement/inventoryQuery/list',
+                path: 'list',
                 name: 'inventoryQueryList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryQuery/list.vue'),
                 meta: {
@@ -403,7 +403,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryQuery/warehouseDetail/:id',
+                path: 'warehouseDetail/:id',
                 name: 'inventoryQueryWarehouseDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryQuery/warehouseDetail.vue'),
                 meta: {
@@ -448,7 +448,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/inventoryManagement/warehouse/list',
+                path: 'list',
                 name: 'warehouseList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouse/list.vue'),
                 meta: {
@@ -484,7 +484,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/inventoryManagement/inventoryChecking/list',
+                path: 'list',
                 name: 'inventoryCheckingList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/list.vue'),
                 meta: {
@@ -495,7 +495,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryChecking/overall/:id',
+                path: 'overall/:id',
                 name: 'inventoryCheckingOverall',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/overall.vue'),
                 meta: {
@@ -506,7 +506,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryChecking/selfDisk/:id',
+                path: 'selfDisk/:id',
                 name: 'inventoryCheckingSelfDisk',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/selfDisk.vue'),
                 meta: {
@@ -517,7 +517,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryChecking/detail/:id',
+                path: 'detail/:id',
                 name: 'inventoryCheckingDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/detail.vue'),
                 meta: {
@@ -528,7 +528,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryChecking/makeInventory/:id',
+                path: 'makeInventory/:id',
                 name: 'inventoryCheckingMakeInventory',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/makeInventory.vue'),
                 meta: {
@@ -539,7 +539,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryChecking/makeInventory/detail/:id', /* 待盘点【盘点】详情  */
+                path: 'makeInventory/detail/:id', /* 待盘点【盘点】详情  */
                 name: 'inventoryCheckingMakeInventoryDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue'),
                 meta: {
@@ -550,7 +550,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryChecking/supervisionAudit/:id',
+                path: 'supervisionAudit/:id',
                 name: 'inventoryCheckingSupervisionAudit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/supervisionAudit.vue'),
                 meta: {
@@ -561,7 +561,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryChecking/supervisionAudit/detail/:id', /* 监盘审核详情  */
+                path: 'supervisionAudit/detail/:id', /* 监盘审核详情  */
                 name: 'inventoryCheckingSupervisionAuditDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/supervisionAuditDetail.vue'),
                 meta: {
@@ -572,7 +572,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/inventoryManagement/inventoryChecking/financialAudit/detail/:id', /* 财务审核详情  */
+                path: 'financialAudit/detail/:id', /* 财务审核详情  */
                 name: 'inventoryCheckingFinancialAuditDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue'),
                 meta: {
@@ -1214,7 +1214,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/financialManagement/warehousingAudit/list',
+                path: 'list',
                 name: 'warehousingAuditList',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/warehousingAudit/list.vue'),
                 meta: {
@@ -1225,7 +1225,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/financialManagement/warehousingAudit/detail/:id',
+                path: 'detail/:id',
                 name: 'warehousingAuditDetail',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/warehousingAudit/detail.vue'),
                 meta: {
@@ -1250,7 +1250,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/financialManagement/inventoryReview/list',
+                path: 'list',
                 name: 'inventoryReviewList',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryReview/list.vue'),
                 meta: {
@@ -1261,7 +1261,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/financialManagement/inventoryReview/detail/:id',
+                path: 'detail/:id',
                 name: 'inventoryReviewDetail',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryReview/detail.vue'),
                 meta: {
@@ -1273,6 +1273,56 @@ export const asyncRouterMap = [
               }
             ]
           },
+          {
+            path: '/financialManagement/financialPayment',
+            redirect: '/financialManagement/financialPayment/list',
+            name: 'financialPayment',
+            component: RouteView,
+            meta: {
+              title: '财务付款',
+              icon: 'gold'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'financialPaymentList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialPayment/list.vue'),
+                meta: {
+                  title: '财务付款列表',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/financialCollection',
+            redirect: '/financialManagement/financialCollection/list',
+            name: 'financialCollection',
+            component: RouteView,
+            meta: {
+              title: '财务收款',
+              icon: 'gold'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'financialCollectionList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/list.vue'),
+                meta: {
+                  title: '财务收款列表',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              }
+            ]
+          },
           {
             path: '/financialManagement/expenseManagement',
             redirect: '/financialManagement/expenseManagement/list',
@@ -1286,7 +1336,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/financialManagement/expenseManagement/list',
+                path: 'list',
                 name: 'expenseManagementList',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/list.vue'),
                 meta: {
@@ -1297,7 +1347,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/financialManagement/expenseManagement/add',
+                path: 'add',
                 name: 'expenseManagementDetail',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/edit.vue'),
                 meta: {
@@ -1308,7 +1358,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/financialManagement/expenseManagement/edit/:id',
+                path: 'edit/:id',
                 name: 'expenseManagementDetail',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/edit.vue'),
                 meta: {
@@ -1321,34 +1371,56 @@ export const asyncRouterMap = [
             ]
           },
           {
-            path: '/financialManagement/companyCollectionPayment',
-            redirect: '/financialManagement/companyCollectionPayment/list',
-            name: 'companyCollectionPayment',
+            path: '/financialManagement/companyReceivablePayable',
+            redirect: '/financialManagement/companyReceivablePayable/list',
+            name: 'companyReceivablePayable',
             component: RouteView,
             meta: {
-              title: '单位收付款记录',
+              title: '单位应收应付管理',
               icon: 'gold'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/financialManagement/companyCollectionPayment/list',
-                name: 'companyCollectionPaymentList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/list.vue'),
+                path: 'list',
+                name: 'companyReceivablePayableList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/list.vue'),
                 meta: {
-                  title: '单位收付款记录列表',
+                  title: '单位付列表',
                   icon: 'gold',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
               },
               {
-                path: '/financialManagement/companyCollectionPayment/detail/:id',
-                name: 'companyCollectionPaymentDetail',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/detail.vue'),
+                path: 'receipt/:id',
+                name: 'companyReceivablePayableReceipt',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/receipt.vue'),
                 meta: {
-                  title: '单位收付款记录详情',
+                  title: '单位收款单',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'paymentSlip/:id',
+                name: 'companyReceivablePayablePaymentSlip',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/paymentSlip.vue'),
+                meta: {
+                  title: '单位付款单',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'companyReceivablePayableDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/detail.vue'),
+                meta: {
+                  title: '单位应收应付详情',
                   icon: 'gold',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
@@ -1357,34 +1429,34 @@ export const asyncRouterMap = [
             ]
           },
           {
-            path: '/financialManagement/companyReceivablePayable',
-            redirect: '/financialManagement/companyReceivablePayable/list',
-            name: 'companyReceivablePayable',
+            path: '/financialManagement/companyCollectionPayment',
+            redirect: '/financialManagement/companyCollectionPayment/list',
+            name: 'companyCollectionPayment',
             component: RouteView,
             meta: {
-              title: '单位应收应付管理',
+              title: '单位收付款记录',
               icon: 'gold'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/financialManagement/companyReceivablePayable/list',
-                name: 'companyReceivablePayableList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/list.vue'),
+                path: 'list',
+                name: 'companyCollectionPaymentList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/list.vue'),
                 meta: {
-                  title: '单位应收应付管理列表',
+                  title: '单位收付款记录列表',
                   icon: 'gold',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
               },
               {
-                path: '/financialManagement/companyReceivablePayable/detail/:id',
-                name: 'companyReceivablePayableDetail',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/detail.vue'),
+                path: 'detail/:id',
+                name: 'companyCollectionPaymentDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/detail.vue'),
                 meta: {
-                  title: '单位应收应付管理详情',
+                  title: '单位收付款记录详情',
                   icon: 'gold',
                   hidden: true
                   // permission: 'B_goodsManage_edit'

+ 6 - 12
src/views/bulkManagement/bulkWarehousingOrder/warehousing.vue

@@ -66,11 +66,12 @@
           <a-cascader :options="typeData" id="bulkWarehousingOrderWarehousing-state" placeholder="请选择" allowClear v-model="record.brand" />
         </template>
       </s-table>
-      <div class="btn-cont">
-        <a-button type="primary" id="satellite-warehouse-inventory-add-modal-add" @click="handleWarehousing">确认入库</a-button>
-        <a-button id="satellite-warehouse-inventory-add-modal-back" @click="handleBack" style="margin-left: 15px;">返回列表</a-button>
-      </div>
     </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="bulkWarehousingOrderWarehousing-warehousing" size="large" @click="handleWarehousing" style="padding: 0 60px;">确认入库</a-button>
+      </div>
+    </a-affix>
   </div>
 </template>
 
@@ -160,11 +161,4 @@
   }
 </script>
 
-<style lang="less">
-  .bulkWarehousingOrderWarehousing-wrap{
-    .btn-cont {
-    	text-align: center;
-    	margin: 35px 0 10px;
-    }
-  }
-</style>
+<style lang="less"></style>

+ 7 - 2
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -85,9 +85,13 @@
         <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{record.purchaseNo}}</span>
       </template>
       <!-- 结算方式 -->
-      <template slot="action" slot-scope="text, record">
+      <template slot="sss" slot-scope="text, record">
         <span>{{record.state == 1 ? '现金' : '微信'}}</span>
       </template>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="dashed" @click="handleDetail(record)" id="companyCollectionPaymentList-detail-btn">详情</a-button>
+      </template>
     </s-table>
   </a-card>
 </template>
@@ -113,7 +117,8 @@ export default {
         { title: '结算金额', dataIndex: 'totalP', align: 'center' },
         { title: '结算时间', dataIndex: 'creatDate', align: 'center' },
         { title: '操作人', dataIndex: 'payType', align: 'center' },
-        { title: '结算方式', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+        { title: '结算方式', scopedSlots: { customRender: 'sss' }, width: 270, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -118,7 +118,7 @@
     methods: {
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/financialManagement/companyCollectionPayment/list'})
+        this.$router.push({ path: '/financialManagement/companyReceivablePayable/list'})
       },
       //  导出
       handleExport () {

+ 6 - 2
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -109,9 +109,13 @@ export default {
       this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.id}`})
     },
     //  收款
-    handleCollection(row){},
+    handleCollection(row){
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/receipt/${row.id}`})
+    },
     //  付款
-    handlePayment(row){},
+    handlePayment(row){
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/paymentSlip/${row.id}`})
+    },
     //  重置
     resetSearchForm () {  
       this.queryParam.orderBundleNo = ''

+ 341 - 0
src/views/financialManagement/companyReceivablePayable/paymentSlip.vue

@@ -0,0 +1,341 @@
+<template>
+  <div class="paymentSlipEdit-wrap">
+    <a-page-header :ghost="false" @back="handleBack" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="paymentSlipEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="paymentSlipEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="paymentSlipEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 内容 -->
+    <a-page-header title="客户:抢个汽修厂" ></a-page-header>
+    <!-- 付款信息 -->
+    <a-card :bordered="false" class="paymentSlipEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1" header="付款信息">
+          <a-form-model
+          	id="paymentSlipEdit-form"
+          	ref="ruleForm"
+          	:model="form"
+          	:rules="rules"
+          	:label-col="formItemLayout.labelCol"
+          	:wrapper-col="formItemLayout.wrapperCol" >
+          	<a-row :gutter="15">
+          		<a-col :span="8">
+          			<a-form-model-item label="总计应付金额" prop="name">
+                  <a-input-number id="paymentSlipEdit-name" disabled v-model="form.name" :precision="0" :min="0" :max="999999" placeholder="请输入总计应付金额" style="width: 90%;" /> 元
+          			</a-form-model-item>
+          		</a-col>
+          	</a-row>
+            <a-row :gutter="15">
+            	<a-col :span="8">
+            		<a-form-model-item label="付款金额" prop="mobile">
+                  <a-input-number id="paymentSlipEdit-mobile" v-model="form.mobile" :precision="0" :min="0" :max="999999" placeholder="请输入付款金额" style="width: 90%;" /> 元
+            		</a-form-model-item>
+            	</a-col>
+            	<a-col :span="8">
+            		<a-form-model-item label="折让金额" prop="name">
+            	    <a-input-number id="paymentSlipEdit-name" v-model="form.name" :precision="0" :min="0" :max="999999" placeholder="请输入折让金额" style="width: 90%;" /> 元
+            		</a-form-model-item>
+            	</a-col>
+            	<a-col :span="8">
+            		<a-form-model-item label="结算方式" prop="paymentType">
+            			<v-select
+            				code="DISPATCH_FASHION"
+            				id="paymentSlipEdit-paymentType"
+            				v-model="form.paymentType"
+            				allowClear
+            				placeholder="请选择结算方式"
+            			></v-select>
+            		</a-form-model-item>
+            	</a-col>
+            </a-row>
+            <a-row :gutter="15">
+            	<a-col :span="8">
+            		<a-form-model-item label="实付金额" prop="name">
+                  <a-input-number id="paymentSlipEdit-name" disabled v-model="form.name" :precision="0" :min="0" :max="999999" placeholder="请输入实付金额" style="width: 90%;" /> 元
+            		</a-form-model-item>
+            	</a-col>
+              <a-col :span="16">
+              	<a-form-model-item label="备注" prop="remarks" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
+              		<a-input id="paymentSlipEdit-remarks" :maxLength="500" v-model="form.remarks" placeholder="请输入备注(最多500个字符)" allowClear />
+              	</a-form-model-item>
+              </a-col>
+            </a-row>
+          </a-form-model>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 付款明细 -->
+    <a-card :bordered="false" class="paymentSlipEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            付款明细
+            <a-button size="small" class="add-bill-btn" id="paymentSlipEdit-bill-btn" @click.stop="handleBill" style="margin-left: 15px;">添加单据</a-button>
+            <a-button size="small" class="amount-btn" id="paymentSlipEdit-amount-btn" @click.stop="handleAmount" style="margin-left: 15px;">分配结算金额</a-button>
+          </template>
+          <!-- 付款明细 -->
+          <div>
+            <!-- 搜索条件 -->
+            <div class="table-page-search-wrapper">
+              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+                <a-row :gutter="15">
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="单据号">
+                      <a-input id="paymentSlipEdit-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入单据号"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="审核时间">
+                      <a-range-picker v-model="queryParam.creatDate" id="paymentSlipEdit-creatDate"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <span class="table-page-search-submitButtons">
+                      <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="paymentSlipEdit-refresh">查询</a-button>
+                      <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="paymentSlipEdit-reset">重置</a-button>
+                    </span>
+                  </a-col>
+                </a-row>
+              </a-form>
+            </div>
+            <!-- 总计 -->
+            <a-alert type="info" showIcon style="margin-bottom:15px">
+              <div slot="message">共 <strong>6</strong> 条明细,金额合计 <strong>¥6</strong> ,余额合计<strong>¥6.33</strong></div>
+            </a-alert>
+            <div style="margin-bottom: 15px">
+              <a-button type="primary" id="paymentSlipEdit-export" :disabled="!hasSelected" :loading="loading" @click="handleNoCollection">
+                批量暂不收款
+              </a-button>
+              <span style="margin-left: 8px">
+                <template v-if="hasSelected">
+                  {{ `已选 ${selectedRowKeys.length} 项` }}
+                </template>
+              </span>
+            </div>
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="default"
+              :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+              :rowKey="(record) => record.id"
+              :columns="columns"
+              :data="loadData"
+              bordered>
+              <!-- 结算金额 -->
+              <template slot="storageQuantity" slot-scope="text, record">
+                <a-input-number
+                  id="paymentSlipEdit-storageQuantity"
+                  :value="record.storageQuantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button size="small" type="primary" @click="handleDel(record)" id="paymentSlipEdit-del-btn">删除</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="paymentSlipEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      </div>
+    </a-affix>
+  </div>
+</template>
+
+<script>
+  import { STable, VSelect } from '@/components'
+  export default{
+    components: { STable, VSelect },
+    data(){
+      return{
+        queryParam: {
+          
+        },
+        brandData: [],  //  产品品牌  下拉数据
+        typeData: [],  //  产品类别  下拉数据
+        advanced: false,  //  高级搜索 展开/关闭
+        disabled: false, //  查询、重置按钮是否可操作
+        formItemLayout: {
+        	labelCol: { span: 8 },
+        	wrapperCol: { span: 16 }
+        },
+        form: {
+        	name: '', // 客户名称
+        	mobile: '', //  联系手机
+        	contact: '', //  联系人
+        	provinceId: undefined, //  省
+        	province: '',
+        	cityId: undefined, // 市
+        	city: '',
+        	areaId: undefined, // 区
+        	area: '',
+        	address: '', //  详细地址
+        	fax: '', //  客户传真
+        	distributionType: '', //  配送方式
+        	remarks: '', //  是否卫星仓客户
+        	custType: undefined, //  客户类型
+        	priceType: '', //  价格类型
+        	payType: '', //  支付方式
+        	paymentType: '', //  收款方式
+        	contactTel: '' //  联系电话
+        },
+        rules: {
+        	// name: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
+        	mobile: [{ required: true, message: '请输入联系手机', trigger: 'blur' }],
+        	provinceId: [{ required: true, message: '请选择省', trigger: 'change' }],
+        	cityId: [{ required: true, message: '请选择市', trigger: 'change' }],
+        	areaId: [{ required: true, message: '请选择区/县', trigger: 'change' }],
+        	custType: [{ required: true, message: '请选择客户类型', trigger: 'change' }],
+        	priceType: [{ required: true, message: '请选择价格类型', trigger: 'change' }],
+        	payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+        	paymentType: [{ required: true, message: '请选择收款方式', trigger: 'change' }]
+        },
+        // 表头
+        columns: [
+          { title: '序号', dataIndex: 'no', align: 'center' },
+          { title: '单据号', dataIndex: 'creatDate', align: 'center' },
+          { title: '类型', dataIndex: 'custName', align: 'center' },
+          { title: '审核时间', dataIndex: 'custsName', align: 'center' },
+          { title: '金额', dataIndex: 'totalP', align: 'center' },
+          { title: '余额', dataIndex: 'totalNums', align: 'center' },
+          { title: '结算金额', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
+        ],
+        selectedRowKeys: [], // Check here to configure the default column
+        loading: false,
+        // 加载数据方法 必须为 Promise 对象
+        loadData: parameter => {
+          this.disabled = true
+          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+          //   const data = res.data
+          //   const no = (data.pageNo - 1) * data.pageSize
+          //   for (var i = 0; i < data.list.length; i++) {
+          //     data.list[i].no = no + i + 1
+          //   }
+          //   this.disabled = false
+          //   return data
+          // })
+          const _this = this
+          return new Promise(function(resolve, reject){
+            const data = {
+              pageNo: 1,
+              pageSize: 10,
+              list: [
+                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+              ],
+              count: 10
+            }
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            _this.disabled = false
+            resolve(data)
+          })
+        },
+      }
+    },
+    computed: {
+      hasSelected () {
+        return this.selectedRowKeys.length > 0
+      }
+    },
+    methods: {
+      //  重置
+      resetSearchForm () {
+        this.queryParam.orderBundleNo = ''
+        this.queryParam.orderBundle.custMobile = ''
+        this.queryParam.bundleName = ''
+        this.queryParam.itemName = ''
+        this.oldTime = undefined
+        this.newTime = undefined
+        this.$refs.table.refresh(true)
+      },
+      //  添加
+      handleAdd(row){},
+      //  删除
+      handleDel(row){},
+      //  编辑基本信息
+      handleEditInfo(){
+        this.openModal = true
+      },
+      //  提交
+      handleSubmit(){
+        
+      },
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/financialManagement/companyReceivablePayable/list'})
+      },
+      // 批量暂不收款
+      handleNoCollection () {
+        this.loading = true
+        // ajax request after empty completing
+        setTimeout(() => {
+          this.loading = false
+          this.selectedRowKeys = []
+        }, 1000)
+      },
+      //  添加单据
+      handleBill(){
+        console.log(333)
+      },
+      //  分配结算金额
+      handleAmount(){
+        console.log(444)
+      },
+      onSelectChange (selectedRowKeys) {
+        console.log('selectedRowKeys changed: ', selectedRowKeys)
+        this.selectedRowKeys = selectedRowKeys
+      },
+      filterOption(input, option) {
+      	return (
+      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      	)
+      },
+    },
+    beforeRouteEnter (to, from, next) {
+      next(vm => {
+        vm.openModal = false
+      })
+    }
+  }
+</script>
+
+<style lang="less">
+  .paymentSlipEdit-wrap{
+    .paymentSlipEdit-cont{
+      margin-bottom: 15px;
+      .sub-title{
+        font-size: 12px;
+        color: #808695;
+        margin-left: 10px;
+      }
+      .tag-txt{
+        font-size: 12px;
+        color: #ed1c24;
+      }
+      .edit-circle-btn{
+        margin-left: 15px;
+        i{
+          vertical-align: text-bottom;
+        }
+      }
+      .import-btn{
+        margin-left: 15px;
+      }
+    }
+  }
+</style>

+ 341 - 0
src/views/financialManagement/companyReceivablePayable/receipt.vue

@@ -0,0 +1,341 @@
+<template>
+  <div class="receiptEdit-wrap">
+    <a-page-header :ghost="false" @back="handleBack" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="receiptEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="receiptEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="receiptEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 内容 -->
+    <a-page-header title="客户:抢个汽修厂" ></a-page-header>
+    <!-- 收款信息 -->
+    <a-card :bordered="false" class="receiptEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1" header="收款信息">
+          <a-form-model
+          	id="receiptEdit-form"
+          	ref="ruleForm"
+          	:model="form"
+          	:rules="rules"
+          	:label-col="formItemLayout.labelCol"
+          	:wrapper-col="formItemLayout.wrapperCol" >
+          	<a-row :gutter="15">
+          		<a-col :span="8">
+          			<a-form-model-item label="总计应收金额" prop="name">
+                  <a-input-number id="receiptEdit-name" disabled v-model="form.name" :precision="0" :min="0" :max="999999" placeholder="请输入总计应收金额" style="width: 90%;" /> 元
+          			</a-form-model-item>
+          		</a-col>
+          	</a-row>
+            <a-row :gutter="15">
+            	<a-col :span="8">
+            		<a-form-model-item label="收款金额" prop="mobile">
+                  <a-input-number id="receiptEdit-mobile" v-model="form.mobile" :precision="0" :min="0" :max="999999" placeholder="请输入收款金额" style="width: 90%;" /> 元
+            		</a-form-model-item>
+            	</a-col>
+            	<a-col :span="8">
+            		<a-form-model-item label="折让金额" prop="name">
+            	    <a-input-number id="receiptEdit-name" v-model="form.name" :precision="0" :min="0" :max="999999" placeholder="请输入折让金额" style="width: 90%;" /> 元
+            		</a-form-model-item>
+            	</a-col>
+            	<a-col :span="8">
+            		<a-form-model-item label="结算方式" prop="paymentType">
+            			<v-select
+            				code="DISPATCH_FASHION"
+            				id="receiptEdit-paymentType"
+            				v-model="form.paymentType"
+            				allowClear
+            				placeholder="请选择结算方式"
+            			></v-select>
+            		</a-form-model-item>
+            	</a-col>
+            </a-row>
+            <a-row :gutter="15">
+            	<a-col :span="8">
+            		<a-form-model-item label="实收金额" prop="name">
+                  <a-input-number id="receiptEdit-name" disabled v-model="form.name" :precision="0" :min="0" :max="999999" placeholder="请输入实收金额" style="width: 90%;" /> 元
+            		</a-form-model-item>
+            	</a-col>
+              <a-col :span="16">
+              	<a-form-model-item label="备注" prop="remarks" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
+              		<a-input id="receiptEdit-remarks" :maxLength="500" v-model="form.remarks" placeholder="请输入备注(最多500个字符)" allowClear />
+              	</a-form-model-item>
+              </a-col>
+            </a-row>
+          </a-form-model>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 收款明细 -->
+    <a-card :bordered="false" class="receiptEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            收款明细
+            <a-button size="small" class="add-bill-btn" id="receiptEdit-bill-btn" @click.stop="handleBill" style="margin-left: 15px;">添加单据</a-button>
+            <a-button size="small" class="amount-btn" id="receiptEdit-amount-btn" @click.stop="handleAmount" style="margin-left: 15px;">分配结算金额</a-button>
+          </template>
+          <!-- 收款明细 -->
+          <div>
+            <!-- 搜索条件 -->
+            <div class="table-page-search-wrapper">
+              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+                <a-row :gutter="15">
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="单据号">
+                      <a-input id="receiptEdit-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入单据号"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="审核时间">
+                      <a-range-picker v-model="queryParam.creatDate" id="receiptEdit-creatDate"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <span class="table-page-search-submitButtons">
+                      <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="receiptEdit-refresh">查询</a-button>
+                      <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="receiptEdit-reset">重置</a-button>
+                    </span>
+                  </a-col>
+                </a-row>
+              </a-form>
+            </div>
+            <!-- 总计 -->
+            <a-alert type="info" showIcon style="margin-bottom:15px">
+              <div slot="message">共 <strong>6</strong> 条明细,金额合计 <strong>¥6</strong> ,余额合计<strong>¥6.33</strong></div>
+            </a-alert>
+            <div style="margin-bottom: 15px">
+              <a-button type="primary" id="receiptEdit-export" :disabled="!hasSelected" :loading="loading" @click="handleNoCollection">
+                批量暂不收款
+              </a-button>
+              <span style="margin-left: 8px">
+                <template v-if="hasSelected">
+                  {{ `已选 ${selectedRowKeys.length} 项` }}
+                </template>
+              </span>
+            </div>
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="default"
+              :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+              :rowKey="(record) => record.id"
+              :columns="columns"
+              :data="loadData"
+              bordered>
+              <!-- 结算金额 -->
+              <template slot="storageQuantity" slot-scope="text, record">
+                <a-input-number
+                  id="receiptEdit-storageQuantity"
+                  :value="record.storageQuantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button size="small" type="primary" @click="handleDel(record)" id="receiptEdit-del-btn">删除</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="receiptEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      </div>
+    </a-affix>
+  </div>
+</template>
+
+<script>
+  import { STable, VSelect } from '@/components'
+  export default{
+    components: { STable, VSelect },
+    data(){
+      return{
+        queryParam: {
+          
+        },
+        brandData: [],  //  产品品牌  下拉数据
+        typeData: [],  //  产品类别  下拉数据
+        advanced: false,  //  高级搜索 展开/关闭
+        disabled: false, //  查询、重置按钮是否可操作
+        formItemLayout: {
+        	labelCol: { span: 8 },
+        	wrapperCol: { span: 16 }
+        },
+        form: {
+        	name: '', // 客户名称
+        	mobile: '', //  联系手机
+        	contact: '', //  联系人
+        	provinceId: undefined, //  省
+        	province: '',
+        	cityId: undefined, // 市
+        	city: '',
+        	areaId: undefined, // 区
+        	area: '',
+        	address: '', //  详细地址
+        	fax: '', //  客户传真
+        	distributionType: '', //  配送方式
+        	remarks: '', //  是否卫星仓客户
+        	custType: undefined, //  客户类型
+        	priceType: '', //  价格类型
+        	payType: '', //  支付方式
+        	paymentType: '', //  收款方式
+        	contactTel: '' //  联系电话
+        },
+        rules: {
+        	// name: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
+        	mobile: [{ required: true, message: '请输入联系手机', trigger: 'blur' }],
+        	provinceId: [{ required: true, message: '请选择省', trigger: 'change' }],
+        	cityId: [{ required: true, message: '请选择市', trigger: 'change' }],
+        	areaId: [{ required: true, message: '请选择区/县', trigger: 'change' }],
+        	custType: [{ required: true, message: '请选择客户类型', trigger: 'change' }],
+        	priceType: [{ required: true, message: '请选择价格类型', trigger: 'change' }],
+        	payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+        	paymentType: [{ required: true, message: '请选择收款方式', trigger: 'change' }]
+        },
+        // 表头
+        columns: [
+          { title: '序号', dataIndex: 'no', align: 'center' },
+          { title: '单据号', dataIndex: 'creatDate', align: 'center' },
+          { title: '类型', dataIndex: 'custName', align: 'center' },
+          { title: '审核时间', dataIndex: 'custsName', align: 'center' },
+          { title: '金额', dataIndex: 'totalP', align: 'center' },
+          { title: '余额', dataIndex: 'totalNums', align: 'center' },
+          { title: '结算金额', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
+        ],
+        selectedRowKeys: [], // Check here to configure the default column
+        loading: false,
+        // 加载数据方法 必须为 Promise 对象
+        loadData: parameter => {
+          this.disabled = true
+          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+          //   const data = res.data
+          //   const no = (data.pageNo - 1) * data.pageSize
+          //   for (var i = 0; i < data.list.length; i++) {
+          //     data.list[i].no = no + i + 1
+          //   }
+          //   this.disabled = false
+          //   return data
+          // })
+          const _this = this
+          return new Promise(function(resolve, reject){
+            const data = {
+              pageNo: 1,
+              pageSize: 10,
+              list: [
+                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+              ],
+              count: 10
+            }
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            _this.disabled = false
+            resolve(data)
+          })
+        },
+      }
+    },
+    computed: {
+      hasSelected () {
+        return this.selectedRowKeys.length > 0
+      }
+    },
+    methods: {
+      //  重置
+      resetSearchForm () {
+        this.queryParam.orderBundleNo = ''
+        this.queryParam.orderBundle.custMobile = ''
+        this.queryParam.bundleName = ''
+        this.queryParam.itemName = ''
+        this.oldTime = undefined
+        this.newTime = undefined
+        this.$refs.table.refresh(true)
+      },
+      //  添加
+      handleAdd(row){},
+      //  删除
+      handleDel(row){},
+      //  编辑基本信息
+      handleEditInfo(){
+        this.openModal = true
+      },
+      //  提交
+      handleSubmit(){
+        
+      },
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/financialManagement/companyReceivablePayable/list'})
+      },
+      // 批量暂不收款
+      handleNoCollection () {
+        this.loading = true
+        // ajax request after empty completing
+        setTimeout(() => {
+          this.loading = false
+          this.selectedRowKeys = []
+        }, 1000)
+      },
+      //  添加单据
+      handleBill(){
+        console.log(333)
+      },
+      //  分配结算金额
+      handleAmount(){
+        console.log(444)
+      },
+      onSelectChange (selectedRowKeys) {
+        console.log('selectedRowKeys changed: ', selectedRowKeys)
+        this.selectedRowKeys = selectedRowKeys
+      },
+      filterOption(input, option) {
+      	return (
+      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      	)
+      },
+    },
+    beforeRouteEnter (to, from, next) {
+      next(vm => {
+        vm.openModal = false
+      })
+    }
+  }
+</script>
+
+<style lang="less">
+  .receiptEdit-wrap{
+    .receiptEdit-cont{
+      margin-bottom: 15px;
+      .sub-title{
+        font-size: 12px;
+        color: #808695;
+        margin-left: 10px;
+      }
+      .tag-txt{
+        font-size: 12px;
+        color: #ed1c24;
+      }
+      .edit-circle-btn{
+        margin-left: 15px;
+        i{
+          vertical-align: text-bottom;
+        }
+      }
+      .import-btn{
+        margin-left: 15px;
+      }
+    }
+  }
+</style>

+ 225 - 0
src/views/financialManagement/financialCollection/list.vue

@@ -0,0 +1,225 @@
+<template>
+  <a-card :bordered="false" class="financialCollectionList-wrap">
+    <!-- 标签页 -->
+    <a-tabs type="card" @change="handleTabChange" class="financialCollectionList-tabs">
+      <a-tab-pane v-for="item in tabPaneData" :key="item.id" :tab="item.name"></a-tab-pane>
+    </a-tabs>
+    <!-- 搜索条件 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="收款单号">
+              <a-input id="financialCollectionList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入收款单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="关联单号">
+              <a-input id="financialCollectionList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入关联单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="商户名称">
+              <a-input id="financialCollectionList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入商户名称"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="financialCollectionList-billStatus"
+                  code="PAYMENT_TYPE"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="审核时间">
+                <a-range-picker v-model="queryParam.creatDate" id="financialCollectionList-creatDate"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="financialCollectionList-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="financialCollectionList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- alert -->
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div slot="message">共 <strong>6</strong> 条记录,收款金额合计 <strong>¥14</strong> ,其中已收 <strong>¥14</strong> ,未收 <strong>¥14</strong> </div>
+    </a-alert>
+    <div style="margin-bottom: 15px">
+      <a-button type="primary" id="financialCollectionList-export" :disabled="!hasSelected" :loading="loading" @click="handleCollection">
+        批量收款
+      </a-button>
+      <span style="margin-left: 8px">
+        <template v-if="hasSelected">
+          {{ `已选 ${selectedRowKeys.length} 项` }}
+        </template>
+      </span>
+    </div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :row-selection="rowSelection"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 结算单号 -->
+      <template slot="purchaseNo" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{record.purchaseNo}}</span>
+      </template>
+      <!-- 结算方式 -->
+      <template slot="sss" slot-scope="text, record">
+        <span>{{record.state == 1 ? '现金' : '微信'}}</span>
+      </template>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="dashed" @click="handleVoucher(record)" id="financialCollectionList-voucher-btn">凭证</a-button>
+      </template>
+    </s-table>
+  </a-card>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+// import { getRoleList, getServiceList } from '@/api/manage'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      advanced: false,  //  高级搜索 展开/关闭
+      disabled: false, //  查询、重置按钮是否可操作
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        { title: '收款单号', dataIndex: 'no', align: 'center' },
+        { title: '关联单号', dataIndex: 'name', align: 'center' },
+        { title: '商户名称', dataIndex: 'pssayType', align: 'center' },
+        { title: '收款金额', dataIndex: 'paddyType', align: 'center' },
+        { title: '收款类型', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
+        { title: '收款方式', dataIndex: 'totalP', align: 'center' },
+        { title: '审核时间', dataIndex: 'payType', align: 'center' },
+        { title: '收款时间', dataIndex: 'creatDate', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center' }
+      ],
+      selectedRowKeys: [], // Check here to configure the default column
+      loading: false,
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function(resolve, reject){
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
+      },
+      tabPaneData: [
+        { id: 1, name: '全部' },
+        { id: 2, name: '销售' },
+        { id: 3, name: '采购退货' },
+        { id: 4, name: '散件退货' },
+        { id: 5, name: '店内调出' },
+        { id: 6, name: '连锁调出' },
+        { id: 7, name: '盘点收款' },
+        { id: 8, name: '营业外收入' },
+      ]
+    }
+  },
+  computed: {
+    hasSelected () {
+      return this.selectedRowKeys.length > 0
+    },
+    rowSelection() {
+      return {
+        selectedRowKeys: this.selectedRowKeys,
+        onChange: (selectedRowKeys, selectedRows) => {
+          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+          console.log('selectedRowKeys changed: ', selectedRowKeys)
+          this.selectedRowKeys = selectedRowKeys
+        },
+        getCheckboxProps: record => ({
+          props: {
+            disabled: record.name === 'Disabled User', // Column configuration not to be checked
+            name: record.name,
+          },
+        }),
+      };
+    }
+  },
+  methods: {
+    //  凭证
+    handleVoucher(row){
+      
+    },
+    //  tabs  change
+    handleTabChange(key){
+      console.log(key)
+    },
+    // 批量收款
+    handleCollection () {
+      this.loading = true
+      // ajax request after empty completing
+      setTimeout(() => {
+        this.loading = false
+        this.selectedRowKeys = []
+      }, 1000)
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+  }
+}
+</script>
+<style lang="less">
+  .financialCollectionList-wrap{
+    .sTable{
+      margin-top: 15px;
+    }
+    .financialCollectionList-tabs{
+      margin-bottom: 15px;
+    }
+  }
+</style>

+ 226 - 0
src/views/financialManagement/financialPayment/list.vue

@@ -0,0 +1,226 @@
+<template>
+  <a-card :bordered="false" class="financialPaymentList-wrap">
+    <!-- 标签页 -->
+    <a-tabs type="card" @change="handleTabChange" class="financialPaymentList-tabs">
+      <a-tab-pane v-for="item in tabPaneData" :key="item.id" :tab="item.name"></a-tab-pane>
+    </a-tabs>
+    <!-- 搜索条件 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="付款单号">
+              <a-input id="financialPaymentList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入付款单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="关联单号">
+              <a-input id="financialPaymentList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入关联单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="商户名称">
+              <a-input id="financialPaymentList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入商户名称"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="financialPaymentList-billStatus"
+                  code="PAYMENT_TYPE"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="审核时间">
+                <a-range-picker v-model="queryParam.creatDate" id="financialPaymentList-creatDate"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="financialPaymentList-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="financialPaymentList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- alert -->
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div slot="message">共 <strong>6</strong> 条记录,付款金额合计 <strong>¥14</strong> ,其中已付 <strong>¥14</strong> ,未付 <strong>¥14</strong> </div>
+    </a-alert>
+    <div style="margin-bottom: 15px">
+      <a-button type="primary" id="financialPaymentList-export" :disabled="!hasSelected" :loading="loading" @click="handlePayment">
+        批量付款
+      </a-button>
+      <span style="margin-left: 8px">
+        <template v-if="hasSelected">
+          {{ `已选 ${selectedRowKeys.length} 项` }}
+        </template>
+      </span>
+    </div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :row-selection="rowSelection"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 结算单号 -->
+      <template slot="purchaseNo" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{record.purchaseNo}}</span>
+      </template>
+      <!-- 结算方式 -->
+      <template slot="sss" slot-scope="text, record">
+        <span>{{record.state == 1 ? '现金' : '微信'}}</span>
+      </template>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="dashed" @click="handleVoucher(record)" id="financialPaymentList-voucher-btn">凭证</a-button>
+      </template>
+    </s-table>
+  </a-card>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+// import { getRoleList, getServiceList } from '@/api/manage'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      advanced: false,  //  高级搜索 展开/关闭
+      disabled: false, //  查询、重置按钮是否可操作
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        { title: '付款单号', dataIndex: 'no', align: 'center' },
+        { title: '关联单号', dataIndex: 'name', align: 'center' },
+        { title: '商户名称', dataIndex: 'pssayType', align: 'center' },
+        { title: '付款金额', dataIndex: 'paddyType', align: 'center' },
+        { title: '付款类型', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
+        { title: '付款方式', dataIndex: 'totalP', align: 'center' },
+        { title: '付款时间', dataIndex: 'creatDate', align: 'center' },
+        { title: '审核时间', dataIndex: 'payType', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center' }
+      ],
+      selectedRowKeys: [], // Check here to configure the default column
+      loading: false,
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function(resolve, reject){
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
+      },
+      tabPaneData: [
+        { id: 1, name: '全部' },
+        { id: 2, name: '采购入库' },
+        { id: 3, name: '散件入库' },
+        { id: 4, name: '销售退货' },
+        { id: 5, name: '连锁调入' },
+        { id: 6, name: '急件' },
+        { id: 7, name: '费用' },
+        { id: 8, name: '资产' },
+        { id: 9, name: '盘点付款' },
+      ]
+    }
+  },
+  computed: {
+    hasSelected () {
+      return this.selectedRowKeys.length > 0
+    },
+    rowSelection() {
+      return {
+        selectedRowKeys: this.selectedRowKeys,
+        onChange: (selectedRowKeys, selectedRows) => {
+          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+          console.log('selectedRowKeys changed: ', selectedRowKeys)
+          this.selectedRowKeys = selectedRowKeys
+        },
+        getCheckboxProps: record => ({
+          props: {
+            disabled: record.name === 'Disabled User', // Column configuration not to be checked
+            name: record.name,
+          },
+        }),
+      };
+    }
+  },
+  methods: {
+    //  凭证
+    handleVoucher(row){
+      
+    },
+    //  tabs  change
+    handleTabChange(key){
+      console.log(key)
+    },
+    // 批量付款
+    handlePayment () {
+      this.loading = true
+      // ajax request after empty completing
+      setTimeout(() => {
+        this.loading = false
+        this.selectedRowKeys = []
+      }, 1000)
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+  }
+}
+</script>
+<style lang="less">
+  .financialPaymentList-wrap{
+    .sTable{
+      margin-top: 15px;
+    }
+    .financialPaymentList-tabs{
+      margin-bottom: 15px;
+    }
+  }
+</style>

+ 91 - 85
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -1,84 +1,88 @@
 <template>
-  <a-card :bordered="false" class="inventoryQueryWarehouseDetail-wrap">
-    <!-- 搜索条件 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="变动类型">
-              <a-select id="inventoryQueryWarehouseDetail-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
-                <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="单据类型">
-              <a-select id="inventoryQueryWarehouseDetail-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
-                <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="仓库">
-              <a-select id="inventoryQueryWarehouseDetail-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
-                <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
+  <div class="inventoryQueryWarehouseDetail-wrap">
+    <a-page-header :ghost="false" @back="handleBack" class="inventoryQueryWarehouseDetail-back">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="inventoryQueryWarehouseDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+    </a-page-header>
+    <a-card :bordered="false" class="inventoryQueryWarehouseDetail-cont">
+      <!-- 搜索条件 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="单据审核时间">
-                <a-range-picker
-                    style="width:100%"
-                    id="inventoryQueryWarehouseDetail-bundleNamesss"
-                    :disabledDate="disabledDate"
-                    v-model="queryParam.brand"
-                    :format="dateFormat"
-                    :placeholder="['开始时间', '结束时间']" />
-                </a-form-item>
+              <a-form-item label="变动类型">
+                <a-select id="inventoryQueryWarehouseDetail-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
+                  <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="单位名称">
-                <a-input id="inventoryQueryWarehouseDetail-orderBundleNo" v-model.trim="queryParam.orderBundleNo" allowClear placeholder="请输入单位名称"/>
+              <a-form-item label="单据类型">
+                <a-select id="inventoryQueryWarehouseDetail-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
+                  <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryWarehouseDetail-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryWarehouseDetail-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">当前库存总数量(个):<strong>998</strong>;当前库存总成本(¥):<strong>2009.00</strong>。</div>
-    </a-alert>
-    <!-- 列表 -->
-    <s-table
-      class="sTable"
-      ref="table"
-      size="default"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :showPagination="false"
-      bordered>
-      <!-- 数量 -->
-      <template slot="number" slot-scope="text, record">
-        <span :class="[record.type == 1 ? 'green' : 'red']">{{record.type == 1 ? '+' : '-'}}{{record.number}}</span>
-      </template>
-    </s-table>
-    <div class="footer-box">
-      <!-- 返回列表 -->
-      <a-button type="primary" @click="goList" id="inventoryQueryWarehouseDetail-goback-btn">返回列表</a-button>
-    </div>
-  </a-card>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="仓库">
+                <a-select id="inventoryQueryWarehouseDetail-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
+                  <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据审核时间">
+                  <a-range-picker
+                      style="width:100%"
+                      id="inventoryQueryWarehouseDetail-bundleNamesss"
+                      :disabledDate="disabledDate"
+                      v-model="queryParam.brand"
+                      :format="dateFormat"
+                      :placeholder="['开始时间', '结束时间']" />
+                  </a-form-item>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单位名称">
+                  <a-input id="inventoryQueryWarehouseDetail-orderBundleNo" v-model.trim="queryParam.orderBundleNo" allowClear placeholder="请输入单位名称"/>
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryWarehouseDetail-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryWarehouseDetail-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 合计 -->
+      <a-alert type="info" showIcon style="margin-bottom:15px">
+        <div class="ftext" slot="message">当前库存总数量(个):<strong>998</strong>;当前库存总成本(¥):<strong>2009.00</strong>。</div>
+      </a-alert>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="default"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :showPagination="false"
+        bordered>
+        <!-- 数量 -->
+        <template slot="number" slot-scope="text, record">
+          <span :class="[record.type == 1 ? 'green' : 'red']">{{record.type == 1 ? '+' : '-'}}{{record.number}}</span>
+        </template>
+      </s-table>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -110,12 +114,12 @@ export default {
         { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库批次时间', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据类型', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据审核时间', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位名称', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '入库批次时间', dataIndex: 'prodsuctBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'productBdrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据审核时间', dataIndex: 'prodfuctBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位名称', dataIndex: 'produhctBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'productBrangd', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'productBjrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '数量', scopedSlots: { customRender: 'number' }, width: 180, align: 'center' },
         { title: '总成本', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'inventoryMoneys', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -166,8 +170,8 @@ export default {
       this.newTime = undefined
       this.$refs.table.refresh(true)
     },
-    //  返回库存查询列表
-    goList(){
+    //  返回列表
+    handleBack(){
       this.$router.push({ path: '/inventoryManagement/inventoryQuery/list' })
     }
   }
@@ -181,9 +185,11 @@ export default {
         width: auto;
       }
     }
-    .footer-box{
-      margin: 50px auto 20px;
-      text-align: center;
+    .inventoryQueryWarehouseDetail-back{
+      margin-bottom: 15px;
+    }
+    .inventoryQueryWarehouseDetail-cont{
+      margin-bottom: 15px;
     }
     .green{
       color: #19be6b;

+ 20 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="purchaseOrderEdit-wrap">
-    <!-- 内容 -->
-    <a-page-header title="单号:CG2021010100001" style="margin-top: -24px;" >
+    <a-page-header :ghost="false" @back="handleBack" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
         <a-button key="2" id="purchaseOrderEdit-preview-btn">打印预览</a-button>
         <a-button key="1" type="primary" id="purchaseOrderEdit-print-btn">快速打印</a-button>
       </template>
     </a-page-header>
+    <!-- 内容 -->
+    <a-page-header title="单号:CG2021010100001" ></a-page-header>
     <!-- 基础信息 -->
     <a-card :bordered="false" class="purchaseOrderEdit-cont">
       <a-collapse :activeKey="['1']">
@@ -144,6 +149,11 @@
         </a-collapse-panel>
       </a-collapse>
     </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="purchaseOrderEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      </div>
+    </a-affix>
     <!-- 选择基本信息弹框 -->
     <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </div>
@@ -267,10 +277,18 @@
       //  编辑基本信息
       handleEditInfo(){
         this.openModal = true
+      },
+      //  提交
+      handleSubmit(){
+        
       },
       //  基本信息  保存
       handleOk(){
         
+      },
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/purchasingManagement/purchaseOrder/list'})
       },
       //  导入明细
       handleImport(){

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -60,7 +60,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="purchaseOrderList-add" type="primary" @click="handleAdd">新增采购单(箭冠)</a-button>
+      <a-button id="purchaseOrderList-add" type="primary" @click="handleAdd">新增采购单</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">

+ 5 - 4
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -66,11 +66,12 @@
           <a-cascader :options="typeData" id="purchaseOrderWarehousing-state" placeholder="请选择" allowClear v-model="record.brand" />
         </template>
       </s-table>
-      <div class="btn-cont">
-        <a-button type="primary" id="satellite-warehouse-inventory-add-modal-add" @click="handleWarehousing">确认入库</a-button>
-        <a-button id="satellite-warehouse-inventory-add-modal-back" @click="handleBack" style="margin-left: 15px;">返回列表</a-button>
-      </div>
     </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="purchaseOrderWarehousing-warehousing" size="large" @click="handleWarehousing" style="padding: 0 60px;">确认入库</a-button>
+      </div>
+    </a-affix>
   </div>
 </template>