Browse Source

财务管理

chenrui 4 years ago
parent
commit
2deff84c2f

+ 45 - 9
src/config/router.config.js

@@ -1321,9 +1321,9 @@ export const asyncRouterMap = [
             ]
           },
           {
-            path: '/financialManagement/unitCollectionPayment',
-            redirect: '/financialManagement/unitCollectionPayment/list',
-            name: 'unitCollectionPayment',
+            path: '/financialManagement/companyCollectionPayment',
+            redirect: '/financialManagement/companyCollectionPayment/list',
+            name: 'companyCollectionPayment',
             component: RouteView,
             meta: {
               title: '单位收付款记录',
@@ -1333,9 +1333,9 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/financialManagement/unitCollectionPayment/list',
-                name: 'unitCollectionPaymentList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/unitCollectionPayment/list.vue'),
+                path: '/financialManagement/companyCollectionPayment/list',
+                name: 'companyCollectionPaymentList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/list.vue'),
                 meta: {
                   title: '单位收付款记录列表',
                   icon: 'gold',
@@ -1344,9 +1344,9 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/financialManagement/unitCollectionPayment/detail/:id',
-                name: 'unitCollectionPaymentDetail',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/unitCollectionPayment/detail.vue'),
+                path: '/financialManagement/companyCollectionPayment/detail/:id',
+                name: 'companyCollectionPaymentDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/detail.vue'),
                 meta: {
                   title: '单位收付款记录详情',
                   icon: 'gold',
@@ -1355,6 +1355,42 @@ export const asyncRouterMap = [
                 }
               }
             ]
+          },
+          {
+            path: '/financialManagement/companyReceivablePayable',
+            redirect: '/financialManagement/companyReceivablePayable/list',
+            name: 'companyReceivablePayable',
+            component: RouteView,
+            meta: {
+              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'),
+                meta: {
+                  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'),
+                meta: {
+                  title: '单位应收应付管理详情',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
           }
         ]
       },

+ 8 - 8
src/views/financialManagement/unitCollectionPayment/detail.vue → src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -1,20 +1,20 @@
 <template>
-  <div class="unitCollectionPaymentDetail-wrap">
+  <div class="companyCollectionPaymentDetail-wrap">
     <a-page-header :ghost="false" @back="handleBack" >
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
-        <a id="unitCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+        <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
-        <a-button key="2" id="unitCollectionPaymentDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="unitCollectionPaymentDetail-print-btn">快速打印</a-button>
+        <a-button key="2" id="companyCollectionPaymentDetail-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="companyCollectionPaymentDetail-print-btn">快速打印</a-button>
       </template>
     </a-page-header>
     <!-- 内容 -->
     <a-page-header title="单号:CG2021010100001" ></a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="unitCollectionPaymentDetail-cont">
+    <a-card :bordered="false" class="companyCollectionPaymentDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -32,7 +32,7 @@
       </a-collapse>
     </a-card>
     <!-- 收款明细 -->
-    <a-card :bordered="false" class="unitCollectionPaymentDetail-cont">
+    <a-card :bordered="false" class="companyCollectionPaymentDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="收款明细">
           <!-- alert -->
@@ -114,14 +114,14 @@
     methods: {
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/financialManagement/unitCollectionPayment/list'})
+        this.$router.push({ path: '/financialManagement/companyCollectionPayment/list'})
       },
     }
   }
 </script>
 
 <style lang="less">
-  .unitCollectionPaymentDetail-cont{
+  .companyCollectionPaymentDetail-cont{
     margin-bottom: 15px;
   }
 </style>

+ 11 - 11
src/views/financialManagement/unitCollectionPayment/list.vue → src/views/financialManagement/companyCollectionPayment/list.vue

@@ -1,12 +1,12 @@
 <template>
-  <a-card :bordered="false" class="unitCollectionPaymentList-wrap">
+  <a-card :bordered="false" class="companyCollectionPaymentList-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-input id="unitCollectionPaymentList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入单位名称"/>
+              <a-input id="companyCollectionPaymentList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入单位名称"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -14,7 +14,7 @@
               <v-select
                 v-model="queryParam.billStatus"
                 ref="billStatus"
-                id="unitCollectionPaymentList-billStatus"
+                id="companyCollectionPaymentList-billStatus"
                 code="PAYMENT_TYPE"
                 placeholder="请选择单位类型"
                 allowClear></v-select>
@@ -25,7 +25,7 @@
               <v-select
                 v-model="queryParam.billStatus"
                 ref="billStatus"
-                id="unitCollectionPaymentList-billStatus"
+                id="companyCollectionPaymentList-billStatus"
                 code="PAYMENT_TYPE"
                 placeholder="请选择结算类型"
                 allowClear></v-select>
@@ -34,12 +34,12 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="结算单号">
-                <a-input id="unitCollectionPaymentList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入结算单号"/>
+                <a-input id="companyCollectionPaymentList-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="unitCollectionPaymentList-creatDate"/>
+                <a-range-picker v-model="queryParam.creatDate" id="companyCollectionPaymentList-creatDate"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -47,7 +47,7 @@
                 <v-select
                   v-model="queryParam.billStatus"
                   ref="billStatus"
-                  id="unitCollectionPaymentList-billStatus"
+                  id="companyCollectionPaymentList-billStatus"
                   code="PAYMENT_TYPE"
                   placeholder="请选择结算方式"
                   allowClear></v-select>
@@ -56,8 +56,8 @@
           </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="unitCollectionPaymentList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="unitCollectionPaymentList-reset">重置</a-button>
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyCollectionPaymentList-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyCollectionPaymentList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -150,7 +150,7 @@ export default {
   methods: {
     //  详情
     handleDetail(row){
-      this.$router.push({ path: `/financialManagement/unitCollectionPayment/detail/${row.id}`})
+      this.$router.push({ path: `/financialManagement/companyCollectionPayment/detail/${row.id}`})
     },
     //  审核
     handleExamine(row, type){
@@ -188,7 +188,7 @@ export default {
 }
 </script>
 <style lang="less">
-  .unitCollectionPaymentList-wrap{
+  .companyCollectionPaymentList-wrap{
     .sTable{
       margin-top: 15px;
     }

+ 166 - 0
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="companyCollectionPaymentDetail-wrap">
+    <a-page-header :ghost="false" @back="handleBack" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="companyCollectionPaymentDetail-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="companyCollectionPaymentDetail-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 内容 -->
+    <a-page-header title="客户:监管营销中心" ></a-page-header>
+    <a-card>
+      <!-- 搜索条件 -->
+      <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="companyReceivablePayableDetail-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="companyCollectionPaymentDetail-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="companyReceivablePayableDetail-refresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyReceivablePayableDetail-reset">重置</a-button>
+                <a-button type="danger" style="margin-left: 8px" @click="handleExport" :disabled="disabled" :loading="exportLoading" id="companyReceivablePayableDetail-export-btn">导出</a-button>
+              </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> </div>
+      </a-alert>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="default"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        bordered>
+        <!-- 采购数量 -->
+        <template slot="purchaseNum" slot-scope="text, record">
+          <span>{{record.purchaseNum}}</span>
+        </template>
+        <!-- 缺货数量 -->
+        <template slot="outOfStockNum" slot-scope="text, record">
+          <span>{{record.outOfStockNum}}</span>
+        </template>
+      </s-table>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  import { STable, VSelect } from '@/components'
+  export default{
+    components: { STable, VSelect },
+    data(){
+      return{
+        disabled: false, //  查询、重置按钮是否可操作
+        // 查询参数
+        queryParam: {},
+        exportLoading: false, // 导出loading
+        // 表头
+        columns: [
+          { title: '序号', dataIndex: 'no', align: 'center' },
+          { title: '单据号', dataIndex: 'creatDate', align: 'center' },
+          { title: '类型', dataIndex: 'custName', align: 'center' },
+          { title: '审核时间', dataIndex: 'totalP', align: 'center' },
+          { title: '金额', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
+          { title: '余额', scopedSlots: { customRender: 'purchasesNum' }, align: 'center' },
+        ],
+        // 加载数据方法 必须为 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)
+          })
+        },
+      }
+    },
+    methods: {
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/financialManagement/companyCollectionPayment/list'})
+      },
+      //  导出
+      handleExport () {
+        const params = this.queryParam
+        if (this.oldTime && this.oldTime.length > 0) {
+          params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD')
+          params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD')
+        } else {
+          params.beginOldExpiryDate = ''
+          params.endOldExpirydDate = ''
+        }
+        if (this.newTime && this.newTime.length > 0) {
+          params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD')
+          params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD')
+        } else {
+          params.beginDate = ''
+          params.endDate = ''
+        }
+        this.exportLoading = true
+        customerBundleExportDelay(params).then(res => {
+          this.exportLoading = false
+          this.download(res)
+        })
+      },
+      download (data) {
+        if (!data) { return }
+        const url = window.URL.createObjectURL(new Blob([data]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        const a = moment().format('YYYYMMDDHHmmss')
+        const fname = '仓库调拨' + a
+        link.setAttribute('download', fname + '.xlsx')
+        document.body.appendChild(link)
+        link.click()
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  .companyCollectionPaymentDetail-cont{
+    margin-bottom: 15px;
+  }
+</style>

+ 134 - 0
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-card :bordered="false" class="companyReceivablePayableList-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-input id="companyReceivablePayableList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入单位名称"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="单位类型">
+              <v-select
+                v-model="queryParam.billStatus"
+                ref="billStatus"
+                id="companyReceivablePayableList-billStatus"
+                code="PAYMENT_TYPE"
+                placeholder="请选择单位类型"
+                allowClear></v-select>
+            </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="companyReceivablePayableList-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyReceivablePayableList-reset">重置</a-button>
+            </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> </div>
+    </a-alert>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="primary" @click="handleCollection(record)" id="companyReceivablePayableList-collection-btn">收款</a-button>
+        <a-button size="small" @click="handlePayment(record)" id="companyReceivablePayableList-payment-btn" style="margin: 0 0 10px 8px">付款</a-button>
+        <a-button size="small" type="dashed" @click="handleDetail(record)" id="companyReceivablePayableList-detail-btn" style="margin: 0 0 10px 8px">详情</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 {
+      disabled: false, //  查询、重置按钮是否可操作
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', align: 'center' },
+        { title: '单位名称', dataIndex: 'name', align: 'center' },
+        { title: '单位类型', dataIndex: 'pssayType', align: 'center' },
+        { title: '应收金额', dataIndex: 'totalP', align: 'center' },
+        { title: '应付金额', dataIndex: 'tostalP', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+      ],
+      // 加载数据方法 必须为 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)
+        })
+      },
+    }
+  },
+  methods: {
+    //  详情
+    handleDetail(row){
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.id}`})
+    },
+    //  收款
+    handleCollection(row){},
+    //  付款
+    handlePayment(row){},
+    //  重置
+    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">
+  .companyReceivablePayableList-wrap{
+    .sTable{
+      margin-top: 15px;
+    }
+  }
+</style>

+ 2 - 2
src/views/financialManagement/inventoryReview/detail.vue

@@ -33,7 +33,7 @@
                 盈亏总数量
                 <a-popover>
                   <template slot="content">
-                    双击列表配件可快速选中添加
+                    盘盈数量与盘亏数量之和
                   </template>
                   <a-icon type="question-circle" theme="twoTone" />
                 </a-popover>
@@ -45,7 +45,7 @@
                 盈亏总成本
                 <a-popover>
                   <template slot="content">
-                    双击列表配件可快速选中添加
+                    盘盈成本与盘亏成本之和
                   </template>
                   <a-icon type="question-circle" theme="twoTone" />
                 </a-popover>